X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/9d18e10afb2439a6a9ba6978a799259746a837b7..3c932d305715878e01a77659a30a3e4d967fc244:/core/usbcdc/usbdesc.c?ds=sidebyside diff --git a/core/usbcdc/usbdesc.c b/core/usbcdc/usbdesc.c index 6642e60..2543e4a 100644 --- a/core/usbcdc/usbdesc.c +++ b/core/usbcdc/usbdesc.c @@ -20,6 +20,7 @@ * V1.00 Initial Version *---------------------------------------------------------------------------*/ #include "projectconfig.h" + #include "usb.h" #include "cdc.h" #include "usbcfg.h" @@ -73,8 +74,8 @@ const uint8_t USB_ConfigDescriptor[] = { 0x01, /* bNumEndpoints: One endpoint used */ CDC_COMMUNICATION_INTERFACE_CLASS, /* bInterfaceClass: Communication Interface Class */ CDC_ABSTRACT_CONTROL_MODEL, /* bInterfaceSubClass: Abstract Control Model */ - 0x00, /* bInterfaceProtocol: no protocol used */ - 0x5E, /* iInterface: */ + 0x01, /* bInterfaceProtocol: no protocol used */ + 0x00, /* iInterface: */ /*Header Functional Descriptor*/ 0x05, /* bLength: Endpoint Descriptor size */ CDC_CS_INTERFACE, /* bDescriptorType: CS_INTERFACE */ @@ -84,7 +85,7 @@ const uint8_t USB_ConfigDescriptor[] = { 0x05, /* bFunctionLength */ CDC_CS_INTERFACE, /* bDescriptorType: CS_INTERFACE */ CDC_CALL_MANAGEMENT, /* bDescriptorSubtype: Call Management Func Desc */ - 0x01, /* bmCapabilities: device handles call management */ + 0x03, /* bmCapabilities: device handles call management */ 0x01, /* bDataInterface: CDC data IF ID */ /*Abstract Control Management Functional Descriptor*/ 0x04, /* bFunctionLength */ @@ -113,7 +114,7 @@ const uint8_t USB_ConfigDescriptor[] = { CDC_DATA_INTERFACE_CLASS, /* bInterfaceClass: Data Interface Class */ 0x00, /* bInterfaceSubClass: no subclass available */ 0x00, /* bInterfaceProtocol: no protocol used */ - 0x5E, /* iInterface: */ + 0x00, /* iInterface: */ /* Endpoint, EP3 Bulk Out */ USB_ENDPOINT_DESC_SIZE, /* bLength */ USB_ENDPOINT_DESCRIPTOR_TYPE, /* bDescriptorType */ @@ -144,39 +145,39 @@ const uint8_t USB_StringDescriptor[] = { /* Index 0x01: Manufacturer */ (13*2 + 2), /* bLength (13 Char + Type + lenght) */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */ + 'N',0, + 'X',0, + 'P',0, + ' ',0, + 'S',0, + 'E',0, 'M',0, 'I',0, 'C',0, - 'R',0, 'O',0, - 'B',0, - 'U',0, - 'I',0, - 'L',0, + 'N',0, 'D',0, - 'E',0, - 'R',0, ' ',0, /* Index 0x02: Product */ (17*2 + 2), /* bLength ( 17 Char + Type + lenght) */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */ + 'N',0, + 'X',0, + 'P',0, + ' ',0, 'L',0, 'P',0, 'C',0, '1',0, '3',0, - '4',0, - '3',0, + 'x',0, + 'x',0, ' ',0, + 'V',0, 'C',0, 'O',0, 'M',0, ' ',0, - 'P',0, - 'O',0, - 'R',0, - 'T',0, - ' ',0, /* Index 0x03: Serial Number */ (12*2 + 2), /* bLength (12 Char + Type + lenght) */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */