More XMEGA USB AVR device port work - re-add missing Endpoint stream functions, remov...

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

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 9a551a1..2b8fe27 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -1,22 +1,22 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 */
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -28,25 +28,25 @@
   arising out of or in connection with the use or performance of
   this software.
 */
   arising out of or in connection with the use or performance of
   this software.
 */

- 
+

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

- 
+

 #include "Magstripe.h"
 
 /** Bit buffers to hold the read bits for each of the three magnetic card tracks before they are transmitted
  *  to the host as keyboard presses.
  */
 #include "Magstripe.h"
 
 /** Bit buffers to hold the read bits for each of the three magnetic card tracks before they are transmitted
  *  to the host as keyboard presses.
  */

-BitBuffer_t TrackDataBuffers[TOTAL_TRACKS];
+static BitBuffer_t TrackDataBuffers[TOTAL_TRACKS];

 
 /** Pointer to the current track buffer being sent to the host. */
 
 /** Pointer to the current track buffer being sent to the host. */

-BitBuffer_t* CurrentTrackBuffer = &TrackDataBuffers[TOTAL_TRACKS];
+static BitBuffer_t* CurrentTrackBuffer = &TrackDataBuffers[TOTAL_TRACKS];

 
 /** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */
 
 /** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */

-uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];
+static uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];

 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class
 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class


@@ -67,16 +67,17 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
                        },
        };
 
                        },
        };
 

+

 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
 int main(void)
 {
        SetupHardware();
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
 int main(void)
 {
        SetupHardware();

-       
+

        for (uint8_t Buffer = 0; Buffer < TOTAL_TRACKS; Buffer++)
          BitBuffer_Init(&TrackDataBuffers[Buffer]);
        for (uint8_t Buffer = 0; Buffer < TOTAL_TRACKS; Buffer++)
          BitBuffer_Init(&TrackDataBuffers[Buffer]);

-         
+

        sei();
 
        for (;;)
        sei();
 
        for (;;)


@@ -113,7 +114,7 @@ void ReadMagstripeData(void)
        const struct
        {
                uint8_t ClockMask;
        const struct
        {
                uint8_t ClockMask;

-               uint8_t DataMask;       
+               uint8_t DataMask;

        } TrackInfo[] = {{MAG_T1_CLOCK, MAG_T1_DATA},
                         {MAG_T2_CLOCK, MAG_T2_DATA},
                         {MAG_T3_CLOCK, MAG_T3_DATA}};
        } TrackInfo[] = {{MAG_T1_CLOCK, MAG_T1_DATA},
                         {MAG_T2_CLOCK, MAG_T2_DATA},
                         {MAG_T3_CLOCK, MAG_T3_DATA}};


@@ -128,7 +129,7 @@ void ReadMagstripeData(void)
                        bool DataPinLevel      = ((Magstripe_LCL & TrackInfo[Track].DataMask) != 0);
                        bool ClockPinLevel     = ((Magstripe_LCL & TrackInfo[Track].ClockMask) != 0);
                        bool ClockLevelChanged = (((Magstripe_LCL ^ Magstripe_Prev) & TrackInfo[Track].ClockMask) != 0);
                        bool DataPinLevel      = ((Magstripe_LCL & TrackInfo[Track].DataMask) != 0);
                        bool ClockPinLevel     = ((Magstripe_LCL & TrackInfo[Track].ClockMask) != 0);
                        bool ClockLevelChanged = (((Magstripe_LCL ^ Magstripe_Prev) & TrackInfo[Track].ClockMask) != 0);

-               
+

                        /* Sample data on rising clock edges from the card reader */
                        if (ClockPinLevel && ClockLevelChanged)
                          BitBuffer_StoreNextBit(&TrackDataBuffers[Track], DataPinLevel);
                        /* Sample data on rising clock edges from the card reader */
                        if (ClockPinLevel && ClockLevelChanged)
                          BitBuffer_StoreNextBit(&TrackDataBuffers[Track], DataPinLevel);


@@ -137,7 +138,7 @@ void ReadMagstripeData(void)
                Magstripe_Prev = Magstripe_LCL;
                Magstripe_LCL  = Magstripe_GetStatus();
        }
                Magstripe_Prev = Magstripe_LCL;
                Magstripe_LCL  = Magstripe_GetStatus();
        }

-       
+

        CurrentTrackBuffer = &TrackDataBuffers[0];
 }
 
        CurrentTrackBuffer = &TrackDataBuffers[0];
 }
 


@@ -149,8 +150,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        USB_Device_EnableSOFEvents();
 }
 
        USB_Device_EnableSOFEvents();
 }
 

-/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)

 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
 }
 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
 }


@@ -200,7 +201,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                /* Still data in the current track; convert next bit to a 1 or 0 keypress */
                KeyboardReport->KeyCode[0] = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0;
        }
                /* Still data in the current track; convert next bit to a 1 or 0 keypress */
                KeyboardReport->KeyCode[0] = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0;
        }

-       
+

        *ReportSize = sizeof(USB_KeyboardReport_Data_t);
        return false;
 }
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);
        return false;
 }


@@ -219,5 +220,6 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {

-       // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports
+       // Ignore keyboard LED reports from the host, but still need to declare the callback routine

 }
 }

+