REM: removed a debug function call, PrintToSendBuffer

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 2813bb8c9ba30d00fda29e0016e67c1a93c82e9d..e492fd494f4f80ee8c4468d2b965f205199752fd 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -9,13 +9,12 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <stdint.h>  //included in data.h
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <time.h>
-#include "data.h"
+#include <time.h> 
+#include "data.h"    //for FILE_PATH_SIZE
 
 #ifndef ROTR
 # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
@@ -36,6 +35,18 @@
 #define EVEN                        0
 #define ODD                         1
 
+#ifndef NIBBLE_HIGH
+# define NIBBLE_HIGH(b) ( (b & 0xF0) >> 4 )
+#endif
+#ifndef NIBBLE_LOW
+# define NIBBLE_LOW(b)  ( b & 0x0F )
+#endif
+#ifndef CRUMB
+# define CRUMB(b,p)    (((b & (0x3 << p) ) >> p ) & 0xF)
+#endif
+#ifndef SWAP_NIBBLE
+# define SWAP_NIBBLE(b)  ( (NIBBLE_LOW(b)<< 4) | NIBBLE_HIGH(b))
+#endif
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
@@ -53,7 +64,8 @@ char *sprint_hex_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);
-void num_to_bytebits(uint64_t  n, size_t len, uint8_t *dest);
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
 
@@ -78,6 +90,7 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
 void xor(unsigned char * dst, unsigned char * src, size_t len);
 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