Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 54562a07069f76d9e604320f7e1512cb84f20fbc..5001acdcb36b382649740fa99245e2c8fd943338 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -23,6 +23,10 @@
 #ifndef MAX
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 #ifndef MAX
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif

+#define TRUE                        1
+#define FALSE                       0
+#define EVEN                        0
+#define ODD                         1

 
 int ukbhit(void);
 
 
 int ukbhit(void);
 


@@ -45,7 +49,15 @@ uint8_t param_get8(const char *line, int paramnum);
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);

+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
+uint8_t param_isdec(const char *line, int paramnum);

 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 int param_getstr(const char *line, int paramnum, char * str);
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 int param_getstr(const char *line, int paramnum, char * str);
 

+ int hextobinarray( char *target,  char *source);
+ int hextobinstring( char *target,  char *source);
+ int binarraytohex( char *target,  char *source,  int length);
+void binarraytobinstring(char *target,  char *source,  int length);
+uint8_t GetParity( char *string, uint8_t type,  int length);
+void wiegand_add_parity(char *target, char *source, char length);