From 1950ba6f83b2ccf31a609fb6eca6aed5e4840252 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 4 Aug 2023 10:46:56 -0700
Subject: [PATCH] cleanup bus count constant

---
 board/SConscript          | 1 -
 board/can_definitions.h   | 1 +
 board/jungle/SConscript   | 1 -
 board/pedal/SConscript    | 5 +----
 tests/libpanda/SConscript | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/board/SConscript b/board/SConscript
index 3b115a62..45fa0f41 100644
--- a/board/SConscript
+++ b/board/SConscript
@@ -11,7 +11,6 @@ build_projects = {
 for project_name, project in build_projects.items():
   flags = [
     "-DPANDA",
-    "-DPANDA_BUS_CNT=4",
   ]
   if ("ENABLE_SPI" in os.environ or "h7" in project_name) and not project_name.startswith('pedal'):
     flags.append('-DENABLE_SPI')
diff --git a/board/can_definitions.h b/board/can_definitions.h
index b12d0e43..daae4d04 100644
--- a/board/can_definitions.h
+++ b/board/can_definitions.h
@@ -1,6 +1,7 @@
 #pragma once
 
 const uint8_t PANDA_CAN_CNT = 3U;
+const uint8_t PANDA_BUS_CNT = 4U;
 
 // bump this when changing the CAN packet
 #define CAN_PACKET_VERSION 4
diff --git a/board/jungle/SConscript b/board/jungle/SConscript
index dfa325dd..3e40611a 100644
--- a/board/jungle/SConscript
+++ b/board/jungle/SConscript
@@ -11,7 +11,6 @@ build_projects = {
 for project_name, project in build_projects.items():
   flags = [
     "-DPANDA_JUNGLE",
-    "-DPANDA_BUS_CNT=3",
   ]
   if os.getenv("FINAL_PROVISIONING"):
     flags += ["-DFINAL_PROVISIONING"]
diff --git a/board/pedal/SConscript b/board/pedal/SConscript
index e993111c..bfa3c2c1 100644
--- a/board/pedal/SConscript
+++ b/board/pedal/SConscript
@@ -25,7 +25,4 @@ build_projects["pedal_usb"] = copy.deepcopy(build_projects["pedal"])
 build_projects["pedal_usb"]["PROJECT_FLAGS"].append("-DPEDAL_USB")
 
 for project_name, project in build_projects.items():
-  flags = [
-    "-DPANDA_BUS_CNT=4",
-  ]
-  build_project(project_name, project, flags)
+  build_project(project_name, project, [])
diff --git a/tests/libpanda/SConscript b/tests/libpanda/SConscript
index cf24949e..7f4871cd 100644
--- a/tests/libpanda/SConscript
+++ b/tests/libpanda/SConscript
@@ -3,7 +3,7 @@ import platform
 CC = 'gcc'
 system = platform.system()
 if system == 'Darwin':
-  # gcc installed by homebrew has version suffix (e.g. gcc-12) in order to be  
+  # gcc installed by homebrew has version suffix (e.g. gcc-12) in order to be
   # distinguishable from system one - which acts as a symlink to clang
   CC += '-12'
 
@@ -14,7 +14,6 @@ env = Environment(
     '-fno-builtin',
     '-std=gnu11',
     '-Wfatal-errors',
-    '-DPANDA_BUS_CNT=4',
   ],
   CPPPATH=[".", "../../board/"],
 )