Mark build test makefiles as being incompatible with parallel make builds, as they...

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

diff --git a/Projects/Magstripe/Lib/MagstripeHW.h b/Projects/Magstripe/Lib/MagstripeHW.h
index 5b20fc4..43e3444 100644 (file)
--- a/Projects/Magstripe/Lib/MagstripeHW.h
+++ b/Projects/Magstripe/Lib/MagstripeHW.h
@@ -1,14 +1,14 @@
 /*
   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 2012  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


@@ -65,6 +65,7 @@
                #include <avr/io.h>
 
                #include <LUFA/Common/Common.h>
                #include <avr/io.h>
 
                #include <LUFA/Common/Common.h>

+               #include "Config/AppConfig.h"

 
        /* Private Interface - For use in library only: */
                /* Macros: */
 
        /* Private Interface - For use in library only: */
                /* Macros: */


@@ -76,7 +77,7 @@
 
        /* Public Interface - May be used in end-application: */
                /* Inline Functions: */
 
        /* Public Interface - May be used in end-application: */
                /* Inline Functions: */

-                       /** Initialises the magnetic stripe card reader ports and pins so that the card reader
+                       /** Initializes the magnetic stripe card reader ports and pins so that the card reader

                         *  device can be controlled and read by the card reader driver. This must be called before
                         *  trying to read any of the card reader's status lines.
                         */
                         *  device can be controlled and read by the card reader driver. This must be called before
                         *  trying to read any of the card reader's status lines.
                         */


@@ -98,3 +99,4 @@
                        }
 
 #endif
                        }
 
 #endif

+