X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dae31af21e6ead8318e0dbe4933a9dce4c1a79e5..b804b9cdb8dbf43e41d9372e450433e39fe534f4:/client/util.h?ds=sidebyside diff --git a/client/util.h b/client/util.h index 3acceafd..593c9af7 100644 --- a/client/util.h +++ b/client/util.h @@ -7,16 +7,30 @@ //----------------------------------------------------------------------------- // utilities //----------------------------------------------------------------------------- +#ifndef __UTIL_H_ +#define __UTIL_H_ #include #include //included in data.h #include #include #include -#include #include // math.pow +#include // time, gmtime +#include "proxmark3.h" // time_t #include "data.h" // for FILE_PATH_SIZE -#include "proxmark3.h" + +#include +// Handle platform specific includes +#ifndef _WIN32 + #include + #include + #include +#else + #include + #include +#endif + #ifndef BITMASK # define BITMASK(X) (1 << (X)) @@ -24,12 +38,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 +56,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 +76,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 +84,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); @@ -78,6 +107,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); @@ -112,4 +142,6 @@ 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); -uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor); \ No newline at end of file +uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor); + +#endif \ No newline at end of file