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

[pub/USBasp.git] / Projects / Magstripe / Magstripe.h

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index c96d038..cd1fd9c 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -51,6 +51,12 @@
                #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Macros: */\r
+               /** Total number of tracks which can be read from the card, between 1 and 3. */\r
+               #define TOTAL_TRACKS       3\r
+       \r
+               /** HID keyboard keycode to indicate that no is currently pressed. */\r
+               #define KEY_NONE           0\r
+       \r
                /** HID keyboard keycode to indicate that the "1" key is currently pressed. */\r
                #define KEY_1              30\r
 \r
@@ -59,29 +65,18 @@
 \r
                /** HID keyboard keycode to indicate that the enter key is currently pressed. */\r
                #define KEY_ENTER          40\r
-               \r
-       /* Type Defines: */\r
-               /** Type define for the keyboard report structure. This structure matches the report layout\r
-                *  given to the host in the HID Report descriptor, as well as matches the boot protocol report\r
-                *  structure. This means that this one report structure can be used in both Report and Boot Protocol\r
-                *  modes. */\r
-               typedef struct\r
-               {\r
-                       uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */\r
-                       uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */\r
-                       uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */\r
-               } USB_KeyboardReport_Data_t;\r
        \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                void ReadMagstripeData(void);\r
                \r
-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
+               void EVENT_USB_Device_StartOfFrame(void);\r
 \r
-               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID,\r
-                                                             void* ReportData);\r
-               void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
-                                                       void* ReportData, uint16_t ReportSize);\r
-               \r
+               bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
+                                                 const uint8_t ReportType, void* ReportData, uint16_t* ReportSize);\r
+               void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, \r
+                                                         const void* ReportData, const uint16_t ReportSize);\r
+                                                                                                                 \r
 #endif\r