Code cleanup (#616)

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index 0431dc802dfbf47c0fd227350f70348b1ec36e83..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,19 +61,8 @@
 #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 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)
@@ -88,17 +78,6 @@
 #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 {
@@ -106,7 +85,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 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));