Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

[pub/USBasp.git] / Projects / TempDataLogger / Descriptors.c

diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c
index 8ca6b6e..16a6581 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/Descriptors.c
@@ -93,7 +93,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2063,
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2063,

-       .ReleaseNumber          = 0x0000,
+       .ReleaseNumber          = VERSION_BCD(00.01),

                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,
                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,


@@ -119,7 +119,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .ConfigurationNumber    = 1,
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,
                                
                        .ConfigurationNumber    = 1,
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,
                                

-                       .ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,
+                       .ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),

                        
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
                },
                        
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
                },


@@ -171,19 +171,19 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                
                        .Class                  = 0x03,
                        .SubClass               = 0x00,
                                
                        .Class                  = 0x03,
                        .SubClass               = 0x00,

-                       .Protocol               = HID_NON_BOOT_PROTOCOL,
+                       .Protocol               = HID_BOOTP_NonBootProtocol,

                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_GenericHID = 
                {
                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_GenericHID = 
                {

-                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

                                                                         
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,
                                                                         
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,

-                       .HIDReportType          = DTYPE_Report,
+                       .HIDReportType          = HID_DTYPE_Report,

                        .HIDReportLength        = sizeof(GenericReport)
                },
 
                        .HIDReportLength        = sizeof(GenericReport)
                },
 


@@ -237,48 +237,50 @@ USB_Descriptor_String_t PROGMEM ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */

-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                    const uint8_t wIndex,
+                                    const void** const DescriptorAddress)

 {
        const uint8_t  DescriptorType   = (wValue >> 8);
        const uint8_t  DescriptorNumber = (wValue & 0xFF);
 
 {
        const uint8_t  DescriptorType   = (wValue >> 8);
        const uint8_t  DescriptorNumber = (wValue & 0xFF);
 

-       void*    Address = NULL;
-       uint16_t Size    = NO_DESCRIPTOR;
+       const void* Address = NULL;
+       uint16_t    Size    = NO_DESCRIPTOR;

 
        switch (DescriptorType)
        {
                case DTYPE_Device: 
 
        switch (DescriptorType)
        {
                case DTYPE_Device: 

-                       Address = (void*)&DeviceDescriptor;
+                       Address = &DeviceDescriptor;

                        Size    = sizeof(USB_Descriptor_Device_t);
                        break;
                case DTYPE_Configuration: 
                        Size    = sizeof(USB_Descriptor_Device_t);
                        break;
                case DTYPE_Configuration: 

-                       Address = (void*)&ConfigurationDescriptor;
+                       Address = &ConfigurationDescriptor;

                        Size    = sizeof(USB_Descriptor_Configuration_t);
                        break;
                case DTYPE_String: 
                        switch (DescriptorNumber)
                        {
                                case 0x00: 
                        Size    = sizeof(USB_Descriptor_Configuration_t);
                        break;
                case DTYPE_String: 
                        switch (DescriptorNumber)
                        {
                                case 0x00: 

-                                       Address = (void*)&LanguageString;
+                                       Address = &LanguageString;

                                        Size    = pgm_read_byte(&LanguageString.Header.Size);
                                        break;
                                case 0x01: 
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);
                                        break;
                                case 0x01: 

-                                       Address = (void*)&ManufacturerString;
+                                       Address = &ManufacturerString;

                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);
                                        break;
                                case 0x02: 
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);
                                        break;
                                case 0x02: 

-                                       Address = (void*)&ProductString;
+                                       Address = &ProductString;

                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }
                        
                        break;
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }
                        
                        break;

-               case DTYPE_HID: 
-                       Address = (void*)&ConfigurationDescriptor.HID_GenericHID;
-                       Size    = sizeof(USB_HID_Descriptor_t);
+               case HID_DTYPE_HID: 
+                       Address = &ConfigurationDescriptor.HID_GenericHID;
+                       Size    = sizeof(USB_HID_Descriptor_HID_t);

                        break;
                        break;

-               case DTYPE_Report: 
-                       Address = (void*)&GenericReport;
+               case HID_DTYPE_Report: 
+                       Address = &GenericReport;

                        Size    = sizeof(GenericReport);
                        break;
        }
                        Size    = sizeof(GenericReport);
                        break;
        }