diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-25 12:42:55 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-10-25 12:42:55 +0000 |
commit | 55538dcef34bc3c0f2ada4767c51d11202ac0678 (patch) | |
tree | f047601bd6ab339511e24acb00801de8fdebc19c /Projects/XPLAINBridge | |
parent | b37d77eab32d171ad7b28157a924a4026e2aebd1 (diff) | |
download | lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.tar.gz lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.tar.bz2 lufa-55538dcef34bc3c0f2ada4767c51d11202ac0678.zip |
Add descriptor class, subclass and protocol constants to the class drivers, modify all demos to use them where possible.
Move out private/internal host class driver constants to the common class driver headers, so that they can be used in the Low Level host mode demos.
Ensure all demos, projects and bootloaders use the class driver constants where possible to minimise code repetition.
Diffstat (limited to 'Projects/XPLAINBridge')
-rw-r--r-- | Projects/XPLAINBridge/AVRISPDescriptors.c | 8 | ||||
-rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c index 7c4d1a82a..0a7cd1833 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.c +++ b/Projects/XPLAINBridge/AVRISPDescriptors.c @@ -47,9 +47,9 @@ USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor = .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, .USBSpecification = VERSION_BCD(01.10), - .Class = 0xFF, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = USB_CSCP_VendorSpecificClass, + .SubClass = USB_CSCP_NoDeviceSubclass, + .Protocol = USB_CSCP_NoDeviceProtocol, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, @@ -95,7 +95,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor = .TotalEndpoints = 2, - .Class = 0xFF, + .Class = USB_CSCP_VendorSpecificClass, .SubClass = 0x00, .Protocol = 0x00, diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 2b1fc6293..2773ac853 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -59,9 +59,9 @@ USB_Descriptor_Device_t PROGMEM USART_DeviceDescriptor = .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, .USBSpecification = VERSION_BCD(01.10), - .Class = 0x02, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_NoSpecificSubclass, + .Protocol = CDC_CSCP_NoSpecificProtocol, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, @@ -107,9 +107,9 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor = .TotalEndpoints = 1, - .Class = 0x02, - .SubClass = 0x02, - .Protocol = 0x01, + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_ACMSubclass, + .Protocol = CDC_CSCP_ATCommandProtocol, .InterfaceStrIndex = NO_DESCRIPTOR }, @@ -158,9 +158,9 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor = .TotalEndpoints = 2, - .Class = 0x0A, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = CDC_CSCP_CDCDataClass, + .SubClass = CDC_CSCP_NoDataSubclass, + .Protocol = CDC_CSCP_NoDataProtocol, .InterfaceStrIndex = NO_DESCRIPTOR }, |