Some refactoring, also placed wait14443a here

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 483307997042e92167751c021e6e86f616b3d95a..ce8876ed9323518b988d94b2fd347b8b3861e3cd 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -1 +1,47 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// utilities
+//-----------------------------------------------------------------------------
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+
+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+# define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+int ukbhit(void);
+
+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);
+

 void print_hex(const uint8_t * data, const size_t len);
 void print_hex(const uint8_t * data, const size_t len);

+char * sprint_hex(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);
+
+char param_getchar(const char *line, 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);
+int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
+int param_getstr(const char *line, int paramnum, char * str);
+