Deprecate variable bcdDevice in usb.h (commaai#689)

emiljanogj · Jul 14, 2021 · 1c498c9 · 1c498c9
1 parent b98e3de
commit 1c498c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/board/drivers/usb.h b/board/drivers/usb.h
@@ -123,11 +123,7 @@ uint8_t device_desc[] = {
   0xFF, 0xFF, 0xFF, 0x40, // Class, Subclass, Protocol, Max Packet Size
   TOUSBORDER(USB_VID), // idVendor
   TOUSBORDER(USB_PID), // idProduct
-#ifdef STM32F4
   0x00, 0x23, // bcdDevice
-#else
-  0x00, 0x22, // bcdDevice
-#endif
   0x01, 0x02, // Manufacturer, Product
   0x03, 0x01 // Serial Number, Num Configurations
 };

diff --git a/board/stm32fx/stm32fx_config.h b/board/stm32fx/stm32fx_config.h
@@ -15,7 +15,7 @@
 #define APB1_FREQ CORE_FREQ/2U 
 #define APB2_FREQ CORE_FREQ/1U
 
-#define BOOTLOADER_ADDRESS 0x1FFF0004
+#define BOOTLOADER_ADDRESS 0x1FFF0004U
 
 // Around (1Mbps / 8 bits/byte / 12 bytes per message)
 #define CAN_INTERRUPT_RATE 12000U
@@ -35,8 +35,8 @@
 #define INTERRUPT_TIMER_IRQ TIM6_DAC_IRQn
 #define INTERRUPT_TIMER TIM6
 
-#define PROVISION_CHUNK_ADDRESS 0x1FFF79E0
-#define DEVICE_SERIAL_NUMBER_ADDRESS 0x1FFF79C0
+#define PROVISION_CHUNK_ADDRESS 0x1FFF79E0U
+#define DEVICE_SERIAL_NUMBER_ADDRESS 0x1FFF79C0U
 
 #ifndef BOOTSTUB
   #ifdef PANDA