X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/eb891c385e5b580dfafbe3f1ffbae41054adbdd9..0892708119735d1f3720700a8334a35bc37706c0:/client/util.h?ds=sidebyside diff --git a/client/util.h b/client/util.h index 990a8444..3acceafd 100644 --- a/client/util.h +++ b/client/util.h @@ -9,13 +9,18 @@ //----------------------------------------------------------------------------- #include -#include //included in data.h +#include //included in data.h #include #include #include #include -#include "data.h" //for FILE_PATH_SIZE +#include // 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 @@ -26,10 +31,14 @@ # 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 +#ifndef BSWAP_16 +# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8))) +#endif + #define TRUE 1 #define FALSE 0 #define EVEN 0 @@ -47,6 +56,14 @@ #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); @@ -90,6 +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]); +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 +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