Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index 8c9417da5e26d8d45fbc170af70c1f3e769fafd3..23d7b1ceb81932e8b3836c24059ee0ca9d61d594 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,14 +61,12 @@
 #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
 
-#include <usb_cmd.h>
+#ifndef COTAG_BITS
+#define COTAG_BITS 264
+#endif
 
 //#define PACKED __attribute__((__packed__))