Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest...

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

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 819b488..dd6b3fb 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -85,7 +85,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
                                \r
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
                                \r

-       .Endpoint0Size          = 8,\r
+       .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r

                \r
        .VendorID               = 0x03EB,\r
        .ProductID              = 0x2042,\r
                \r
        .VendorID               = 0x03EB,\r
        .ProductID              = 0x2042,\r


@@ -142,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r

-                       .TotalHIDReports        = 0x01,\r
+                       .TotalHIDDescriptors    = 1,\r

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


@@ -190,7 +190,7 @@ USB_Descriptor_String_t PROGMEM ProductString =
        .UnicodeString          = L"Magnetic Card Reader"\r
 };\r
 \r
        .UnicodeString          = L"Magnetic Card Reader"\r
 };\r
 \r

-/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
+/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"\r

  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r