fix WaitForResponse (without timeout)

[proxmark3-svn] / client / comms.h

diff --git a/client/comms.h b/client/comms.h
index 111677ad78da385776d8ee1e3a12a62ee044f68a..649576041921d9091b02962275e3fc2338186f69 100644 (file)
--- a/client/comms.h
+++ b/client/comms.h
@@ -9,41 +9,24 @@
 // Code for communicating with the proxmark3 hardware.
 //-----------------------------------------------------------------------------
 
 // Code for communicating with the proxmark3 hardware.
 //-----------------------------------------------------------------------------
 

-#ifndef COMMS_H_
-#define COMMS_H_
+#ifndef COMMS_H__
+#define COMMS_H__

 
 

+#include <stddef.h>
+#include <stdint.h>

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

-#include <pthread.h>
-

 #include "usb_cmd.h"
 #include "usb_cmd.h"

-#include "uart.h"
-
-#ifndef CMD_BUFFER_SIZE
-#define CMD_BUFFER_SIZE 50
-#endif
-
-typedef struct {
-       // If TRUE, continue running the uart_receiver thread
-       bool run;
-
-       // Lock around serial port receives
-       pthread_mutex_t recv_lock;
-} receiver_arg;
-
-
-void SetOffline(bool new_offline);
-bool IsOffline();
-
-bool OpenProxmark(char *portname, bool waitCOMPort, int timeout);
-void CloseProxmark(void);
-
-void SendCommand(UsbCommand *c);
-
-void *uart_receiver(void *targ);
-void clearCommandBuffer();
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
-bool WaitForResponse(uint32_t cmd, UsbCommand* response);
-bool GetFromBigBuf(uint8_t *dest, int bytes, int start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);

 
 

-#endif // COMMS_H_
+extern void SetOffline(bool new_offline);
+extern bool IsOffline();
+extern bool OpenProxmark(void *port, bool wait_for_port, int timeout);
+extern void CloseProxmark(void);
+extern void SendCommand(UsbCommand *c);
+extern void clearCommandBuffer();
+extern bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
+extern bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
+extern bool WaitForResponse(uint32_t cmd, UsbCommand* response);
+extern bool GetFromBigBuf(uint8_t *dest, int bytes, int start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
+extern bool GetFromFpgaRAM(uint8_t *dest, int bytes);
+
+#endif // COMMS_H__