X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d0168f2f4919562e94b22215a182622bca2e2785..7bea15816e2c9c4277df4670ab841ca5694c61d0:/client/cmdmain.c?ds=sidebyside

diff --git a/client/cmdmain.c b/client/cmdmain.c
index c1d730ee..719617fd 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -8,11 +8,13 @@
 // Main command parser entry point
 //-----------------------------------------------------------------------------
 
+#include "cmdmain.h"
+
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include "sleep.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"
@@ -22,8 +24,8 @@
 #include "cmddata.h"
 #include "cmdhw.h"
 #include "cmdlf.h"
-#include "cmdmain.h"
 #include "util.h"
+#include "util_posix.h"
 #include "cmdscript.h"
 
 
@@ -39,18 +41,20 @@ static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];
 static int cmd_head;//Starts as 0
 //Points to the position of the last unread command
 static int cmd_tail;//Starts as 0
+// to lock cmdBuffer operations from different threads
+static pthread_mutex_t cmdBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
 static command_t CommandTable[] = 
 {
-	{"help",	CmdHelp,	1, "This help. Use '<command> help' for details of a particular command."},
-	{"data", 	CmdData,	1, "{ Plot window / data buffer manipulation... }"},
-	{"hf",   	CmdHF,		1, "{ High Frequency commands... }"},
-	{"hw",   	CmdHW,		1, "{ Hardware commands... }"},
-	{"lf",   	CmdLF,		1, "{ Low Frequency commands... }"},
-	{"script",	CmdScript,	1, "{ Scripting commands }"},
-	{"quit", 	CmdQuit,	1, "Exit program"},
-	{"exit", 	CmdQuit,	1, "Exit program"},
-	{NULL, NULL, 0, NULL}
+  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of a particular command."},
+  {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},
+  {"hf",    CmdHF,    1, "{ High Frequency commands... }"},
+  {"hw",    CmdHW,    1, "{ Hardware commands... }"},
+  {"lf",    CmdLF,    1, "{ Low Frequency commands... }"},
+  {"script",CmdScript,1, "{ Scripting commands }"},
+  {"quit",  CmdQuit,  1, "Exit program"},
+  {"exit",  CmdQuit,  1, "Exit program"},
+  {NULL, NULL, 0, NULL}
 };
 
 command_t* getTopLevelCommandTable()
@@ -67,6 +71,7 @@ int CmdQuit(const char *Cmd)
 {
   return 99;
 }
+
 /**
  * @brief This method should be called when sending a new command to the pm3. In case any old
  *  responses from previous commands are stored in the buffer, a call to this method should clear them.
@@ -76,7 +81,9 @@ int CmdQuit(const char *Cmd)
 void clearCommandBuffer()
 {
     //This is a very simple operation
+	pthread_mutex_lock(&cmdBufferMutex);
     cmd_tail = cmd_head;
+	pthread_mutex_unlock(&cmdBufferMutex);
 }
 
 /**
@@ -85,6 +92,7 @@ void clearCommandBuffer()
  */
 void storeCommand(UsbCommand *command)
 {
+	pthread_mutex_lock(&cmdBufferMutex);
     if( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail)
     {
         //If these two are equal, we're about to overwrite in the
@@ -96,6 +104,7 @@ void storeCommand(UsbCommand *command)
     memcpy(destination, command, sizeof(UsbCommand));
 
     cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap
+	pthread_mutex_unlock(&cmdBufferMutex);
 }
 
 
@@ -106,8 +115,10 @@ void storeCommand(UsbCommand *command)
  */
 int getCommand(UsbCommand* response)
 {
+	pthread_mutex_lock(&cmdBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if(cmd_head == cmd_tail){
+		pthread_mutex_unlock(&cmdBufferMutex);
         return 0;
     }
     //Pick out the next unread command
@@ -115,7 +126,7 @@ int getCommand(UsbCommand* response)
     memcpy(response, last_unread, sizeof(UsbCommand));
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
-
+	pthread_mutex_unlock(&cmdBufferMutex);
     return 1;
 }
 
@@ -129,7 +140,7 @@ int getCommand(UsbCommand* response)
  * @param ms_timeout
  * @return true if command was returned, otherwise false
  */
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
   
 	UsbCommand resp;
 	
@@ -137,25 +148,34 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
 		response = &resp;
 	}
 
+	uint64_t start_time = msclock();
+	
 	// Wait until the command is received
-	for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
+	while (true) {
 		while(getCommand(response)) {
 			if(response->cmd == cmd){
 				return true;
 			}
 		}
-		msleep(10); // XXX ugh
-		if (dm_seconds == 200) { // Two seconds elapsed
+		if (msclock() - start_time > ms_timeout) {
+			break;
+		}
+		if (msclock() - start_time > 2000 && show_warning) {
 			PrintAndLog("Waiting for a response from the proxmark...");
 			PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
+			show_warning = false;
 		}
 	}
 	return false;
 }
 
 
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+	return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
+}
+
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
-	return WaitForResponseTimeout(cmd,response,-1);
+	return WaitForResponseTimeoutW(cmd, response, -1, true);
 }