change usb_cmd struct to be more sane

[proxmark3-svn] / client / prox.h

diff --git a/client/prox.h b/client/prox.h
index aeb6dfea3ec5699090d5866a2956608f0d24027a..21ee8c1a4cd6496eae5be044cd15c4ac80a91e97 100644 (file)
--- a/client/prox.h
+++ b/client/prox.h
@@ -1,15 +1,24 @@
 #ifndef __PROX_H\r
 #define __PROX_H\r
-\r
+#ifdef _MSC_VER\r
+typedef DWORD uint32_t;\r
+typedef BYTE uint8_t;\r
+typedef WORD uint16_t;\r
+#define bool BOOL\r
+#else\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
+#endif\r
 #include "../include/usb_cmd.h"\r
 \r
 // prox.cpp\r
 void ReceiveCommand(UsbCommand *c);\r
-BOOL ReceiveCommandPoll(UsbCommand *c);\r
-void SendCommand(UsbCommand *c, BOOL wantAck);\r
+bool ReceiveCommandPoll(UsbCommand *c);\r
+void SendCommand(UsbCommand *c, bool);\r
+void wait_for_response(uint32_t command_type);\r
 \r
 // gui.cpp\r
-void ShowGui();\r
+void ShowGui(void);\r
 void HideGraphWindow(void);\r
 void ShowGraphWindow(void);\r
 void RepaintGraphWindow(void);\r
@@ -24,7 +33,7 @@ extern int offline;
 \r
 // command.cpp\r
 static void CmdBuffClear(char *str);\r
-static void GetFromBigBuf(BYTE *dest, int bytes);\r
+static void GetFromBigBuf(uint8_t *dest, int bytes);\r
 static void CmdReset(char *str);\r
 static void CmdQuit(char *str);\r
 static void CmdEM410xread(char *str);\r
@@ -61,7 +70,7 @@ static void CmdHisamples(char *str);
 static int CmdHisamplest(char *str, int nrlow);\r
 static void CmdHexsamples(char *str);\r
 static void CmdHisampless(char *str);\r
-static WORD Iso15693Crc(BYTE *v, int n);\r
+static uint16_t Iso15693Crc(uint8_t *v, int n);\r
 static void CmdHi14bdemod(char *str);\r
 static void CmdHi14list(char *str);\r
 static void CmdHi14alist(char *str);\r