sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Product and DFU String now tell the hardware they run on

This commit is contained in:
Uwe Bonnes 2013-01-20 20:38:04 +01:00
parent 04624af4e5
commit 1fa961841d
6 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/f4discovery/platform.h
View File

@ -35,6 +35,8 @@
#define INLINE_GPIO #define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64 #define CDCACM_PACKET_SIZE 64
#define PLATFORM_HAS_TRACESWO #define PLATFORM_HAS_TRACESWO
#define BOARD_IDENT "Black Magic Probe (F4Discovery)"
#define DFU_IDENT "Black Magic Firmware Upgrade (F4Discovery"
extern usbd_device *usbdev; extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1 #define CDCACM_GDB_ENDPOINT 1

2
src/platforms/native/platform.h
View File

@ -35,6 +35,8 @@
#define INLINE_GPIO #define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64 #define CDCACM_PACKET_SIZE 64
#define PLATFORM_HAS_TRACESWO #define PLATFORM_HAS_TRACESWO
#define BOARD_IDENT "Black Magic Probe"
#define DFU_IDENT "Black Magic Firmware Upgrade"
extern usbd_device *usbdev; extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1 #define CDCACM_GDB_ENDPOINT 1

2
src/platforms/stlink/platform.h
View File

@ -34,6 +34,8 @@
#define INLINE_GPIO #define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64 #define CDCACM_PACKET_SIZE 64
#define BOARD_IDENT "Black Magic Probe (STLINK)"
#define DFU_IDENT "Black Magic Firmware Upgrade (STLINK)"
extern usbd_device *usbdev; extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1 #define CDCACM_GDB_ENDPOINT 1

4
src/platforms/stm32/cdcacm.c
View File

@ -394,11 +394,11 @@ char serial_no[9];
static const char *usb_strings[] = { static const char *usb_strings[] = {
"Black Sphere Technologies", "Black Sphere Technologies",
"Black Magic Probe", BOARD_IDENT,
serial_no, serial_no,
"Black Magic GDB Server", "Black Magic GDB Server",
"Black Magic UART Port", "Black Magic UART Port",
"Black Magic Firmware Upgrade", DFU_IDENT,
#if defined(PLATFORM_HAS_TRACESWO) #if defined(PLATFORM_HAS_TRACESWO)
"Black Magic Trace Capture", "Black Magic Trace Capture",
#endif #endif

2
src/platforms/stm32/usbdfu.c
View File

@ -185,7 +185,7 @@ static const char *usb_strings[] = {
#elif defined(STM32_CAN) #elif defined(STM32_CAN)
"Black Magic (Upgrade) for STM32_CAN", "Black Magic (Upgrade) for STM32_CAN",
#elif defined(F4DISCOVERY) #elif defined(F4DISCOVERY)
"Black Magic (Upgrade) for F4DISCOVERY", "Black Magic (Upgrade) for F4Discovery",
#else #else
#warning "Unhandled board" #warning "Unhandled board"
#endif #endif

2
src/platforms/stm32_can/platform.h
View File

@ -39,6 +39,8 @@
extern usbd_device *usbdev; extern usbd_device *usbdev;
#define CDCACM_GDB_ENDPOINT 1 #define CDCACM_GDB_ENDPOINT 1
#define CDCACM_UART_ENDPOINT 3 #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: /* Important pin mappings for STM32 implementation:
* *