X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8419248d2dc311a7d2c86f1c11d0a07cf2047731..8f97dd895ea8c522b8613e2ff59dddb5652ee9e2:/include/proxmark3.h?ds=inline

diff --git a/include/proxmark3.h b/include/proxmark3.h
index c9fbdab6..a2bad2c5 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -1,26 +1,25 @@
 //-----------------------------------------------------------------------------
-// Definitions of interest to most of the software for this project.
 // Jonathan Westhues, Mar 2006
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hardware and interface definitions
 //-----------------------------------------------------------------------------
 
 #ifndef __PROXMARK3_H
 #define __PROXMARK3_H
 
 // Might as well have the hardware-specific defines everywhere.
-#include <at91sam7s512.h>
-#include <config_gpio.h>
+#include "at91sam7s512.h"
+#include "config_gpio.h"
 
 #define WDT_HIT()								AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
 #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)
@@ -35,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)
@@ -67,14 +57,6 @@
 #define SPI_FPGA_MODE	0
 #define SPI_LCD_MODE	1
 
-typedef unsigned long DWORD;
-typedef signed long SDWORD;
-typedef unsigned long long QWORD;
-typedef int BOOL;
-typedef unsigned char BYTE;
-typedef signed char SBYTE;
-typedef unsigned short WORD;
-typedef signed short SWORD;
 #define TRUE 1
 #define FALSE 0
 
@@ -102,14 +84,14 @@ typedef signed short SWORD;
 //--------------------------------
 // USB declarations
 
-void UsbSendPacket(BYTE *packet, int len);
-BOOL UsbConnected();
-BOOL UsbPoll(BOOL blinkLeds);
+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(BYTE *packet, int len);
+void UsbPacketReceived(uint8_t *packet, int len);
 
 #define VERSION_INFORMATION_MAGIC 0x56334d50
 struct version_information {