Merge pull request #488 from brianesquilona/dev_patches

Added option to customize usb product string
ARMmbed · Sep 4, 2018 · 15445a0 · 15445a0
2 parents f7f0568 + 4e34361
commit 15445a0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 0 deletions.
diff --git a/records/board/microbit.yaml b/records/board/microbit.yaml
@@ -3,6 +3,7 @@ common:
  - HID_LED_DEF=GPIO_LED_ON
  - CDC_LED_DEF=GPIO_LED_ON
  - MSC_LED_DEF=GPIO_LED_ON
+ - USB_PROD_STR="BBC micro:bit CMSIS-DAP"
  sources:
  board:
  - source/board/microbit.c

diff --git a/source/hic_hal/atmel/sam3u2c/usb_config.c b/source/hic_hal/atmel/sam3u2c/usb_config.c
@@ -85,7 +85,13 @@
 // </h>
 #define USBD_STRDESC_LANGID 0x0409
 #define USBD_STRDESC_MAN L"ARM"
+#ifndef USB_PROD_STR
 #define USBD_STRDESC_PROD L"DAPLink CMSIS-DAP"
+#else
+#define _TOWIDE(x) L ## #x
+#define TOWIDE(x) _TOWIDE(x)
+#define USBD_STRDESC_PROD TOWIDE(USB_PROD_STR)
+#endif
 #define USBD_STRDESC_SER_ENABLE 1
 #define USBD_STRDESC_SER L"0001A0000000"
 

diff --git a/source/hic_hal/freescale/k20dx/usb_config.c b/source/hic_hal/freescale/k20dx/usb_config.c
@@ -85,7 +85,13 @@
 // </h>
 #define USBD_STRDESC_LANGID 0x0409
 #define USBD_STRDESC_MAN L"ARM"
+#ifndef USB_PROD_STR
 #define USBD_STRDESC_PROD L"DAPLink CMSIS-DAP"
+#else
+#define _TOWIDE(x) L ## #x
+#define TOWIDE(x) _TOWIDE(x)
+#define USBD_STRDESC_PROD TOWIDE(USB_PROD_STR)
+#endif
 #define USBD_STRDESC_SER_ENABLE 1
 #define USBD_STRDESC_SER L"0001A0000000"
 

diff --git a/source/hic_hal/freescale/kl26z/usb_config.c b/source/hic_hal/freescale/kl26z/usb_config.c
@@ -85,7 +85,13 @@
 // </h>
 #define USBD_STRDESC_LANGID 0x0409
 #define USBD_STRDESC_MAN L"ARM"
+#ifndef USB_PROD_STR
 #define USBD_STRDESC_PROD L"DAPLink CMSIS-DAP"
+#else
+#define _TOWIDE(x) L ## #x
+#define TOWIDE(x) _TOWIDE(x)
+#define USBD_STRDESC_PROD TOWIDE(USB_PROD_STR)
+#endif
 #define USBD_STRDESC_SER_ENABLE 1
 #define USBD_STRDESC_SER L"0001A0000000"
 

diff --git a/source/hic_hal/nxp/lpc11u35/usb_config.c b/source/hic_hal/nxp/lpc11u35/usb_config.c
@@ -85,7 +85,13 @@
 // </h>
 #define USBD_STRDESC_LANGID 0x0409
 #define USBD_STRDESC_MAN L"ARM"
+#ifndef USB_PROD_STR
 #define USBD_STRDESC_PROD L"DAPLink CMSIS-DAP"
+#else
+#define _TOWIDE(x) L ## #x
+#define TOWIDE(x) _TOWIDE(x)
+#define USBD_STRDESC_PROD TOWIDE(USB_PROD_STR)
+#endif
 #define USBD_STRDESC_SER_ENABLE 1
 #define USBD_STRDESC_SER L"0001A0000000"
 

diff --git a/source/hic_hal/nxp/lpc4322/usb_config.c b/source/hic_hal/nxp/lpc4322/usb_config.c
@@ -85,7 +85,13 @@
 // </h>
 #define USBD_STRDESC_LANGID 0x0409
 #define USBD_STRDESC_MAN L"ARM"
+#ifndef USB_PROD_STR
 #define USBD_STRDESC_PROD L"DAPLink CMSIS-DAP"
+#else
+#define _TOWIDE(x) L ## #x
+#define TOWIDE(x) _TOWIDE(x)
+#define USBD_STRDESC_PROD TOWIDE(USB_PROD_STR)
+#endif
 #define USBD_STRDESC_SER_ENABLE 1
 #define USBD_STRDESC_SER L"0001A0000000"