X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/39864b0bd41dd5e896bcb8eeabcf2c3932f2203a..7d5ebac99397fe7661760259377a4f222fdb92cb:/armsrc/util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 21a9b757..e0066302 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,11 +13,9 @@
 
 #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 min(a, b) (((a) > (b)) ? (b) : (a))
 
 #define LED_RED 1
 #define LED_ORANGE 2
@@ -29,9 +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);
@@ -40,6 +43,15 @@ void LEDsoff();
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
+// @deprecated
+void iso14a_clear_trace();
+// @deprecated
+void iso14a_set_tracing(bool enable);
+void clear_trace();
+void set_tracing(bool enable);
+
+// The function LogTrace() is also used by the iClass implementation in iclass.c and both iso14443a, iso14443b and mifare
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
 
 void StartTickCount();
 uint32_t RAMFUNC GetTickCount();
@@ -48,4 +60,7 @@ void StartCountUS();
 uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 
+void StartCountSspClk();
+uint32_t RAMFUNC GetCountSspClk();
+
 #endif