Merge remote-tracking branch 'upstream/master'

diff --cc client/cmdlfem4x.c
Simple merge

diff --cc client/util.c
Simple merge

diff --cc client/util.h
index c206fb0a28b33cacfcf5ac222244d46cf9bb9a70,1739498eeaf8d4ab4844951ecb332d64f90f10a9..27f9348e64132089f096a36606f8de9416e5359d
--- 1/client/util.h
--- 2/client/util.h
+++ b/client/util.h
@@@ -28,52 -27,64 +27,65 @@@
  #define EVEN                        0
  #define ODD                         1
  
- int ukbhit(void);
+ extern int ukbhit(void);
+ 
+ extern void AddLogLine(char *fileName, char *extData, char *c);
+ extern void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
+ extern void AddLogUint64(char *fileName, char *extData, const uint64_t data);
+ extern void AddLogCurrentDT(char *fileName);
+ extern void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);
+ 
+ extern void print_hex(const uint8_t * data, const size_t len);
+ extern char *sprint_hex(const uint8_t * data, const size_t len);
+ extern char *sprint_bin(const uint8_t * data, const size_t len);
+ extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
+ extern char *sprint_hex_ascii(const uint8_t *data, const size_t len);
+ extern char *sprint_ascii(const uint8_t *data, const size_t len);
+ 
+ extern void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
+ extern uint64_t bytes_to_num(uint8_t* src, size_t len);
+ extern void num_to_bytebits(uint64_t  n, size_t len, uint8_t *dest);
+ extern void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
+ extern char *printBits(size_t const size, void const * const ptr);
++extern uint32_t SwapBits(uint32_t value, int nrbits);
+ extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
+ extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
  
- void AddLogLine(char *fileName, char *extData, char *c);
- void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
- void AddLogUint64(char *fileName, char *extData, const uint64_t data);
- void AddLogCurrentDT(char *fileName);
- void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);
+ extern char param_getchar(const char *line, int paramnum);
+ extern int param_getptr(const char *line, int *bg, int *en, int paramnum);
+ extern uint8_t param_get8(const char *line, int paramnum);
+ extern uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
+ extern uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
+ extern uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
+ extern uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
+ extern uint8_t param_isdec(const char *line, int paramnum);
+ extern int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
+ extern int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt);
+ extern int param_getstr(const char *line, int paramnum, char * str);
  
- void print_hex(const uint8_t * data, const size_t len);
- 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);
- char * sprint_hex_ascii(const uint8_t *data, const size_t len);
- char * sprint_ascii(const uint8_t *data, const size_t len);
+ extern int hextobinarray( char *target,  char *source);
+ extern int hextobinstring( char *target,  char *source);
+ extern int binarraytohex( char *target,  char *source,  int length);
+ extern void binarraytobinstring(char *target,  char *source,  int length);
+ extern uint8_t GetParity( uint8_t *string, uint8_t type,  int length);
+ extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
  
- 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_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
- char * printBits(size_t const size, void const * const ptr);
- uint32_t SwapBits(uint32_t value, int nrbits);
- 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);
+ extern void xor(unsigned char *dst, unsigned char *src, size_t len);
+ extern int32_t le24toh(uint8_t data[3]);
+ extern uint32_t le32toh (uint8_t *data);
+ extern void rol(uint8_t *data, const size_t len);
  
- char param_getchar(const char *line, int paramnum);
- int param_getptr(const char *line, int *bg, int *en, int paramnum);
- 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_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_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt);
- int param_getstr(const char *line, int paramnum, char * str);
+ extern void clean_ascii(unsigned char *buf, size_t len);
  
-  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( uint8_t *string, uint8_t type,  int length);
- void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
+ // timer functions/macros
+ #ifdef _WIN32
+ # include <windows.h>
+ # define sleep(n) Sleep(1000 *(n))
+ # define msleep(n) Sleep((n))
+ #else
+ extern void msleep(uint32_t n);               // sleep n milliseconds
+ #endif // _WIN32
  
- void xor(unsigned char *dst, unsigned char *src, size_t len);
- int32_t le24toh(uint8_t data[3]);
- uint32_t le32toh (uint8_t *data);
- void rol(uint8_t *data, const size_t len);
+ extern uint64_t msclock();                    // a milliseconds clock
  
- void clean_ascii(unsigned char *buf, size_t len);
+ #endif // UTIL_H__