minor code cleanup

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 6f69fba8b8b3c120e70cde4519115b9aeb9a6c2e..e8b9cdffbc8dd2ebf3a537ae9592a9207fba8ae0 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,6 +13,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <stddef.h>
 #include <stdint.h>

+#include <common.h>
+
+#define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )

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


@@ -24,6 +27,8 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 

+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);
 


@@ -35,4 +40,14 @@ int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 

+void StartTickCount();
+uint32_t RAMFUNC GetTickCount();
+
+void StartCountUS();
+uint32_t RAMFUNC GetCountUS();
+uint32_t RAMFUNC GetDeltaCountUS();
+
+void StartCountSspClk();
+uint32_t RAMFUNC GetCountSspClk();
+

 #endif
 #endif