TLV decoding works

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 141d74b9d3c81cd0075106707bfc8f2d44c15d86..0148e1dd43b270d441321ec6490c350a8776e24e 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <stddef.h>
 #include <stdint.h>

-#include <common.h>
+#include "common.h"

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


@@ -36,22 +36,19 @@ 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 lsl (uint8_t *data, size_t len);
 int32_t le24toh (uint8_t data[3]);
 

-void SpinDelay(int ms);
-void SpinDelayUs(int us);

 void LED(int led, int ms);
 void LEDsoff();
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
 void LED(int led, int ms);
 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);
+//iceman's ticks.h
+#ifndef GET_TICKS
+# define GET_TICKS   (uint32_t)((AT91C_BASE_TC1->TC_CV << 16) | AT91C_BASE_TC0->TC_CV)
+#endif
+
+void SpinDelay(int ms);
+void SpinDelayUs(int us);

 
 void StartTickCount();
 uint32_t RAMFUNC GetTickCount();
 
 void StartTickCount();
 uint32_t RAMFUNC GetTickCount();


@@ -61,6 +58,18 @@ uint32_t RAMFUNC GetCountUS();
 uint32_t RAMFUNC GetDeltaCountUS();
 
 void StartCountSspClk();
 uint32_t RAMFUNC GetDeltaCountUS();
 
 void StartCountSspClk();

+void ResetSspClk(void);

 uint32_t RAMFUNC GetCountSspClk();
 
 uint32_t RAMFUNC GetCountSspClk();
 

+extern void StartTicks(void);
+extern void WaitTicks(uint32_t ticks);
+extern void WaitUS(uint16_t us);
+extern void WaitMS(uint16_t ms);
+extern void ResetTicks();
+extern void ResetTimer(AT91PS_TC timer);
+extern void StopTicks(void);
+// end iceman's ticks.h
+
+uint32_t prand();
+

 #endif
 #endif