diff --git a/cpu/cc253x/usb/cdc-acm-descriptors.c b/cpu/cc253x/usb/cdc-acm-descriptors.c index 8a5d7c844..3c1a78d88 100644 --- a/cpu/cc253x/usb/cdc-acm-descriptors.c +++ b/cpu/cc253x/usb/cdc-acm-descriptors.c @@ -14,8 +14,8 @@ const struct usb_st_device_descriptor device_descriptor = 0, 0, CTRL_EP_SIZE, - 0x0617, /* EPFL usb ID */ - 0x000B, /* Don't mess with it please */ + CDC_ACM_CONF_VID, + CDC_ACM_CONF_PID, 0x0000, 1, 2, diff --git a/platform/cc2530dk/dev/usb-serial.c b/platform/cc2530dk/dev/usb-serial.c index ff58b5ab9..eb9267f71 100644 --- a/platform/cc2530dk/dev/usb-serial.c +++ b/platform/cc2530dk/dev/usb-serial.c @@ -68,22 +68,25 @@ static struct { static const struct { uint8_t size; uint8_t type; - uint16_t string[10]; + uint16_t string[17]; } string_manufacturer = { sizeof(string_manufacturer), 3, - { 'E', 'P', 'F', 'L', '-', 'L', 'S', 'R', 'O', '1' } + { + 'T', 'e', 'x', 'a', 's', ' ', + 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's' + } }; static const struct { uint8_t size; uint8_t type; - uint16_t string[18]; + uint16_t string[17]; } string_product = { sizeof(string_product), 3, { 'C', 'C', '2', '5', '3', '1', ' ', - 'D', 'e', 'v', 'e', 'l', '-', 'B', 'o', 'a', 'r', 'd' + 'U', 'S', 'B', ' ', 'D', 'o', 'n', 'g', 'l', 'e' } }; /*---------------------------------------------------------------------------*/ diff --git a/platform/cc2530dk/models.h b/platform/cc2530dk/models.h index fde6811c8..06f4f72cb 100644 --- a/platform/cc2530dk/models.h +++ b/platform/cc2530dk/models.h @@ -81,6 +81,9 @@ #define USB_CONF_CLASS 1 /* CDC-ACM */ #endif +#define CDC_ACM_CONF_VID 0x0451 /* Vendor: TI */ +#define CDC_ACM_CONF_PID 0x16A8 /* cc2531 CDC */ + #undef LEDS_CONF_ALL #define LEDS_CONF_ALL 3 #define LEDS_RED 1