Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[pub/USBasp.git] / Bootloaders / Printer / Descriptors.c

diff --git a/Bootloaders/Printer/Descriptors.c b/Bootloaders/Printer/Descriptors.c
index b1b1a58..5329afc 100644 (file)
--- a/Bootloaders/Printer/Descriptors.c
+++ b/Bootloaders/Printer/Descriptors.c
@@ -58,8 +58,8 @@ const USB_Descriptor_Device_t DeviceDescriptor =
        .ProductID              = 0x206B,
        .ReleaseNumber          = VERSION_BCD(00.01),
 
        .ProductID              = 0x206B,
        .ReleaseNumber          = VERSION_BCD(00.01),
 

-       .ManufacturerStrIndex   = 0x01,
-       .ProductStrIndex        = 0x02,
+       .ManufacturerStrIndex   = STRING_ID_Manufacturer,
+       .ProductStrIndex        = STRING_ID_Product,

        .SerialNumStrIndex      = NO_DESCRIPTOR,
 
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
        .SerialNumStrIndex      = NO_DESCRIPTOR,
 
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS


@@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 

-                       .InterfaceNumber        = 0,
+                       .InterfaceNumber        = INTERFACE_ID_Printer,

                        .AlternateSetting       = 0,
 
                        .TotalEndpoints         = 2,
                        .AlternateSetting       = 0,
 
                        .TotalEndpoints         = 2,


@@ -186,17 +186,17 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                case DTYPE_String:
                        switch (DescriptorNumber)
                        {
                case DTYPE_String:
                        switch (DescriptorNumber)
                        {

-                               case 0x00:
+                               case STRING_ID_Language:

                                        Address = &LanguageString;
                                        Address = &LanguageString;

-                                       Size    = pgm_read_byte(&LanguageString.Header.Size);
+                                       Size    = LanguageString.Header.Size;

                                        break;
                                        break;

-                               case 0x01:
+                               case STRING_ID_Manufacturer:

                                        Address = &ManufacturerString;
                                        Address = &ManufacturerString;

-                                       Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+                                       Size    = ManufacturerString.Header.Size;

                                        break;
                                        break;

-                               case 0x02:
+                               case STRING_ID_Product:

                                        Address = &ProductString;
                                        Address = &ProductString;

-                                       Size    = pgm_read_byte(&ProductString.Header.Size);
+                                       Size    = ProductString.Header.Size;

                                        break;
                        }
 
                                        break;
                        }