Update crapto1.h

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index a2bad2c516d5d4ed44f52c910befd892d21896ac..4a59636e7f6cc156e438a332208116ccd3eb9439 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
 


@@ -51,8 +52,11 @@
 #define UDP_CSR_BYTES_RECEIVED(x)                              (((x) >> 16) & 0x7ff)
 //**************************************************************
 
 #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
 
 #define SPI_FPGA_MODE  0
 #define SPI_LCD_MODE   1


@@ -60,38 +64,23 @@
 #define TRUE 1
 #define FALSE 0
 
 #define TRUE 1
 #define FALSE 0
 

-#include <usb_cmd.h>
-

 //#define PACKED __attribute__((__packed__))
 
 //#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_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_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_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_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)
 #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 {
 
 #define VERSION_INFORMATION_MAGIC 0x56334d50
 struct version_information {


@@ -99,7 +88,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));