merged trunk changes into branch

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index a2bad2c516d5d4ed44f52c910befd892d21896ac..e54da312e176c12fcc2ccd6ec6e727cc8ce55237 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -51,8 +51,11 @@
 #define UDP_CSR_BYTES_RECEIVED(x)                              (((x) >> 16) & 0x7ff)
 //**************************************************************
 
-#define LOW(x) AT91C_BASE_PIOA->PIO_CODR = (x)
-#define HIGH(x)        AT91C_BASE_PIOA->PIO_SODR = (x)
+#define LOW(x)  AT91C_BASE_PIOA->PIO_CODR = (x)
+#define HIGH(x)         AT91C_BASE_PIOA->PIO_SODR = (x)
+#define GETBIT(x) (AT91C_BASE_PIOA->PIO_ODSR & (x)) ? 1:0
+#define SETBIT(x, y) (y) ? (HIGH(x)):(LOW(x))
+#define INVBIT(x) SETBIT((x), !(GETBIT(x)))
 
 #define SPI_FPGA_MODE  0
 #define SPI_LCD_MODE   1
@@ -64,34 +67,21 @@
 
 //#define PACKED __attribute__((__packed__))
 
-#define USB_D_PLUS_PULLUP_ON() { \
-               HIGH(GPIO_USB_PU); \
-               AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; \
-       }
-#define USB_D_PLUS_PULLUP_OFF() AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU
-
 #define LED_A_ON()             HIGH(GPIO_LED_A)
 #define LED_A_OFF()            LOW(GPIO_LED_A)
+#define LED_A_INV()            INVBIT(GPIO_LED_A)
 #define LED_B_ON()             HIGH(GPIO_LED_B)
 #define LED_B_OFF()            LOW(GPIO_LED_B)
+#define LED_B_INV()            INVBIT(GPIO_LED_B)
 #define LED_C_ON()             HIGH(GPIO_LED_C)
 #define LED_C_OFF()            LOW(GPIO_LED_C)
+#define LED_C_INV()            INVBIT(GPIO_LED_C)
 #define LED_D_ON()             HIGH(GPIO_LED_D)
 #define LED_D_OFF()            LOW(GPIO_LED_D)
+#define LED_D_INV()            INVBIT(GPIO_LED_D)
 #define RELAY_ON()             HIGH(GPIO_RELAY)
 #define RELAY_OFF()            LOW(GPIO_RELAY)
 #define BUTTON_PRESS() !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_BUTTON)
-//--------------------------------
-// USB declarations
-
-void UsbSendPacket(uint8_t *packet, int len);
-int UsbConnected();
-int UsbPoll(int blinkLeds);
-void UsbStart(void);
-
-// This function is provided by the apps/bootrom, and called from UsbPoll
-// if data are available.
-void UsbPacketReceived(uint8_t *packet, int len);
 
 #define VERSION_INFORMATION_MAGIC 0x56334d50
 struct version_information {