CHG: removed a dublett

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index e492fd494f4f80ee8c4468d2b965f205199752fd..b158ec0aa6c02b4647cc31ca8221a05564fbd76d 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -9,32 +9,58 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
-#include <stdint.h>  //included in data.h
+#include <stdint.h>            //included in data.h
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <time.h> 
-#include "data.h"    //for FILE_PATH_SIZE
+#include <math.h>              // math.pow
+#include <time.h>       // time, gmtime
+#include "proxmark3.h" // time_t
+#include "data.h"              // for FILE_PATH_SIZE
 
+#include <time.h>
+// Handle platform specific includes
+#ifndef _WIN32
+  #include <termios.h>
+  #include <sys/ioctl.h>
+  #include <sys/time.h>
+#else
+  #include <conio.h>
+  #include <windows.h>
+#endif
+
+
+#ifndef BITMASK
+# define BITMASK(X) (1 << (X))
+#endif
 #ifndef ROTR
 # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
 #endif
+
 #ifndef MIN
 # define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 #ifndef MAX
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
+
+// Byte swapping
 #ifndef BSWAP_32
-#define BSWAP_32(x) \
+# define BSWAP_32(x) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 #endif
+#ifndef BSWAP_16
+# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+#endif
+
+// Boolean
 #define TRUE                        1
 #define FALSE                       0
 #define EVEN                        0
 #define ODD                         1
 
+// Nibble logic
 #ifndef NIBBLE_HIGH
 # define NIBBLE_HIGH(b) ( (b & 0xF0) >> 4 )
 #endif
@@ -47,6 +73,24 @@
 #ifndef SWAP_NIBBLE
 # define SWAP_NIBBLE(b)  ( (NIBBLE_LOW(b)<< 4) | NIBBLE_HIGH(b))
 #endif
+
+// Binary Encoded Digit
+#ifndef BCD2DEC
+# define BCD2DEC(bcd) HornerScheme(bcd, 0x10, 10)
+#endif
+#ifndef DEC2BCD
+# define DEC2BCD(dec) HornerScheme(dec, 10, 0x10)
+#endif
+
+// used for save/load files
+#ifndef FILE_PATH_SIZE
+# define FILE_PATH_SIZE 1000
+#endif
+
+#ifndef ARRAYLEN
+# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
@@ -61,6 +105,7 @@ char *sprint_hex(const uint8_t * data, const size_t len);
 char *sprint_bin(const uint8_t * data, const size_t len);
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
 char *sprint_hex_ascii(const uint8_t *data, const size_t len);
+char *sprint_ascii(const uint8_t *data, const 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);
@@ -93,4 +138,6 @@ int32_t le24toh (uint8_t data[3]);
 uint32_t le32toh (uint8_t *data);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 void rol(uint8_t *data, const size_t len);
-uint32_t SwapBits(uint32_t value, int nrbits);
\ No newline at end of file
+uint32_t SwapBits(uint32_t value, int nrbits);
+uint32_t reflect(uint32_t v, int b);
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
\ No newline at end of file