FIX: the changes to uart.c timings seems to have fixed my problem with the pm3...

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 655f823b546d1adf224eb5ca577902188ab1752b..c92493e8030437600189d5a25b686fcabf34b73a 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -9,13 +9,25 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #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 <stdlib.h>
 #include <string.h>
 #include <ctype.h>

-#include <time.h> 
-#include "data.h"    //for FILE_PATH_SIZE
-#include "proxmark3.h"
+#include <math.h>              // math.pow
+#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))
 
 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))


@@ -23,12 +35,15 @@
 #ifndef ROTR
 # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
 #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
 #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) | \
 #ifndef BSWAP_32
 # define BSWAP_32(x) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \


@@ -38,11 +53,13 @@
 # define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
 #endif
 
 # define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
 #endif
 

+// Boolean

 #define TRUE                        1
 #define FALSE                       0
 #define EVEN                        0
 #define ODD                         1
 
 #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
 #ifndef NIBBLE_HIGH
 # define NIBBLE_HIGH(b) ( (b & 0xF0) >> 4 )
 #endif


@@ -55,6 +72,24 @@
 #ifndef SWAP_NIBBLE
 # define SWAP_NIBBLE(b)  ( (NIBBLE_LOW(b)<< 4) | NIBBLE_HIGH(b))
 #endif
 #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);
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);


@@ -102,4 +137,5 @@ 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);
 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);

-uint32_t reflect(uint32_t v, int b);
\ No newline at end of file
+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