From e342ba8f649f779b58e2ca3bd2888477a8dcad05 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 15 May 2013 18:40:25 +0200 Subject: Add symbolic names for USB Device String Descriptors within the demos, applications and bootloaders. --- Projects/XPLAINBridge/USARTDescriptors.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Projects/XPLAINBridge/USARTDescriptors.c') diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 75938c353f..6e694624dd 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; -- cgit v1.2.3