X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b31ef4f5104384d0d301dcd27d11b3a9861b1d82..9d0a333449d52dc0d9cfca217cf9f0cc0f792744:/client/cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index c1d730ee..db88b3ac 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include "sleep.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"
@@ -24,13 +23,16 @@
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"
+#include "util_posix.h"
 #include "cmdscript.h"
+#include "cmdcrc.h"
 
 
 unsigned int current_command = CMD_UNKNOWN;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
+static int CmdRev(const char *Cmd);
 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50
@@ -42,15 +44,16 @@ static int cmd_tail;//Starts as 0
 
 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... }"},
+  {"reveng",CmdRev,   1, "Crc calculations from the software reveng1-30"},
+  {"script",CmdScript,1, "{ Scripting commands }"},
+  {"quit",  CmdQuit,  1, "Exit program"},
+  {"exit",  CmdQuit,  1, "Exit program"},
+  {NULL, NULL, 0, NULL}
 };
 
 command_t* getTopLevelCommandTable()
@@ -67,6 +70,13 @@ int CmdQuit(const char *Cmd)
 {
   return 99;
 }
+
+int CmdRev(const char *Cmd)
+{
+  CmdCrc(Cmd);
+  return 0;
+}
+
 /**
  * @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.
@@ -129,7 +139,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;
 	
@@ -145,7 +155,7 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
 			}
 		}
 		msleep(10); // XXX ugh
-		if (dm_seconds == 200) { // Two seconds elapsed
+		if (dm_seconds == 200 && show_warning) { // Two seconds elapsed
 			PrintAndLog("Waiting for a response from the proxmark...");
 			PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
 		}
@@ -153,9 +163,12 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
 	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);
 }