X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dd79e03a1ac063d3f0b5c6ec5c07bc67866a00a7..0db11b71efad3781186cc2da9f31686a6562d065:/client/util.h diff --git a/client/util.h b/client/util.h index 39ed51b4..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); @@ -78,4 +92,5 @@ 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 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); \ No newline at end of file