aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/AVRISP-MKII/AVRISPDescriptors.h
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-05-15 18:44:46 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-05-15 18:44:46 +0200
commitc8f226980499d8e5b0b3d361dc986e2759dcaacb (patch)
treecd4d200e8368353ae3e330154592e4bb2aa1e31d /Projects/AVRISP-MKII/AVRISPDescriptors.h
parente342ba8f649f779b58e2ca3bd2888477a8dcad05 (diff)
downloadlufa-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/AVRISPDescriptors.h')
-rw-r--r--Projects/AVRISP-MKII/AVRISPDescriptors.h10
1 files changed, 5 insertions, 5 deletions
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: */