X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/046f3dfa7c818ef45815d37abf2407cafacde961..d3a22c7dfa87bf5e21d228849a602194be4a0895:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 528cae34..4b463f1d 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -47,7 +47,11 @@ void SendCommand(UsbCommand *c) {
       PrintAndLog("Sending bytes to proxmark failed - offline");
       return;
     }
-
+	/**
+	The while-loop below causes hangups at times, when the pm3 unit is unresponsive
+	or disconnected. The main console thread is alive, but comm thread just spins here.
+	Not good.../holiman
+	**/
   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;
@@ -62,21 +66,6 @@ struct main_loop_arg {
   char *script_cmds_file;
 };
 
-//static void *usb_receiver(void *targ) {
-//  struct receiver_arg *arg = (struct receiver_arg*)targ;
-//  UsbCommand cmdbuf;
-//
-//  while (arg->run) {
-//    if (ReceiveCommandPoll(&cmdbuf)) {
-//      UsbCommandReceived(&cmdbuf);
-//      fflush(NULL);
-//    }
-//  }
-//
-//  pthread_exit(NULL);
-//  return NULL;
-//}
-
 byte_t rx[0x1000000];
 byte_t* prx = rx;
 
@@ -125,7 +114,7 @@ static void *main_loop(void *targ) {
   }
   
   FILE *script_file = NULL;
-  char script_cmd_buf[256];
+  char script_cmd_buf[256];  // iceman, needs lua script the same file_path_buffer as the rest
   
   if (arg->script_cmds_file)
   {
@@ -207,14 +196,6 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
-//static void dumpHelp(char  *parent, ...)
-//{
-//  printf("## %s\n\n", parent);
-//  CommandReceived(parent);
-//  
-//  printf("\n");
-//}
-
 static void dumpAllHelp(int markdown)
 {
   printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
@@ -254,17 +235,6 @@ int main(int argc, char* argv[]) {
 	};
 	pthread_t main_loop_t;
 
-/*
-  usb_init();
-  if (!OpenProxmark(1)) {
-    fprintf(stderr,"PROXMARK3: NOT FOUND!\n");
-    marg.usb_present = 0;
-    offline = 1;
-  } else {
-    marg.usb_present = 1;
-    offline = 0;
-  }
-*/
   
 	sp = uart_open(argv[1]);
 	if (sp == INVALID_SERIAL_PORT) {
@@ -305,10 +275,6 @@ int main(int argc, char* argv[]) {
 
 	pthread_join(main_loop_t, NULL);
 
-//  if (marg.usb_present == 1) {
-//    CloseProxmark();
-//  }
-
 	// Clean up the port
 	uart_close(sp);