sync with master lf files to resolve conflicts

[proxmark3-svn] / client / cmdmain.h

diff --git a/client/cmdmain.h b/client/cmdmain.h
index 3a4145c1f6dfeb743e1f4eedeafccc4f37414f8a..0cf2b35d436e5656d2aaf11c087f4ecc791e5c86 100644 (file)
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -12,10 +12,11 @@
 #define CMDMAIN_H__
 
 #include "usb_cmd.h"
 #define CMDMAIN_H__
 
 #include "usb_cmd.h"

-
+#include "cmdparser.h"

 void UsbCommandReceived(UsbCommand *UC);
 void CommandReceived(char *Cmd);
 void UsbCommandReceived(UsbCommand *UC);
 void CommandReceived(char *Cmd);

-UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout);
-UsbCommand * WaitForResponse(uint32_t response_type);
-
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
+bool WaitForResponse(uint32_t cmd, UsbCommand* response);
+void clearCommandBuffer();
+command_t* getTopLevelCommandTable();

 #endif
 #endif