Fixed swapped paremeters in the HID state memory copy call while processing a HID...

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

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 1dee586..d4c5472 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -93,9 +93,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                \r
        .ManufacturerStrIndex   = 0x01,\r
        .ProductStrIndex        = 0x02,\r
                \r
        .ManufacturerStrIndex   = 0x01,\r
        .ProductStrIndex        = 0x02,\r

-       .SerialNumStrIndex      = NO_DESCRIPTOR,\r
+       .SerialNumStrIndex      = USE_INTERNAL_SERIAL,\r

                \r
                \r

-       .NumberOfConfigurations = 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r

 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r


@@ -138,11 +138,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .KeyboardHID = \r
                {  \r
 \r
        .KeyboardHID = \r
                {  \r

-                       .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r

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

-                       .TotalHIDDescriptors    = 1,\r
+                       .TotalReportDescriptors = 1,\r

                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r


@@ -154,7 +154,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),\r
                        .Attributes             = EP_TYPE_INTERRUPT,\r
                        .EndpointSize           = KEYBOARD_EPSIZE,\r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),\r
                        .Attributes             = EP_TYPE_INTERRUPT,\r
                        .EndpointSize           = KEYBOARD_EPSIZE,\r

-                       .PollingIntervalMS      = 0x04\r
+                       .PollingIntervalMS      = 0x01\r

                },\r
 };\r
 \r
                },\r
 };\r
 \r


@@ -234,7 +234,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                        break;\r
                case DTYPE_HID:\r
                        Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
                        break;\r
                case DTYPE_HID:\r
                        Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r

-                       Size    = sizeof(USB_Descriptor_HID_t);\r
+                       Size    = sizeof(USB_HID_Descriptor_t);\r

                        break;\r
                case DTYPE_Report:\r
                        Address = (void*)&KeyboardReport;\r
                        break;\r
                case DTYPE_Report:\r
                        Address = (void*)&KeyboardReport;\r