ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add prefixes to string descriptor ID enum names in the AVRISP and XPLAINBridge projects to avoid conflicts.

Browse source
This commit is contained in:
Dean Camera 2013-05-15 18:44:46 +02:00
parent e342ba8f64
commit c8f2269804
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/XPLAINBridge/USARTDescriptors.c
View file

@ -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;

8
Projects/XPLAINBridge/USARTDescriptors.h
View file

@ -85,11 +85,11 @@
* have a unique ID index associated with it, which can be used to refer to the string from
* other descriptors.
*/
enum StringDescriptors_t
enum USART_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 */
USART_STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */
USART_STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */
USART_STRING_ID_Product = 2, /**< Product string ID */
};
/* Function Prototypes: */