diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-15 18:44:46 +0200 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-15 18:44:46 +0200 |
commit | c8f226980499d8e5b0b3d361dc986e2759dcaacb (patch) | |
tree | cd4d200e8368353ae3e330154592e4bb2aa1e31d /Projects/AVRISP-MKII | |
parent | e342ba8f649f779b58e2ca3bd2888477a8dcad05 (diff) | |
download | lufa-c8f226980499d8e5b0b3d361dc986e2759dcaacb.tar.gz lufa-c8f226980499d8e5b0b3d361dc986e2759dcaacb.tar.bz2 lufa-c8f226980499d8e5b0b3d361dc986e2759dcaacb.zip |
Add prefixes to string descriptor ID enum names in the AVRISP and XPLAINBridge projects to avoid conflicts.
Diffstat (limited to 'Projects/AVRISP-MKII')
-rw-r--r-- | Projects/AVRISP-MKII/AVRISPDescriptors.c | 14 | ||||
-rw-r--r-- | Projects/AVRISP-MKII/AVRISPDescriptors.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c index 61c920601..cb19051f4 100644 --- a/Projects/AVRISP-MKII/AVRISPDescriptors.c +++ b/Projects/AVRISP-MKII/AVRISPDescriptors.c @@ -68,9 +68,9 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor = .ProductID = 0x2104, .ReleaseNumber = VERSION_BCD(02.00), - .ManufacturerStrIndex = STRING_ID_Manufacturer, - .ProductStrIndex = STRING_ID_Product, - .SerialNumStrIndex = STRING_ID_Serial, + .ManufacturerStrIndex = AVRISP_STRING_ID_Manufacturer, + .ProductStrIndex = AVRISP_STRING_ID_Product, + .SerialNumStrIndex = AVRISP_STRING_ID_Serial, .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; @@ -219,19 +219,19 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue, case DTYPE_String: switch (DescriptorNumber) { - case STRING_ID_Language: + case AVRISP_STRING_ID_Language: Address = &AVRISP_LanguageString; Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size); break; - case STRING_ID_Manufacturer: + case AVRISP_STRING_ID_Manufacturer: Address = &AVRISP_ManufacturerString; Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size); break; - case STRING_ID_Product: + case AVRISP_STRING_ID_Product: Address = &AVRISP_ProductString; Size = pgm_read_byte(&AVRISP_ProductString.Header.Size); break; - case STRING_ID_Serial: + case AVRISP_STRING_ID_Serial: Address = &AVRISP_SerialString; Size = AVRISP_SerialString.Header.Size; diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h index d372350a1..2f1192384 100644 --- a/Projects/AVRISP-MKII/AVRISPDescriptors.h +++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h @@ -90,12 +90,12 @@ * have a unique ID index associated with it, which can be used to refer to the string from * other descriptors. */ - enum StringDescriptors_t + enum AVRISP_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 */ - STRING_ID_Serial = 3, /**< Serial number string ID */ + AVRISP_STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ + AVRISP_STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ + AVRISP_STRING_ID_Product = 2, /**< Product string ID */ + AVRISP_STRING_ID_Serial = 3, /**< Serial number string ID */ }; /* External Variables: */ |