diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2013-10-11 12:50:01 -0700 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-10-11 12:50:01 -0700 |
commit | 7024bb4c799b3573627323fa1305142739ed3500 (patch) | |
tree | 846d62348b643565eb37c928044dfac40c483740 /Projects | |
parent | ab238601b96e4d804640ccfef5a9bde51995da7f (diff) | |
parent | 352152c66433f1c317cd48529b2746be79fd17f5 (diff) | |
download | lufa-7024bb4c799b3573627323fa1305142739ed3500.tar.gz lufa-7024bb4c799b3573627323fa1305142739ed3500.tar.bz2 lufa-7024bb4c799b3573627323fa1305142739ed3500.zip |
Merge pull request #9 from mondalaci/replace-remaining-interface-numbers-with-enums
Replace CDC interface numbers with enums.
Diffstat (limited to 'Projects')
-rw-r--r-- | Projects/Benito/Descriptors.c | 4 | ||||
-rw-r--r-- | Projects/LEDNotifier/Descriptors.c | 4 | ||||
-rw-r--r-- | Projects/SerialToLCD/Descriptors.c | 4 | ||||
-rw-r--r-- | Projects/USBtoSerial/Descriptors.c | 4 | ||||
-rw-r--r-- | Projects/Webserver/Descriptors.c | 6 | ||||
-rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c index 8bd0907d5..a7c07bfa3 100644 --- a/Projects/Benito/Descriptors.c +++ b/Projects/Benito/Descriptors.c @@ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c index f228c69ef..bf72c6da8 100644 --- a/Projects/LEDNotifier/Descriptors.c +++ b/Projects/LEDNotifier/Descriptors.c @@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = diff --git a/Projects/SerialToLCD/Descriptors.c b/Projects/SerialToLCD/Descriptors.c index baf33c0ce..a2f11ab5a 100644 --- a/Projects/SerialToLCD/Descriptors.c +++ b/Projects/SerialToLCD/Descriptors.c @@ -136,8 +136,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = diff --git a/Projects/USBtoSerial/Descriptors.c b/Projects/USBtoSerial/Descriptors.c index ea0a84a0c..fd3d4395f 100644 --- a/Projects/USBtoSerial/Descriptors.c +++ b/Projects/USBtoSerial/Descriptors.c @@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = diff --git a/Projects/Webserver/Descriptors.c b/Projects/Webserver/Descriptors.c index b8acf42a2..ea87ab8f7 100644 --- a/Projects/Webserver/Descriptors.c +++ b/Projects/Webserver/Descriptors.c @@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, - .FirstInterfaceIndex = 0, + .FirstInterfaceIndex = INTERFACE_ID_CDC_CCI, .TotalInterfaces = 2, .Class = CDC_CSCP_CDCClass, @@ -138,8 +138,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index b1bfd4e81..f14bac032 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -124,8 +124,8 @@ const USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Subtype = CDC_DSUBTYPE_CSInterface_Union, - .MasterInterfaceNumber = 0, - .SlaveInterfaceNumber = 1, + .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI, + .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI, }, .CDC_NotificationEndpoint = |