diff options
| author | AJM <poslathian@poslathian.(none)> | 2010-04-19 18:39:38 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-05-20 22:09:15 -0400 |
| commit | 0db5696149d8f01275955c94ec55c9c43d7ca390 (patch) | |
| tree | ea26fb6eea84046d07115cc6579e6e665bfa2a23 /core/usb/descriptors.c | |
| parent | 06f5a1d3ec3f54a4a6ec9bbe6b9e7c45d9c18c7c (diff) | |
| download | librambutan-0db5696149d8f01275955c94ec55c9c43d7ca390.tar.gz librambutan-0db5696149d8f01275955c94ec55c9c43d7ca390.zip | |
added the usb_config file for general setup settings and filled out any undefined macros in the usb descriptor files
Diffstat (limited to 'core/usb/descriptors.c')
| -rw-r--r-- | core/usb/descriptors.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/usb/descriptors.c b/core/usb/descriptors.c index 522b8d6..bfcd085 100644 --- a/core/usb/descriptors.c +++ b/core/usb/descriptors.c @@ -14,8 +14,8 @@ USB_Descriptor_Device usbVcomDescriptor_Device = { idVendor: VCOM_ID_VENDOR, idProduct: VCOM_ID_PRODUCT, bcdDevice: 0x0200, - iManufacturer: 0x00, - iProduct: 0x00, + iManufacturer: 0x01, + iProduct: 0x02, iSerialNumber: 0x00, bNumConfigurations: 0x01 }; @@ -30,7 +30,7 @@ USB_Descriptor_Configuration usbVcomDescriptor_Config = { bConfigurationValue: 0x01, iConfiguration: 0x00, bmAttributes: (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATT_SELF_POWERED), - bMaxPower: USB_CONFIG_POWER_MA(100) + bMaxPower: USB_CONFIG_MAX_POWER }, CCI_Interface: @@ -82,9 +82,9 @@ USB_Descriptor_Configuration usbVcomDescriptor_Config = { { bLength: sizeof(USB_Descriptor_Endpoint), bDescriptorType: USB_DESCRIPTOR_TYPE_ENDPOINT, - bEndpointAddress: CDC_NOTIFICATION_EPNUM, + bEndpointAddress: VCOM_NOTIFICATION_EPNUM, bmAttributes: EP_TYPE_INTERRUPT, - wMaxPacketSize: CDC_NOTIFICATION_EPSIZE, + wMaxPacketSize: VCOM_NOTIFICATION_EPSIZE, bInterval: 0xFF }, |