diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-15 18:40:25 +0200 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-15 18:40:25 +0200 |
| commit | e342ba8f649f779b58e2ca3bd2888477a8dcad05 (patch) | |
| tree | 14a63f881e086c5c644313c1078f13c87026d2e1 /Projects/XPLAINBridge | |
| parent | 0ad234c19464a63f6fabd8d12d2769ef9f102833 (diff) | |
| download | lufa-e342ba8f649f779b58e2ca3bd2888477a8dcad05.tar.gz lufa-e342ba8f649f779b58e2ca3bd2888477a8dcad05.tar.bz2 lufa-e342ba8f649f779b58e2ca3bd2888477a8dcad05.zip | |
Add symbolic names for USB Device String Descriptors within the demos, applications and bootloaders.
Diffstat (limited to 'Projects/XPLAINBridge')
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 12 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.h | 11 |
2 files changed, 17 insertions, 6 deletions
diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 75938c353..6e694624d 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -58,8 +58,8 @@ const USB_Descriptor_Device_t PROGMEM USART_DeviceDescriptor = .ProductID = 0x204B, .ReleaseNumber = VERSION_BCD(00.01), - .ManufacturerStrIndex = 0x01, - .ProductStrIndex = 0x02, + .ManufacturerStrIndex = STRING_ID_Manufacturer, + .ProductStrIndex = STRING_ID_Product, .SerialNumStrIndex = USE_INTERNAL_SERIAL, .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS @@ -223,7 +223,7 @@ uint16_t USART_GetDescriptor(const uint16_t wValue, uint16_t Size = NO_DESCRIPTOR; *DescriptorMemorySpace = MEMSPACE_FLASH; - + switch (DescriptorType) { case DTYPE_Device: @@ -237,15 +237,15 @@ uint16_t USART_GetDescriptor(const uint16_t wValue, case DTYPE_String: switch (DescriptorNumber) { - case 0x00: + case STRING_ID_Language: Address = &USART_LanguageString; Size = pgm_read_byte(&USART_LanguageString.Header.Size); break; - case 0x01: + case STRING_ID_Manufacturer: Address = &USART_ManufacturerString; Size = pgm_read_byte(&USART_ManufacturerString.Header.Size); break; - case 0x02: + case STRING_ID_Product: Address = &USART_ProductString; Size = pgm_read_byte(&USART_ProductString.Header.Size); break; diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index a7c390f2a..07acbaeb6 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -81,6 +81,17 @@ USB_Descriptor_Endpoint_t CDC_DataInEndpoint; } USART_USB_Descriptor_Configuration_t; + /** Enum for the device string descriptor IDs within the device. Each string descriptor should + * have a unique ID index associated with it, which can be used to refer to the string from + * other descriptors. + */ + enum StringDescriptors_t + { + STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ + STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ + STRING_ID_Product = 2, /**< Product string ID */ + }; + /* Function Prototypes: */ uint16_t USART_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, |