fix: ukbhit() for OS X

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 144032324d62e74b77bba24bc2a3669045328208..0148e1dd43b270d441321ec6490c350a8776e24e 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,8 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <stddef.h>
 #include <stdint.h>

-
-#define RAMFUNC __attribute((long_call, section(".ramfunc")))
+#include "common.h"

 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 


@@ -28,17 +27,29 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 

+void print_result(char *name, uint8_t *buf, size_t len);
+size_t nbytes(size_t nbits);
+uint32_t SwapBits(uint32_t value, int nrbits);

 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 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);
+int32_t le24toh (uint8_t data[3]);

 
 

-void SpinDelay(int ms);
-void SpinDelayUs(int us);

 void LED(int led, int ms);
 void LEDsoff();
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 
 void LED(int led, int ms);
 void LEDsoff();
 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)
+#endif
+
+void SpinDelay(int ms);
+void SpinDelayUs(int us);
+

 void StartTickCount();
 uint32_t RAMFUNC GetTickCount();
 
 void StartTickCount();
 uint32_t RAMFUNC GetTickCount();
 


@@ -46,4 +57,19 @@ void StartCountUS();
 uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 
 uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 

+void StartCountSspClk();
+void ResetSspClk(void);
+uint32_t RAMFUNC GetCountSspClk();
+
+extern void StartTicks(void);
+extern void WaitTicks(uint32_t ticks);
+extern void WaitUS(uint16_t us);
+extern void WaitMS(uint16_t ms);
+extern void ResetTicks();
+extern void ResetTimer(AT91PS_TC timer);
+extern void StopTicks(void);
+// end iceman's ticks.h
+
+uint32_t prand();
+

 #endif
 #endif