X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/10403a6a3005f81839603dcb415ee352f939c06b..c2731f37bef482bde1a87d79566c0b3bde658c98:/client/cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index c18967cc..d31147f9 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -16,7 +16,7 @@
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"
-#include "../include/usb_cmd.h"
+#include "usb_cmd.h"
 #include "ui.h"
 #include "cmdhf.h"
 #include "cmddata.h"
@@ -25,12 +25,15 @@
 #include "cmdmain.h"
 #include "util.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);
+static int CmdLS(const char *Cmd);
 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50
@@ -42,15 +45,17 @@ 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."},
+	{"ls",		CmdLS,		1, "list commands"},
+	{"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 reveng 1.30"},
+	{"script",	CmdScript,	1, "{ Scripting commands }"},
+	{"quit",	CmdQuit,	1, "Exit program"},
+	{"exit",	CmdQuit,	1, "Exit program"},
+	{NULL, NULL, 0, NULL}
 };
 
 command_t* getTopLevelCommandTable()
@@ -62,12 +67,22 @@ int CmdHelp(const char *Cmd)
   CmdsHelp(CommandTable);
   return 0;
 }
+int CmdLS(const char *Cmd){
+	CmdsLS(CommandTable);
+	return 0;
+}
 
 int CmdQuit(const char *Cmd)
 {
   exit(0);
   return 0;
 }
+
+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.
@@ -107,9 +122,8 @@ void storeCommand(UsbCommand *command)
 int getCommand(UsbCommand* response)
 {
     //If head == tail, there's nothing to read, or if we just got initialized
-    if(cmd_head == cmd_tail){
-        return 0;
-    }
+    if(cmd_head == cmd_tail)  return 0;
+
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
@@ -117,7 +131,6 @@ int getCommand(UsbCommand* response)
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     return 1;
-
 }
 
 /**
@@ -130,32 +143,31 @@ int getCommand(UsbCommand* response)
  * @return true if command was returned, otherwise false
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
-
+  
 	UsbCommand resp;
-	
+
 	if (response == NULL)
 		response = &resp;
 
-
 	// Wait until the command is received
-	for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
+	for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
 
-		while (getCommand(response)) {
+		while( getCommand(response) ) {
 			if(response->cmd == cmd){
 				return true;
 			}
 		}
 		msleep(10); // XXX ugh
 		if (dm_seconds == 200) { // 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");
+			PrintAndLog("Waiting for a response from the proxmark...");
+			PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
 		}
 	}
-    return false;
+	return false;
 }
 
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
-	return WaitForResponseTimeout(cmd,response,-1);
+	return WaitForResponseTimeout(cmd, response, -1);
 }
 
 //-----------------------------------------------------------------------------
@@ -175,27 +187,28 @@ void UsbCommandReceived(UsbCommand *UC)
 	switch(UC->cmd) {
 		// First check if we are handling a debug message
 		case CMD_DEBUG_PRINT_STRING: {
-		  char s[USB_CMD_DATA_SIZE+1] = {0x00};
-		  size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
-		  memcpy(s,UC->d.asBytes,len);
-		  PrintAndLog("#db# %s       ", s);
-		  return;
+			char s[USB_CMD_DATA_SIZE+1] = {0x00};
+			size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
+			memcpy(s,UC->d.asBytes,len);
+			PrintAndLog("#db# %s       ", s);
+			return;
 		} break;
 
 		case CMD_DEBUG_PRINT_INTEGERS: {
-		  PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
-		  return;
+			PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+			return;
 		} break;
-		  
+
 		case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
-		  sample_buf_len += UC->arg[1];
-		  memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+			memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+			return;
 		} break;
 
-		default:
-		  break;
-	  }
+		default: {
+			storeCommand(UC);
+			break;
+		}
+	}
 
-  storeCommand(UC);
 }