fixed iso14443b snoop, plus compiling issue of redefined parameter, please take care...

[proxmark3-svn] / client / proxusb.h

diff --git a/client/proxusb.h b/client/proxusb.h
index e12c9334f059fff11d18ab2db38cfb1bbd2e7417..5845888a539af7ea01b200f815ffe8b23cc809c5 100644 (file)
--- a/client/proxusb.h
+++ b/client/proxusb.h
@@ -1,16 +1,19 @@
+//-----------------------------------------------------------------------------
+// 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.
+//-----------------------------------------------------------------------------
+// USB utilities
+//-----------------------------------------------------------------------------
+

 #ifndef PROXUSB_H__
 #define PROXUSB_H__
 
 #ifndef PROXUSB_H__
 #define PROXUSB_H__
 

-#ifdef _MSC_VER
-typedef DWORD uint32_t;
-typedef BYTE uint8_t;
-typedef WORD uint16_t;
-#define bool BOOL
-#else

 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdbool.h>

-#endif
-#include "usb.h"
+#include <usb.h>

 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;


@@ -19,9 +22,13 @@ extern unsigned char error_occured;
 void SendCommand(UsbCommand *c);
 bool ReceiveCommandPoll(UsbCommand *c);
 void ReceiveCommand(UsbCommand *c);
 void SendCommand(UsbCommand *c);
 bool ReceiveCommandPoll(UsbCommand *c);
 void ReceiveCommand(UsbCommand *c);

-usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
-usb_dev_handle* OpenProxmark(int verbose);
-usb_dev_handle* OpenProxmark(int verbose);
+struct usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
+struct usb_dev_handle* OpenProxmark(int verbose);

 void CloseProxmark(void);
 
 void CloseProxmark(void);
 

+struct prox_unit {
+  usb_dev_handle *handle;
+  char serial_number[256];
+};
+

 #endif
 #endif