#ifndef CMDMAIN_H__
#define CMDMAIN_H__
+#include <stdint.h>
+#include <stddef.h>
#include "usb_cmd.h"
+#include "cmdparser.h"
-void UsbCommandReceived(UsbCommand *UC);
-void CommandReceived(char *Cmd);
-UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout);
-UsbCommand * WaitForResponse(uint32_t response_type);
+extern void UsbCommandReceived(UsbCommand *UC);
+extern int CommandReceived(char *Cmd);
+extern bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
+extern bool WaitForResponse(uint32_t cmd, UsbCommand* response);
+extern void clearCommandBuffer();
+extern command_t* getTopLevelCommandTable();
#endif