fix endless loop (#782)

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 0148e1dd43b270d441321ec6490c350a8776e24e..fb50ecc86e0ea91b031d354869af5741e46de50d 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -34,7 +34,6 @@ 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);
 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 LED(int led, int ms);
 void LEDsoff();
 
 void LED(int led, int ms);
 void LEDsoff();


@@ -44,7 +43,7 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
 
 //iceman's ticks.h
 #ifndef GET_TICKS
 
 //iceman's ticks.h
 #ifndef GET_TICKS

-# define GET_TICKS   (uint32_t)((AT91C_BASE_TC1->TC_CV << 16) | AT91C_BASE_TC0->TC_CV)
+# define GET_TICKS GetTicks()

 #endif
 
 void SpinDelay(int ms);
 #endif
 
 void SpinDelay(int ms);


@@ -62,6 +61,7 @@ void ResetSspClk(void);
 uint32_t RAMFUNC GetCountSspClk();
 
 extern void StartTicks(void);
 uint32_t RAMFUNC GetCountSspClk();
 
 extern void StartTicks(void);

+extern uint32_t GetTicks(void);

 extern void WaitTicks(uint32_t ticks);
 extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);
 extern void WaitTicks(uint32_t ticks);
 extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);