CHG: extern methods.

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index 486f22e90f9f2698cf9fae6c45a09c6921e420cb..c68a1d51a159d69690668e61dc5bf308834bb21f 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -11,13 +11,11 @@
 #ifndef __UTIL_H
 #define __UTIL_H
 
 #ifndef __UTIL_H
 #define __UTIL_H
 

-#include <stddef.h>
-#include <stdint.h>

 #include "common.h"
 #include "common.h"

+#include "proxmark3.h"

 #include "string.h"
 #include "string.h"

-#include "apps.h"

 #include "BigBuf.h"
 #include "BigBuf.h"

-#include "proxmark3.h"
+#include "ticks.h"

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


@@ -37,8 +35,10 @@
 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))
 #endif
 #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);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);
 size_t nbytes(size_t nbits);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);


@@ -47,24 +47,12 @@ 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 rol(uint8_t *data, const size_t len);
 void lsl (uint8_t *data, size_t len);
 int32_t le24toh (uint8_t data[3]);

+uint8_t hex2int(char hexchar);

 
 

-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);
 

-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
 #endif