Fixed MIDI_Host_Flush() not aborting early when the specified MIDI host interface...

[pub/USBasp.git] / Demos / Device / ClassDriver / Joystick / Descriptors.c

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index b2f0f7e..6000e0e 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -91,7 +91,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2043,
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2043,

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

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


@@ -133,19 +133,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_JoystickHID = 
                {
                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_JoystickHID = 
                {

-                       .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(JoystickReport)
                },
 
                        .HIDReportLength        = sizeof(JoystickReport)
                },
 


@@ -237,11 +237,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        }
                        
                        break;
                        }
                        
                        break;

-               case DTYPE_HID: 
+               case HID_DTYPE_HID: 

                        Address = &ConfigurationDescriptor.HID_JoystickHID;
                        Address = &ConfigurationDescriptor.HID_JoystickHID;

-                       Size    = sizeof(USB_HID_Descriptor_t);
+                       Size    = sizeof(USB_HID_Descriptor_HID_t);

                        break;
                        break;

-               case DTYPE_Report: 
+               case HID_DTYPE_Report: 

                        Address = &JoystickReport;
                        Size    = sizeof(JoystickReport);
                        break;
                        Address = &JoystickReport;
                        Size    = sizeof(JoystickReport);
                        break;