Merge pull request #26 from ickerwx/indentation_fix

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index e8b9cdffbc8dd2ebf3a537ae9592a9207fba8ae0..3ff70dd4a44fba4b1d33567e081f705567a65939 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,7 +13,11 @@
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <stddef.h>
 #include <stdint.h>

-#include <common.h>
+#include "common.h"
+#include "string.h"
+#include "apps.h"
+#include "BigBuf.h"
+#include "proxmark3.h"

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


@@ -27,10 +31,25 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 

+#ifndef BSWAP_16
+# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+#endif
+#ifndef BITMASK
+# define BITMASK(X) (1 << (X))
+#endif
+#ifndef ARRAYLEN
+# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+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);
 size_t nbytes(size_t nbits);
 uint32_t SwapBits(uint32_t value, int nrbits);

+uint32_t reflect(uint32_t v, int b);

 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 SpinDelay(int ms);
 void SpinDelayUs(int us);


@@ -45,9 +64,12 @@ uint32_t RAMFUNC GetTickCount();
 
 void StartCountUS();
 uint32_t RAMFUNC GetCountUS();
 
 void StartCountUS();
 uint32_t RAMFUNC GetCountUS();

-uint32_t RAMFUNC GetDeltaCountUS();
+void ResetUSClock(void);
+void SpinDelayCountUs(uint32_t us);
+//uint32_t RAMFUNC GetDeltaCountUS();

 
 void StartCountSspClk();
 
 void StartCountSspClk();

+void ResetSspClk(void);

 uint32_t RAMFUNC GetCountSspClk();
 
 #endif
 uint32_t RAMFUNC GetCountSspClk();
 
 #endif