Add flasher from SVN r623 for HID bootprom and current Mac OS X kext

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 21a9b7577f2d1f79c0ef3a8d41462bac6e0994a4..bf5d0cc81fc01477ea2526379948a71b5ce470dd 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,11 +13,9 @@
 
 #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 )

-#define min(a, b) (((a) > (b)) ? (b) : (a))

 
 #define LED_RED 1
 #define LED_ORANGE 2
 
 #define LED_RED 1
 #define LED_ORANGE 2


@@ -29,9 +27,14 @@
 #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);
 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 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 SpinDelay(int ms);
 void SpinDelayUs(int us);


@@ -48,4 +51,7 @@ void StartCountUS();
 uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 
 uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 

+void StartCountSspClk();
+uint32_t RAMFUNC GetCountSspClk();
+

 #endif
 #endif