Revert "boardd: new class USBDevice (commaai#23015)"

This reverts commit 4061f50.
budney · Dec 17, 2021 · 285adde · 285adde
1 parent 4061f50
commit 285adde
Show file tree

Hide file tree

Showing 10 changed files with 300 additions and 235 deletions.
diff --git a/panda b/panda
diff --git a/release/files_common b/release/files_common
@@ -92,8 +92,6 @@ selfdrive/boardd/boardd_api_impl.pyx
 selfdrive/boardd/can_list_to_can_capnp.cc
 selfdrive/boardd/panda.cc
 selfdrive/boardd/panda.h
-selfdrive/boardd/usbdevice.cc
-selfdrive/boardd/usbdevice.h
 selfdrive/boardd/pigeon.cc
 selfdrive/boardd/pigeon.h
 selfdrive/boardd/set_time.py

diff --git a/selfdrive/boardd/SConscript b/selfdrive/boardd/SConscript
@@ -1,9 +1,9 @@
 Import('env', 'envCython', 'common', 'cereal', 'messaging')
 
 libs = ['usb-1.0', common, cereal, messaging, 'pthread', 'zmq', 'capnp', 'kj']
-env.Program('boardd', ['boardd.cc', 'panda.cc', 'usbdevice.cc', 'pigeon.cc'], LIBS=libs)
+env.Program('boardd', ['boardd.cc', 'panda.cc', 'pigeon.cc'], LIBS=libs)
 env.Library('libcan_list_to_can_capnp', ['can_list_to_can_capnp.cc'])
 
 envCython.Program('boardd_api_impl.so', 'boardd_api_impl.pyx', LIBS=["can_list_to_can_capnp", 'capnp', 'kj'] + envCython["LIBS"])
 if GetOption('test'):
-  env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc', 'usbdevice.cc'], LIBS=libs)
+  env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc'], LIBS=libs)
diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
@@ -185,7 +185,7 @@ bool safety_setter_thread(std::vector<Panda *> pandas) {
 Panda *usb_connect(std::string serial="", uint32_t index=0) {
   std::unique_ptr<Panda> panda;
   try {
-    panda = std::make_unique<Panda>(serial, (index * BUS_CNT));
+    panda = std::make_unique<Panda>(serial, (index * PANDA_BUS_CNT));
   } catch (std::exception &e) {
     return nullptr;
   }
+4 −0		board/can_definitions.h
+10 −1		board/config.h
+8 −2		board/drivers/can_common.h
+5 −2		board/drivers/usb.h
+1 −1		board/flasher.h
+7 −7		board/main.c
+0 −26		board/panda.h
+1 −1		board/pedal/main.c
+3 −1		board/stm32fx/stm32fx_config.h
+3 −1		board/stm32h7/stm32h7_config.h
+1 −1		tests/safety/test.c