Merge branch 'master' of github.com:Proxmark/proxmark3

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index e54da312e176c12fcc2ccd6ec6e727cc8ce55237..b3530c64f2ae22b920458e05e4f483340b1baac4 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -14,6 +14,7 @@
 // Might as well have the hardware-specific defines everywhere.
 #include "at91sam7s512.h"
 #include "config_gpio.h"
 // Might as well have the hardware-specific defines everywhere.
 #include "at91sam7s512.h"
 #include "config_gpio.h"

+#include "usb_cmd.h"

 
 #define WDT_HIT()                                                              AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
 
 #define WDT_HIT()                                                              AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 


@@ -60,11 +61,13 @@
 #define SPI_FPGA_MODE  0
 #define SPI_LCD_MODE   1
 
 #define SPI_FPGA_MODE  0
 #define SPI_LCD_MODE   1
 

+#define FPGA_BITSTREAM_ERR 0
+#define FPGA_BITSTREAM_LF 1
+#define FPGA_BITSTREAM_HF 2
+

 #define TRUE 1
 #define FALSE 0
 
 #define TRUE 1
 #define FALSE 0
 

-#include <usb_cmd.h>
-

 //#define PACKED __attribute__((__packed__))
 
 #define LED_A_ON()             HIGH(GPIO_LED_A)
 //#define PACKED __attribute__((__packed__))
 
 #define LED_A_ON()             HIGH(GPIO_LED_A)


@@ -89,7 +92,7 @@ struct version_information {
        char versionversion; /* Must be 1 */
        char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
        char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */
        char versionversion; /* Must be 1 */
        char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
        char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */

-       char svnversion[9]; /* String with the SVN revision */
+       char gitversion[50]; /* String with the git revision */

        char buildtime[30]; /* string with the build time */
 } __attribute__((packed));
 
        char buildtime[30]; /* string with the build time */
 } __attribute__((packed));