X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/be6e909c5bda0ae2d1ff2ea057127e099356c232..29ce214c65d0d36679b8496dd8dddf4ea2b0ec23:/client/util.h diff --git a/client/util.h b/client/util.h index e492fd49..655f823b 100644 --- a/client/util.h +++ b/client/util.h @@ -15,7 +15,11 @@ #include #include #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 +30,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 @@ -93,4 +101,5 @@ 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); \ No newline at end of file