X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6bb7609cadc5868663fea41064779b767c6e382f..cf69eca0ff68babef7393cea1cbfbcd558c04b37:/client/util.h diff --git a/client/util.h b/client/util.h index ce3bc247..9c16ba5b 100644 --- a/client/util.h +++ b/client/util.h @@ -36,6 +36,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); @@ -45,6 +57,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 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); @@ -52,7 +65,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);