X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3e134b4c20a5528b8264cd87d3fdebd0b2df6fd9..dc3a58466d5118dde8bcd1978d44dd9c64774f26:/armsrc/util.h?ds=sidebyside diff --git a/armsrc/util.h b/armsrc/util.h index 486f22e9..d3235292 100644 --- a/armsrc/util.h +++ b/armsrc/util.h @@ -18,6 +18,7 @@ #include "apps.h" #include "BigBuf.h" #include "proxmark3.h" +#include "ticks.h" #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff ) @@ -37,6 +38,9 @@ #ifndef BITMASK # define BITMASK(X) (1 << (X)) #endif +#ifndef ARRAYLEN +# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0])) +#endif void print_result(char *name, uint8_t *buf, size_t len); size_t nbytes(size_t nbits); @@ -48,23 +52,10 @@ 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); 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 StartTickCount(); -uint32_t RAMFUNC GetTickCount(); - -void StartCountUS(); -uint32_t RAMFUNC GetCountUS(); -//uint32_t RAMFUNC GetDeltaCountUS(); - -void StartCountSspClk(); -void ResetSspClk(void); -uint32_t RAMFUNC GetCountSspClk(); - #endif