From f4117aa1b447fdae9673b9368b52dd34cb1acf87 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sat, 2 Oct 2021 20:20:17 +0200 Subject: [PATCH] cdcacm: Use the USB strings. --- src/platforms/common/cdcacm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/platforms/common/cdcacm.c b/src/platforms/common/cdcacm.c index e28a5704..fc85b16d 100644 --- a/src/platforms/common/cdcacm.c +++ b/src/platforms/common/cdcacm.c @@ -174,7 +174,7 @@ static const struct usb_iface_assoc_descriptor gdb_assoc = { .bFunctionClass = USB_CLASS_CDC, .bFunctionSubClass = USB_CDC_SUBCLASS_ACM, .bFunctionProtocol = USB_CDC_PROTOCOL_NONE, - .iFunction = 0, + .iFunction = 4, }; /* Serial ACM interface */ @@ -277,7 +277,7 @@ static const struct usb_iface_assoc_descriptor uart_assoc = { .bFunctionClass = USB_CLASS_CDC, .bFunctionSubClass = USB_CDC_SUBCLASS_ACM, .bFunctionProtocol = USB_CDC_PROTOCOL_NONE, - .iFunction = 0, + .iFunction = 5, }; const struct usb_dfu_descriptor dfu_function = { @@ -396,7 +396,6 @@ static const struct usb_config_descriptor config = { static char serial_no[DFU_SERIAL_LENGTH]; #define BOARD_IDENT "Black Magic Probe " PLATFORM_IDENT FIRMWARE_VERSION -#define DFU_IDENT "Black Magic Firmware Upgrade " PLATFORM_IDENT FIRMWARE_VERSION static const char *usb_strings[] = { "Black Sphere Technologies", @@ -404,7 +403,7 @@ static const char *usb_strings[] = { serial_no, "Black Magic GDB Server", "Black Magic UART Port", - DFU_IDENT, + "Black Magic DFU", #if defined(PLATFORM_HAS_TRACESWO) "Black Magic Trace Capture", #endif