X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cd00aa3043b507ed10bf79a37b83b88741d176d7..4c8fe2e976f0330944e032231007feede2e32ff8:/client/proxmark3.h?ds=sidebyside

diff --git a/client/proxmark3.h b/client/proxmark3.h
index 67d80841..9b10af1a 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -1,14 +1,41 @@
-#define PROXPROMPT "proxmark3> "
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+// 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.
+//-----------------------------------------------------------------------------
+// Main binary
+//-----------------------------------------------------------------------------
 
-#define FLASH_ADDR_OS		0x10000
-#define FLASH_ADDR_FPGA		0x2000
+#ifndef PROXMARK3_H__
+#define PROXMARK3_H__
 
-extern usb_dev_handle *devh;
-extern unsigned char return_on_error;
-extern unsigned char error_occured;
+// Handle platform specific includes
+#ifdef _WIN32
+// for MINGW32 environments
+  #ifndef _USE_32BIT_TIME_T
+    #define _USE_32BIT_TIME_T 1
+  #endif  
+  #include <time.h>
+  #include <windows.h>
+#else
+  #include <sys/time.h>
+#endif
 
-int ReceiveCommandP(UsbCommand *c);
-usb_dev_handle* OpenProxmark(int);
-void CloseProxmark(void);
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
+#include "usb_cmd.h"
 
-void setlogfilename(char *fn);
+#define lu PRIu32
+#define lx  PRIx32
+#define llx PRIx64
+#define lli PRIi64
+#define llu PRIu64
+#define hhu PRIu8
+#define PROXPROMPT "pm3 --> "
+
+void SendCommand(UsbCommand *c);
+
+#endif