Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that...

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 528cae341c40e1fcd4023e8ead7c3d2d762511d8..d2bb2011249f5d04ad3cf9bdf9e9c04be98bb5a5 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -48,6 +48,11 @@ void SendCommand(UsbCommand *c) {
       return;
     }
 
       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;
   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;


@@ -62,21 +67,6 @@ struct main_loop_arg {
   char *script_cmds_file;
 };
 
   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;
 
 byte_t rx[0x1000000];
 byte_t* prx = rx;
 


@@ -207,14 +197,6 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
   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======================");
 static void dumpAllHelp(int markdown)
 {
   printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");


@@ -254,17 +236,6 @@ int main(int argc, char* argv[]) {
        };
        pthread_t main_loop_t;
 
        };
        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) {
   
        sp = uart_open(argv[1]);
        if (sp == INVALID_SERIAL_PORT) {


@@ -305,10 +276,6 @@ int main(int argc, char* argv[]) {
 
        pthread_join(main_loop_t, NULL);
 
 
        pthread_join(main_loop_t, NULL);
 

-//  if (marg.usb_present == 1) {
-//    CloseProxmark();
-//  }
-

        // Clean up the port
        uart_close(sp);
   
        // Clean up the port
        uart_close(sp);