forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/1469/head
Dean Camera 12 years ago
parent e342ba8f64
commit c8f2269804
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

14
Projects/AVRISP-MKII/AVRISPDescriptors.c
Unescape View File

@ -68,9 +68,9 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor =
.ProductID = 0x2104, .ProductID = 0x2104,
.ReleaseNumber = VERSION_BCD(02.00), .ReleaseNumber = VERSION_BCD(02.00),
.ManufacturerStrIndex = STRING_ID_Manufacturer, .ManufacturerStrIndex = AVRISP_STRING_ID_Manufacturer,
.ProductStrIndex = STRING_ID_Product, .ProductStrIndex = AVRISP_STRING_ID_Product,
.SerialNumStrIndex = STRING_ID_Serial, .SerialNumStrIndex = AVRISP_STRING_ID_Serial,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
}; };
@ -219,19 +219,19 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
case DTYPE_String: case DTYPE_String:
switch (DescriptorNumber) switch (DescriptorNumber)
{ {
case STRING_ID_Language: case AVRISP_STRING_ID_Language:
Address = &AVRISP_LanguageString; Address = &AVRISP_LanguageString;
Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size); Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
break; break;
case STRING_ID_Manufacturer: case AVRISP_STRING_ID_Manufacturer:
Address = &AVRISP_ManufacturerString; Address = &AVRISP_ManufacturerString;
Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size); Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
break; break;
case STRING_ID_Product: case AVRISP_STRING_ID_Product:
Address = &AVRISP_ProductString; Address = &AVRISP_ProductString;
Size = pgm_read_byte(&AVRISP_ProductString.Header.Size); Size = pgm_read_byte(&AVRISP_ProductString.Header.Size);
break; break;
case STRING_ID_Serial: case AVRISP_STRING_ID_Serial:
Address = &AVRISP_SerialString; Address = &AVRISP_SerialString;
Size = AVRISP_SerialString.Header.Size; Size = AVRISP_SerialString.Header.Size;

10
Projects/AVRISP-MKII/AVRISPDescriptors.h
Unescape View File

@ -90,12 +90,12 @@
* have a unique ID index associated with it, which can be used to refer to the string from * have a unique ID index associated with it, which can be used to refer to the string from
* other descriptors. * other descriptors.
*/ */
enum StringDescriptors_t enum AVRISP_StringDescriptors_t
{ {
STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ AVRISP_STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */
STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ AVRISP_STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */
STRING_ID_Product = 2, /**< Product string ID */ AVRISP_STRING_ID_Product = 2, /**< Product string ID */
STRING_ID_Serial = 3, /**< Serial number string ID */ AVRISP_STRING_ID_Serial = 3, /**< Serial number string ID */
}; };
/* External Variables: */ /* External Variables: */

10
Projects/XPLAINBridge/USARTDescriptors.c
Unescape View File

@ -58,8 +58,8 @@ const USB_Descriptor_Device_t PROGMEM USART_DeviceDescriptor =
.ProductID = 0x204B, .ProductID = 0x204B,
.ReleaseNumber = VERSION_BCD(00.01), .ReleaseNumber = VERSION_BCD(00.01),
.ManufacturerStrIndex = STRING_ID_Manufacturer, .ManufacturerStrIndex = USART_STRING_ID_Manufacturer,
.ProductStrIndex = STRING_ID_Product, .ProductStrIndex = USART_STRING_ID_Product,
.SerialNumStrIndex = USE_INTERNAL_SERIAL, .SerialNumStrIndex = USE_INTERNAL_SERIAL,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
@ -237,15 +237,15 @@ uint16_t USART_GetDescriptor(const uint16_t wValue,
case DTYPE_String: case DTYPE_String:
switch (DescriptorNumber) switch (DescriptorNumber)
{ {
case STRING_ID_Language: case USART_STRING_ID_Language:
Address = &USART_LanguageString; Address = &USART_LanguageString;
Size = pgm_read_byte(&USART_LanguageString.Header.Size); Size = pgm_read_byte(&USART_LanguageString.Header.Size);
break; break;
case STRING_ID_Manufacturer: case USART_STRING_ID_Manufacturer:
Address = &USART_ManufacturerString; Address = &USART_ManufacturerString;
Size = pgm_read_byte(&USART_ManufacturerString.Header.Size); Size = pgm_read_byte(&USART_ManufacturerString.Header.Size);
break; break;
case STRING_ID_Product: case USART_STRING_ID_Product:
Address = &USART_ProductString; Address = &USART_ProductString;
Size = pgm_read_byte(&USART_ProductString.Header.Size); Size = pgm_read_byte(&USART_ProductString.Header.Size);
break; break;

8
Projects/XPLAINBridge/USARTDescriptors.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save