X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bd20f8f47847787e1f3e933043933272908c5beb..42daa759c16328607aff6ab35ef97656ad2050da:/include/proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index 97e6bade..e54da312 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -20,12 +20,6 @@
 #define PWM_CH_MODE_PRESCALER(x)				((x)<<0)
 #define PWM_CHANNEL(x)							(1<<(x))
 
-#define TC_CMR_TCCLKS_TIMER_CLOCK1				(0<<0)
-#define TC_CMR_TCCLKS_TIMER_CLOCK2				(1<<0)
-#define TC_CMR_TCCLKS_TIMER_CLOCK3				(2<<0)
-#define TC_CMR_TCCLKS_TIMER_CLOCK4				(3<<0)
-#define TC_CMR_TCCLKS_TIMER_CLOCK5				(4<<0)
-
 #define ADC_CHAN_LF								4
 #define ADC_CHAN_HF								5
 #define ADC_MODE_PRESCALE(x)					((x)<<8)
@@ -40,23 +34,14 @@
 #define SSC_FRAME_MODE_BITS_IN_WORD(x)			(((x)-1)<<0)
 
 #define MC_FLASH_COMMAND_KEY					((0x5a)<<24)
-#define MC_FLASH_STATUS_READY					(1<<0)
-#define MC_FLASH_STATUS_LOCKE					(1<<2)
-#define MC_FLASH_STATUS_PROGE					(1<<3)
 #define MC_FLASH_MODE_FLASH_WAIT_STATES(x)		((x)<<8)
-#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)		((x)<<16)
+#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)		(((x)+((x)/2))<<16)
 #define MC_FLASH_COMMAND_PAGEN(x)				((x)<<8)
 
 #define RST_CONTROL_KEY							(0xa5<<24)
 
-#define PMC_MAIN_OSC_ENABLE						(1<<0)
-#define PMC_MAIN_OSC_STABILIZED					(1<<0)
-#define PMC_MAIN_OSC_PLL_LOCK					(1<<2)
-#define PMC_MAIN_OSC_MCK_READY					(1<<3)
-
 #define PMC_MAIN_OSC_STARTUP_DELAY(x)			((x)<<8)
 #define PMC_PLL_DIVISOR(x)						(x)
-#define PMC_CLK_PRESCALE_DIV_2					(1<<2)
 #define PMC_PLL_MULTIPLIER(x)					(((x)-1)<<16)
 #define PMC_PLL_COUNT_BEFORE_LOCK(x)			((x)<<8)
 #define PMC_PLL_FREQUENCY_RANGE(x)				((x)<<14)
@@ -66,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
@@ -79,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 {