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

[proxmark3-svn] / client / proxmark3.h

diff --git a/client/proxmark3.h b/client/proxmark3.h
index 67d808412ca8754a714bf89ba909f3ec421e3410..a634fd68179bf1d29b3bb4a8a29fed6fde3d3080 100644 (file)
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -1,14 +1,27 @@
-#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;
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#define llx PRIx64
+#define lli PRIi64
+#define hhu PRIu8

 
 

-int ReceiveCommandP(UsbCommand *c);
-usb_dev_handle* OpenProxmark(int);
-void CloseProxmark(void);
+#include "usb_cmd.h"

 
 

-void setlogfilename(char *fn);
+#define PROXPROMPT "pm3 --> "
+
+void SendCommand(UsbCommand *c);
+
+#endif