Fix LowLevel Keyboard demo -- accidentally trying to dereference a uint8_t type in...

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

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index 93e593e..ddadd0d 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -1,22 +1,22 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Denver Gingerich (denver [at] ossguy [dot] com)\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -51,6 +51,9 @@
                #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
@@ -62,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_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
-                                                            void* ReportData);\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
+               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