Make device mode configure the control endpoint even before the bus has been reset...

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index 2783809..4f7c55b 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -8,7 +8,6 @@
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)

   
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted
   
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted


@@ -180,7 +179,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .HID1_KeyboardHID = 
                {  
 
        .HID1_KeyboardHID = 
                {  

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

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


@@ -217,7 +216,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .HID2_MouseHID = 
                {  
 
        .HID2_MouseHID = 
                {  

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

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


@@ -276,37 +275,39 @@ 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;
                        }
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }


@@ -315,24 +316,24 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                case DTYPE_HID: 
                        if (!(wIndex))
                        {
                case DTYPE_HID: 
                        if (!(wIndex))
                        {

-                               Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;
-                               Size    = sizeof(USB_HID_Descriptor_t);
+                               Address = &ConfigurationDescriptor.HID1_KeyboardHID;
+                               Size    = sizeof(USB_HID_Descriptor_HID_t);

                        }
                        else
                        {
                        }
                        else
                        {

-                               Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;
-                               Size    = sizeof(USB_HID_Descriptor_t);                 
+                               Address = &ConfigurationDescriptor.HID2_MouseHID;
+                               Size    = sizeof(USB_HID_Descriptor_HID_t);                     

                        }
                        break;
                case DTYPE_Report: 
                        if (!(wIndex))
                        {
                        }
                        break;
                case DTYPE_Report: 
                        if (!(wIndex))
                        {

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

                                Size    = sizeof(KeyboardReport);
                        }
                        else
                        {                       
                                Size    = sizeof(KeyboardReport);
                        }
                        else
                        {                       

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

                                Size    = sizeof(MouseReport);
                        }
                        
                                Size    = sizeof(MouseReport);
                        }