X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/50d6e4abc154916cb4cf62f294700181bfc2abbc..babfcaa0f3e4f3d83fd7ac9707a37db12431ec80:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 5ac7cd0e..5cbacc86 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,12 +21,12 @@
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
-#include "messages.h"
 #include "ui.h"
+#include "sleep.h"
 
 static serial_port sp;
 static UsbCommand txcmd;
-static bool txcmd_pending = false;
+volatile static bool txcmd_pending = false;
 
 void SendCommand(UsbCommand *c) {
 #if 0
@@ -197,9 +197,10 @@ static void *main_loop(void *targ) {
 
 int main(int argc, char* argv[]) {
   srand(time(0));
-
+  
   if (argc < 2) {
     printf("syntax: %s <port>\n\n",argv[0]);
+    printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
     return 1;
   }
   
@@ -221,11 +222,16 @@ int main(int argc, char* argv[]) {
     offline = 0;
   }
 */
+  
   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;