ADD: 'lf search' - @marshmellow42 's check if signal is noice.

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index b68c511c7c5007a52c8f721bb3c26e2eb355285a..12840d6b009dca05fce3fe42eaa9e199f152ace3 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -11,14 +11,13 @@
 #ifndef __UTIL_H
 #define __UTIL_H
 
 #ifndef __UTIL_H
 #define __UTIL_H
 

-#include <stddef.h>
-#include <stdint.h>
-
-#define RAMFUNC __attribute((long_call, section(".ramfunc")))
+#include "common.h"
+#include "proxmark3.h"
+#include "string.h"
+#include "BigBuf.h"
+#include "ticks.h"

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

-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))

 
 #define LED_RED 1
 #define LED_ORANGE 2
 
 #define LED_RED 1
 #define LED_ORANGE 2


@@ -30,23 +29,29 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 

+#ifndef BSWAP_16
+# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+#endif
+#ifndef BITMASK
+# define BITMASK(X) (1 << (X))
+#endif
+#ifndef ARRAYLEN
+# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+size_t nbytes(size_t nbits);

 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t SwapBits(uint32_t value, int nrbits);

+uint32_t reflect(uint32_t v, int b);

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

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

 #endif
 #endif