Remove internal USB_Device_NibbleToASCII() function in favour of manually inlined...

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

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 2a04e5f..49ef159 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*


@@ -60,7 +60,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
        0x95, 0x01,          /*   Report Count (1)                              */
        0x75, 0x08,          /*   Report Size (8)                               */
        0x81, 0x03,          /*   Input (Const, Variable, Absolute)             */
        0x95, 0x01,          /*   Report Count (1)                              */
        0x75, 0x08,          /*   Report Size (8)                               */
        0x81, 0x03,          /*   Input (Const, Variable, Absolute)             */

-       0x95, 0x01,          /*   Report Count (1)                              */
+       0x95, 0x06,          /*   Report Count (6)                              */

        0x75, 0x08,          /*   Report Size (8)                               */
        0x15, 0x00,          /*   Logical Minimum (0)                           */
        0x25, 0x65,          /*   Logical Maximum (101)                         */
        0x75, 0x08,          /*   Report Size (8)                               */
        0x15, 0x00,          /*   Logical Minimum (0)                           */
        0x25, 0x65,          /*   Logical Maximum (101)                         */


@@ -81,9 +81,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),

-       .Class                  = 0x00,
-       .SubClass               = 0x00,
-       .Protocol               = 0x00,
+       .Class                  = USB_CSCP_NoDeviceClass,
+       .SubClass               = USB_CSCP_NoDeviceSubclass,
+       .Protocol               = USB_CSCP_NoDeviceProtocol,

 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 


@@ -129,9 +129,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 1,
 
 
                        .TotalEndpoints         = 1,
 

-                       .Class                  = 0x03,
-                       .SubClass               = 0x01,
-                       .Protocol               = 0x01,
+                       .Class                  = HID_CSCP_HIDClass,
+                       .SubClass               = HID_CSCP_BootSubclass,
+                       .Protocol               = HID_CSCP_KeyboardBootProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },