From c8f226980499d8e5b0b3d361dc986e2759dcaacb Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 15 May 2013 18:44:46 +0200 Subject: Add prefixes to string descriptor ID enum names in the AVRISP and XPLAINBridge projects to avoid conflicts. --- Projects/XPLAINBridge/USARTDescriptors.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Projects/XPLAINBridge/USARTDescriptors.c') diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 6e694624d..0e0ac8534 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 = STRING_ID_Manufacturer, - .ProductStrIndex = STRING_ID_Product, + .ManufacturerStrIndex = USART_STRING_ID_Manufacturer, + .ProductStrIndex = USART_STRING_ID_Product, .SerialNumStrIndex = USE_INTERNAL_SERIAL, .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS @@ -237,15 +237,15 @@ uint16_t USART_GetDescriptor(const uint16_t wValue, case DTYPE_String: switch (DescriptorNumber) { - case STRING_ID_Language: + case USART_STRING_ID_Language: Address = &USART_LanguageString; Size = pgm_read_byte(&USART_LanguageString.Header.Size); break; - case STRING_ID_Manufacturer: + case USART_STRING_ID_Manufacturer: Address = &USART_ManufacturerString; Size = pgm_read_byte(&USART_ManufacturerString.Header.Size); break; - case STRING_ID_Product: + case USART_STRING_ID_Product: Address = &USART_ProductString; Size = pgm_read_byte(&USART_ProductString.Header.Size); break; -- cgit v1.2.3