Merge branch 'master' into master

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index ce263ca11a0d3dc456e355a931b08ffe768ac884..6fb6624fa1cbe5b36b3dcd3fc0a3358b3ecba57d 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"
+#include "usb_cmd.h"
 
 #define WDT_HIT()                                                              AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
@@ -60,11 +61,6 @@
 #define SPI_FPGA_MODE  0
 #define SPI_LCD_MODE   1
 
-#define TRUE 1
-#define FALSE 0
-
-#include <usb_cmd.h>
-
 //#define PACKED __attribute__((__packed__))
 
 #define LED_A_ON()             HIGH(GPIO_LED_A)