Merge pull request #909 from pwpiwi/fix_button_break

[proxmark3-svn] / client / comms.h

diff --git a/client/comms.h b/client/comms.h
index 75adeea1dfa6b2dddc3942e5af93408db8537213..65294695bf500a95a2ec2602ccb1b6585adf472e 100644 (file)
--- a/client/comms.h
+++ b/client/comms.h
@@ -1,3 +1,14 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+// 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.
+//-----------------------------------------------------------------------------
+// Code for communicating with the proxmark3 hardware.
+//-----------------------------------------------------------------------------
+
 #ifndef COMMS_H_
 #define COMMS_H_
 
@@ -11,35 +22,19 @@
 #define CMD_BUFFER_SIZE 50
 #endif
 
-#ifndef MAX_DEMOD_BUF_LEN
-#define MAX_DEMOD_BUF_LEN (1024*128)
-#endif
-
-#ifndef BIGBUF_SIZE
-#define BIGBUF_SIZE 40000
-#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;
-
-
-// Wrappers required as static variables can only be used in one file.
-void SetSerialPort(serial_port* new_port);
-serial_port* GetSerialPort();
 void SetOffline(bool new_offline);
 bool IsOffline();
 
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode);
+void CloseProxmark(void);
+
 void SendCommand(UsbCommand *c);
-void *uart_receiver(void *targ);
-void UsbCommandReceived(UsbCommand *UC);
+
 void clearCommandBuffer();
-bool WaitForResponseTimeoutW(uint64_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseTimeout(uint64_t cmd, UsbCommand* response, size_t ms_timeout);
-bool WaitForResponse(uint64_t cmd, UsbCommand* response);
+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);
+bool GetFromFpgaRAM(uint8_t *dest, int bytes);
 
 #endif // COMMS_H_