Renamed Projects/Unfinished to Projects/Incomplete for consistancy.

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

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index 2b8aa37..aabf6ac 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -48,9 +48,15 @@
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r

-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r

 \r
        /* Macros: */\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
                /** HID keyboard keycode to indicate that the "1" key is currently pressed. */\r
                #define KEY_1              30\r
 \r


@@ -76,11 +82,13 @@
                void SetupHardware(void);\r
                void ReadMagstripeData(void);\r
                \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
 \r

-               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);\r
-               void     CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,\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
+                                                 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
 #endif\r