Minor fix with previous cache-removal

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 0af673cc14eacd6b1531eb01917e7cc2c32d3c97..bf5d0cc81fc01477ea2526379948a71b5ce470dd 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -1,8 +1,21 @@
+//-----------------------------------------------------------------------------
+// Jonathan Westhues, Aug 2005
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Utility functions used in many places, not specific to any piece of code.
+//-----------------------------------------------------------------------------
+
 #ifndef __UTIL_H
 #define __UTIL_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
@@ -14,8 +27,14 @@
 #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 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);
@@ -25,4 +44,14 @@ int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 
-#endif
\ No newline at end of file
+void StartTickCount();
+uint32_t RAMFUNC GetTickCount();
+
+void StartCountUS();
+uint32_t RAMFUNC GetCountUS();
+uint32_t RAMFUNC GetDeltaCountUS();
+
+void StartCountSspClk();
+uint32_t RAMFUNC GetCountSspClk();
+
+#endif