aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Bonnes2013-01-20 20:38:04 +0100
committerUwe Bonnes2013-01-21 11:02:44 +0100
commit1fa961841dd9a6abd3ad50106f59b2e18eeccb77 (patch)
tree24f7e8459107f7e71b155bd82cba853cd7786c58
parent04624af4e50eb59c0be7a9e5e1ef42b968a2c200 (diff)
Product and DFU String now tell the hardware they run on
-rw-r--r--src/platforms/f4discovery/platform.h2
-rw-r--r--src/platforms/native/platform.h2
-rw-r--r--src/platforms/stlink/platform.h2
-rw-r--r--src/platforms/stm32/cdcacm.c4
-rw-r--r--src/platforms/stm32/usbdfu.c2
-rw-r--r--src/platforms/stm32_can/platform.h2
6 files changed, 11 insertions, 3 deletions
diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index 6cbbc1b..b19aa11 100644
--- a/src/platforms/f4discovery/platform.h
+++ b/src/platforms/f4discovery/platform.h
@@ -35,6 +35,8 @@
#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
#define PLATFORM_HAS_TRACESWO
+#define BOARD_IDENT "Black Magic Probe (F4Discovery)"
+#define DFU_IDENT "Black Magic Firmware Upgrade (F4Discovery"
extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1
diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index 94e7fa3..4a0f273 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -35,6 +35,8 @@
#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
#define PLATFORM_HAS_TRACESWO
+#define BOARD_IDENT "Black Magic Probe"
+#define DFU_IDENT "Black Magic Firmware Upgrade"
extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index e5fd0b4..a5eee6c 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -34,6 +34,8 @@
#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
+#define BOARD_IDENT "Black Magic Probe (STLINK)"
+#define DFU_IDENT "Black Magic Firmware Upgrade (STLINK)"
extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1
diff --git a/src/platforms/stm32/cdcacm.c b/src/platforms/stm32/cdcacm.c
index 0cbfc5f..00c5ed2 100644
--- a/src/platforms/stm32/cdcacm.c
+++ b/src/platforms/stm32/cdcacm.c
@@ -394,11 +394,11 @@ char serial_no[9];
static const char *usb_strings[] = {
"Black Sphere Technologies",
- "Black Magic Probe",
+ BOARD_IDENT,
serial_no,
"Black Magic GDB Server",
"Black Magic UART Port",
- "Black Magic Firmware Upgrade",
+ DFU_IDENT,
#if defined(PLATFORM_HAS_TRACESWO)
"Black Magic Trace Capture",
#endif
diff --git a/src/platforms/stm32/usbdfu.c b/src/platforms/stm32/usbdfu.c
index 4535b34..fb8f34f 100644
--- a/src/platforms/stm32/usbdfu.c
+++ b/src/platforms/stm32/usbdfu.c
@@ -185,7 +185,7 @@ static const char *usb_strings[] = {
#elif defined(STM32_CAN)
"Black Magic (Upgrade) for STM32_CAN",
#elif defined(F4DISCOVERY)
- "Black Magic (Upgrade) for F4DISCOVERY",
+ "Black Magic (Upgrade) for F4Discovery",
#else
#warning "Unhandled board"
#endif
diff --git a/src/platforms/stm32_can/platform.h b/src/platforms/stm32_can/platform.h
index 030855b..8b0d567 100644
--- a/src/platforms/stm32_can/platform.h
+++ b/src/platforms/stm32_can/platform.h
@@ -39,6 +39,8 @@
extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1
#define CDCACM_UART_ENDPOINT 3
+#define BOARD_IDENT "Black Magic Probe (STM32_CAN)"
+#define DFU_IDENT "Black Magic Firmware Upgrade (STM32_CAN)"
/* Important pin mappings for STM32 implementation:
*