Fixed compilation error in incomplete BluetoothHost demo.

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

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 871db28..95c81f3 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -29,20 +29,44 @@
   this software.\r
 */\r
  \r
   this software.\r
 */\r
  \r

+/** \file\r
+ *\r
+ *  Main source file for the MagStripe reader program. This file contains the main tasks of\r
+ *  the project and is responsible for the initial application hardware configuration.\r
+ */\r
+ \r

 #include "Magstripe.h"\r
 \r
 #include "Magstripe.h"\r
 \r

+/** Bit buffers to hold the read bits for each of the three magnetic card tracks before they are transmitted\r
+ *  to the host as keyboard presses.\r
+ */\r

 BitBuffer_t TrackDataBuffers[3];\r
 \r
 BitBuffer_t TrackDataBuffers[3];\r
 \r

-USB_ClassInfo_HID_t Keyboard_HID_Interface =\r
+/** LUFA HID Class driver interface configuration and state information. This structure is\r
+ *  passed to all HID Class driver functions, so that multiple instances of the same class\r
+ *  within a device can be differentiated from one another.\r
+ */\r
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =\r

        {\r
        {\r

-               .InterfaceNumber         = 0,\r
-\r
-               .ReportINEndpointNumber  = KEYBOARD_EPNUM,\r
-               .ReportINEndpointSize    = KEYBOARD_EPSIZE,\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber         = 0,\r
+\r
+                               .ReportINEndpointNumber  = KEYBOARD_EPNUM,\r
+                               .ReportINEndpointSize    = KEYBOARD_EPSIZE,\r
+                               \r
+                               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
+                       },\r

                \r
                \r

-               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
+               .State =\r
+                       {\r
+                               // Leave all state values to their defaults                             \r
+                       }\r

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

+/** Main program entry point. This routine contains the overall program flow, including initial\r
+ *  setup of all components and the main program loop.\r
+ */\r

 int main(void)\r
 {\r
        SetupHardware();\r
 int main(void)\r
 {\r
        SetupHardware();\r


@@ -55,11 +79,12 @@ int main(void)
                if (Magstripe_GetStatus() & MAG_CARDPRESENT)\r
                  ReadMagstripeData();\r
 \r
                if (Magstripe_GetStatus() & MAG_CARDPRESENT)\r
                  ReadMagstripeData();\r
 \r

-               USB_HID_USBTask(&Keyboard_HID_Interface);\r
+               HID_Device_USBTask(&Keyboard_HID_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
 \r
                USB_USBTask();\r
        }\r
 }\r
 \r

+/** Configures the board hardware and chip peripherals for the demo's functionality. */\r

 void SetupHardware(void)\r
 {\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
 void SetupHardware(void)\r
 {\r
        /* Disable watchdog if enabled by bootloader/fuses */\r


@@ -80,6 +105,9 @@ void SetupHardware(void)
        TIMSK0 = (1 << OCIE0A);\r
 }\r
 \r
        TIMSK0 = (1 << OCIE0A);\r
 }\r
 \r

+/** Determines if a card has been inserted, and if so reads in each track's contents into the bit buffers\r
+ *  until they are read out to the host as a series of keyboard presses.\r
+ */\r

 void ReadMagstripeData(void)\r
 {\r
        /* Arrays to hold the buffer pointers, clock and data bit masks for the separate card tracks */\r
 void ReadMagstripeData(void)\r
 {\r
        /* Arrays to hold the buffer pointers, clock and data bit masks for the separate card tracks */\r


@@ -111,30 +139,41 @@ void ReadMagstripeData(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

+/** Event handler for the library USB Configuration Changed event. */\r

 void EVENT_USB_ConfigurationChanged(void)\r
 {\r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r

-       USB_HID_ConfigureEndpoints(&Keyboard_HID_Interface);\r
+       HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface);\r

 }\r
 \r
 }\r
 \r

+/** Event handler for the library USB Unhandled Control Packet event. */\r

 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r

-       USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);\r
+       HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);\r

 }\r
 \r
 }\r
 \r

+/** Timer 0 CTC ISR, firing once each millisecond to keep track of elapsed idle time in the HID interface. */\r

 ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
 {\r
 ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
 {\r

-       if (Keyboard_HID_Interface.IdleMSRemaining)\r
-         Keyboard_HID_Interface.IdleMSRemaining--;\r
+       if (Keyboard_HID_Interface.State.IdleMSRemaining)\r
+         Keyboard_HID_Interface.State.IdleMSRemaining--;\r

 }\r
 \r
 }\r
 \r

-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)\r
+/** HID Class driver callback function for the creation of a HID report for the host.\r
+ *\r
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID interface structure for the HID interface being referenced\r
+ *  \param[in,out] ReportID      Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ *  \param[out] ReportData       Pointer to the preallocated report buffer where the created report should be stored\r
+ *\r
+ *  \return Number of bytes in the created report\r
+ */\r
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)\r

 {\r
        static bool IsKeyReleaseReport;\r
        static bool IsNewlineReport;\r
 \r
        BitBuffer_t*               Buffer         = NULL;\r
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;\r
 {\r
        static bool IsKeyReleaseReport;\r
        static bool IsNewlineReport;\r
 \r
        BitBuffer_t*               Buffer         = NULL;\r
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;\r

-               \r
+       \r

        /* Key reports must be interleaved with 0 Key Code reports to release the keys, or repeated keys will be ignored */\r
        IsKeyReleaseReport = !IsKeyReleaseReport;       \r
 \r
        /* Key reports must be interleaved with 0 Key Code reports to release the keys, or repeated keys will be ignored */\r
        IsKeyReleaseReport = !IsKeyReleaseReport;       \r
 \r


@@ -168,7 +207,15 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
        return sizeof(USB_KeyboardReport_Data_t);\r
 }\r
 \r
        return sizeof(USB_KeyboardReport_Data_t);\r
 }\r
 \r

-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData, uint16_t ReportSize)\r
+/** HID Class driver callback function for the processing of a received HID report from the host.\r
+ *\r
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID interface structure for the HID interface being referenced\r
+ *  \param[in] ReportID          Report ID of the received report from the host\r
+ *  \param[in] ReportData        Pointer to the report buffer where the received report is stored\r
+ *  \param[in] ReportSize        Size in bytes of the report received from the host\r
+ */\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
        // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r
 }\r
 {\r
        // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r
 }\r