Finishing touches on new mifare classic hack rework

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 7226d3ae2b2d004e7a86c8c91807a0f098f6969b..a6274bc111b648ebe91b40c1066061521173803d 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,12 +21,12 @@
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"

-#include "messages.h"

 #include "ui.h"
 #include "ui.h"

+#include "sleep.h"

 
 static serial_port sp;
 static UsbCommand txcmd;
 
 static serial_port sp;
 static UsbCommand txcmd;

-static bool txcmd_pending = false;
+static volatile bool txcmd_pending = false;

 
 void SendCommand(UsbCommand *c) {
 #if 0
 
 void SendCommand(UsbCommand *c) {
 #if 0


@@ -198,11 +198,9 @@ static void *main_loop(void *targ) {
 int main(int argc, char* argv[]) {
   srand(time(0));
   
 int main(int argc, char* argv[]) {
   srand(time(0));
   

-  printf("lala: %08"llx"",(uint64_t)0xaabb11223344);
-  return 0;
-

   if (argc < 2) {
     printf("syntax: %s <port>\n\n",argv[0]);
   if (argc < 2) {
     printf("syntax: %s <port>\n\n",argv[0]);

+    printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);

     return 1;
   }
   
     return 1;
   }
   


@@ -224,11 +222,16 @@ int main(int argc, char* argv[]) {
     offline = 0;
   }
 */
     offline = 0;
   }
 */

+  

   sp = uart_open(argv[1]);
   if (sp == INVALID_SERIAL_PORT) {
     printf("ERROR: invalid serial port\n");
     marg.usb_present = 0;
     offline = 1;
   sp = uart_open(argv[1]);
   if (sp == INVALID_SERIAL_PORT) {
     printf("ERROR: invalid serial port\n");
     marg.usb_present = 0;
     offline = 1;

+  } else if (sp == CLAIMED_SERIAL_PORT) {
+    printf("ERROR: serial port is claimed by another process\n");
+    marg.usb_present = 0;
+    offline = 1;

   } else {
     marg.usb_present = 1;
     offline = 0;
   } else {
     marg.usb_present = 1;
     offline = 0;