From 1fa961841dd9a6abd3ad50106f59b2e18eeccb77 Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Sun, 20 Jan 2013 20:38:04 +0100
Subject: [PATCH] Product and DFU String now tell the hardware they run on

---
 src/platforms/f4discovery/platform.h | 2 ++
 src/platforms/native/platform.h      | 2 ++
 src/platforms/stlink/platform.h      | 2 ++
 src/platforms/stm32/cdcacm.c         | 4 ++--
 src/platforms/stm32/usbdfu.c         | 2 +-
 src/platforms/stm32_can/platform.h   | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index 6cbbc1b0..b19aa115 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 94e7fa33..4a0f2736 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 e5fd0b4b..a5eee6c7 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 0cbfc5f9..00c5ed2f 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 4535b348..fb8f34f4 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 030855b9..8b0d567a 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:
  *