Ooops - TeensyHID bootloader makefile should use a 16MHz FCPU, not 8MHz.

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

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 819b488..30cf3b8 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


@@ -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

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

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


@@ -152,9 +152,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),\r

-                       .Attributes             = EP_TYPE_INTERRUPT,\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = KEYBOARD_EPSIZE,\r
                        .EndpointSize           = KEYBOARD_EPSIZE,\r

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

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


@@ -190,13 +190,13 @@ 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
  *  USB host.\r
  */\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
  *  USB host.\r
  */\r

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r

 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r


@@ -207,37 +207,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r

-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        switch (DescriptorNumber)\r
                        {\r
                                case 0x00:\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        switch (DescriptorNumber)\r
                        {\r
                                case 0x00:\r

-                                       Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                                       Address = (void*)&LanguageString;\r

                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                case 0x01:\r
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                case 0x01:\r

-                                       Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
+                                       Address = (void*)&ManufacturerString;\r

                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                case 0x02:\r
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                case 0x02:\r

-                                       Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                                       Address = (void*)&ProductString;\r

                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                        }\r
                        \r
                        break;\r
                case DTYPE_HID:\r
                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                        }\r
                        \r
                        break;\r
                case DTYPE_HID:\r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID);\r
-                       Size    = sizeof(USB_Descriptor_HID_t);\r
+                       Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+                       Size    = sizeof(USB_HID_Descriptor_t);\r

                        break;\r
                case DTYPE_Report:\r
                        break;\r
                case DTYPE_Report:\r

-                       Address = DESCRIPTOR_ADDRESS(KeyboardReport);\r
+                       Address = (void*)&KeyboardReport;\r

                        Size    = sizeof(KeyboardReport);\r
                        break;\r
        }\r
                        Size    = sizeof(KeyboardReport);\r
                        break;\r
        }\r