ADD: Binary Encoded Digit -> Decimal

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 39ed51b4c9a4f53dd012804d3bd091c205503015..3acceafd69bab067c6fa9e3d05a7ae713e0524a5 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -9,14 +9,18 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #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 <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <time.h>

-#include "data.h"
+#include <math.h>              // math.pow
+#include "data.h"              // for FILE_PATH_SIZE
+#include "proxmark3.h"

 
 

+#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 ROTR
 # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
 #endif


@@ -27,15 +31,39 @@
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 #ifndef BSWAP_32
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 #ifndef BSWAP_32

-#define BSWAP_32(x) \
+# define BSWAP_32(x) \

      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 #endif
      ((((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
+

 #define TRUE                        1
 #define FALSE                       0
 #define EVEN                        0
 #define ODD                         1
 
 #define TRUE                        1
 #define FALSE                       0
 #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
+
+#ifndef BCD2DEC
+# define BCD2DEC(bcd) HornerScheme(bcd, 0x10, 10)
+#endif
+#ifndef DEC2BCD
+# define DEC2BCD(dec) HornerScheme(dec, 10, 0x10)
+#endif
+

 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);


@@ -45,6 +73,7 @@ void AddLogCurrentDT(char *fileName);
 void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);
 
 void print_hex(const uint8_t * data, const size_t len);
 void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);
 
 void print_hex(const uint8_t * data, const size_t len);

+void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);

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


@@ -52,7 +81,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_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);
 
 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);
 


@@ -77,5 +107,9 @@ 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]);
 
 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);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);

-void rol(uint8_t *data, const size_t len);
\ No newline at end of file
+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);
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
\ No newline at end of file