From 1b95b2af9488728425a00a1f844efa5f9e1d6ca2 Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Tue, 23 Oct 2018 23:27:56 -0700 Subject: [PATCH] bake patch: expose correct serial number on USB --- ...-expose-correct-serial-number-on-USB.patch | 32 ------------------- Firmware/Board/v3/Src/usbd_desc.c | 9 +----- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 Firmware/Board/v3/0001-expose-correct-serial-number-on-USB.patch diff --git a/Firmware/Board/v3/0001-expose-correct-serial-number-on-USB.patch b/Firmware/Board/v3/0001-expose-correct-serial-number-on-USB.patch deleted file mode 100644 index b9fef648..00000000 --- a/Firmware/Board/v3/0001-expose-correct-serial-number-on-USB.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0867a92f742b312a0ebaafe94cade6f57be22170 Mon Sep 17 00:00:00 2001 -From: Samuel Sadok -Date: Mon, 12 Mar 2018 23:49:32 -0700 -Subject: [PATCH] expose correct serial number on USB - ---- - Firmware/Board/v3/Src/usbd_desc.c | 9 +++++++++------- - 1 file changed, 1 insertions(+), 8 deletions(-) - -diff --git a/Firmware/Board/v3/Src/usbd_desc.c b/Firmware/Board/v3/Src/usbd_desc.c -index b9c7bd0..94dc49b 100644 ---- a/Firmware/Board/v3/Src/usbd_desc.c -+++ b/Firmware/Board/v3/Src/usbd_desc.c -@@ -327,14 +327,7 @@ uint8_t * USBD_FS_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *l - */ - uint8_t * USBD_FS_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) - { -- if(speed == USBD_SPEED_HIGH) -- { -- USBD_GetString((uint8_t *)USBD_SERIALNUMBER_STRING_FS, USBD_StrDesc, length); -- } -- else -- { -- USBD_GetString((uint8_t *)USBD_SERIALNUMBER_STRING_FS, USBD_StrDesc, length); -- } -+ USBD_GetString ((uint8_t *)serial_number_str, USBD_StrDesc, length); - return USBD_StrDesc; - } - --- -2.16.2 - diff --git a/Firmware/Board/v3/Src/usbd_desc.c b/Firmware/Board/v3/Src/usbd_desc.c index 973b0ae2..b0906144 100644 --- a/Firmware/Board/v3/Src/usbd_desc.c +++ b/Firmware/Board/v3/Src/usbd_desc.c @@ -373,14 +373,7 @@ uint8_t * USBD_FS_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *l */ uint8_t * USBD_FS_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) { - if(speed == USBD_SPEED_HIGH) - { - USBD_GetString((uint8_t *)USBD_SERIALNUMBER_STRING_FS, USBD_StrDesc, length); - } - else - { - USBD_GetString((uint8_t *)USBD_SERIALNUMBER_STRING_FS, USBD_StrDesc, length); - } + USBD_GetString ((uint8_t *)serial_number_str, USBD_StrDesc, length); return USBD_StrDesc; }