Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 0148e1dd43b270d441321ec6490c350a8776e24e..7b3d0849e1d9eb8fb47e383e29b356b2c681c1cb 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -17,15 +17,21 @@
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 

-#define LED_RED 1
+#define LED_RED    1

 #define LED_ORANGE 2
 #define LED_ORANGE 2

-#define LED_GREEN 4
-#define LED_RED2 8
-#define BUTTON_HOLD 1
-#define BUTTON_NO_CLICK 0
-#define BUTTON_SINGLE_CLICK -1
-#define BUTTON_DOUBLE_CLICK -2
-#define BUTTON_ERROR -99
+#define LED_GREEN  4
+#define LED_RED2   8
+
+#define BUTTON_HOLD           1
+#define BUTTON_NO_CLICK       0
+#define BUTTON_SINGLE_CLICK  -1
+#define BUTTON_DOUBLE_CLICK  -2
+#define BUTTON_ERROR        -99
+
+#define REV8(x)  ((((x)>>7)&1)|((((x)>>6)&1)<<1)|((((x)>>5)&1)<<2)|((((x)>>4)&1)<<3)|((((x)>>3)&1)<<4)|((((x)>>2)&1)<<5)|((((x)>>1)&1)<<6)|(((x)&1)<<7))
+#define REV16(x) (REV8(x)  | (REV8 (x >> 8) << 8))
+#define REV32(x) (REV16(x) | (REV16(x >> 16) << 16))
+#define REV64(x) (REV32(x) | (REV32(x >> 32) << 32))

 
 void print_result(char *name, uint8_t *buf, size_t len);
 size_t nbytes(size_t nbits);
 
 void print_result(char *name, uint8_t *buf, size_t len);
 size_t nbytes(size_t nbits);


@@ -34,17 +40,18 @@ void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 void rol(uint8_t *data, const size_t len);
 void lsl (uint8_t *data, size_t len);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 void rol(uint8_t *data, const size_t len);
 void lsl (uint8_t *data, size_t len);

-int32_t le24toh (uint8_t data[3]);

 
 void LED(int led, int ms);
 void LEDsoff();
 
 void LED(int led, int ms);
 void LEDsoff();

+void LEDson();
+void LEDsinvert();

 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 
 //iceman's ticks.h
 #ifndef GET_TICKS
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 
 //iceman's ticks.h
 #ifndef GET_TICKS

-# define GET_TICKS   (uint32_t)((AT91C_BASE_TC1->TC_CV << 16) | AT91C_BASE_TC0->TC_CV)
+# define GET_TICKS GetTicks()

 #endif
 
 void SpinDelay(int ms);
 #endif
 
 void SpinDelay(int ms);


@@ -62,6 +69,7 @@ void ResetSspClk(void);
 uint32_t RAMFUNC GetCountSspClk();
 
 extern void StartTicks(void);
 uint32_t RAMFUNC GetCountSspClk();
 
 extern void StartTicks(void);

+extern uint32_t GetTicks(void);

 extern void WaitTicks(uint32_t ticks);
 extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);
 extern void WaitTicks(uint32_t ticks);
 extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);