merged trunk changes into branch

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 64e0c1b461e34dda45ca8ffe871f7887b5ba6d21..b6f32adacf158691a22c6a6ef353d358a0ac121f 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -24,6 +24,7 @@
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"

+#include "cmdscript.h"

 
 
 unsigned int current_command = CMD_UNKNOWN;
 
 
 unsigned int current_command = CMD_UNKNOWN;


@@ -51,6 +52,7 @@ static command_t CommandTable[] =
   {"hw",    CmdHW,    1, "{ Hardware commands... }"},
   {"lf",    CmdLF,    1, "{ LF commands... }"},
   {"quit",  CmdQuit,  1, "Quit program"},
   {"hw",    CmdHW,    1, "{ Hardware commands... }"},
   {"lf",    CmdLF,    1, "{ LF commands... }"},
   {"quit",  CmdQuit,  1, "Quit program"},

+  {"script", CmdScript,   1,"Run script"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 


@@ -65,8 +67,6 @@ int CmdQuit(const char *Cmd)
   exit(0);
   return 0;
 }
   exit(0);
   return 0;
 }

-int getCommand(UsbCommand* response);
-void storeCommand(UsbCommand *command);

 /**
  * Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.
 /**
  * Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.