Add prefixes to string descriptor ID enum names in the AVRISP and XPLAINBridge projec...

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c
index 61c9206..cb19051 100644 (file)
--- 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),
 
        .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
 };
 
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };


@@ -219,19 +219,19 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                case DTYPE_String:
                        switch (DescriptorNumber)
                        {
                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;
                                        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;
                                        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;
                                        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;
 
                                        Address = &AVRISP_SerialString;
                                        Size    = AVRISP_SerialString.Header.Size;
 

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h
index d372350..2f11923 100644 (file)
--- 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.
                 */
                 *  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: */
                };
 
        /* External Variables: */

diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c
index 6e69462..0e0ac85 100644 (file)
--- 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),
 
        .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
        .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 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;
                                        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;
                                        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;
                                        Address = &USART_ProductString;
                                        Size    = pgm_read_byte(&USART_ProductString.Header.Size);
                                        break;

diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h
index 07acbae..954867c 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -85,11 +85,11 @@
                 *  have a unique ID index associated with it, which can be used to refer to the string from
                 *  other descriptors.
                 */
                 *  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: */
                };
 
        /* Function Prototypes: */