FIX: "hf mf hardnested" - removed the call to free_candidates_memory, on my ubuntu...

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 3acceafd69bab067c6fa9e3d05a7ae713e0524a5..c92493e8030437600189d5a25b686fcabf34b73a 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -13,10 +13,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <time.h>
 #include <math.h>              // math.pow
+#include "proxmark3.h" // time_t
 #include "data.h"              // for FILE_PATH_SIZE
-#include "proxmark3.h"
+
+#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))
@@ -24,12 +35,15 @@
 #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) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
@@ -39,11 +53,13 @@
 # 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
@@ -57,6 +73,7 @@
 # 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
@@ -64,6 +81,15 @@
 # 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);