Fixed 'volatile' error in this branch also

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 81f2c18a0ccfcf8b71b0935eb837e414c19e1281..a6274bc111b648ebe91b40c1066061521173803d 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -26,7 +26,7 @@
 
 static serial_port sp;
 static UsbCommand txcmd;
-static bool txcmd_pending = false;
+static volatile bool txcmd_pending = false;
 
 void SendCommand(UsbCommand *c) {
 #if 0
@@ -200,6 +200,7 @@ int main(int argc, char* argv[]) {
   
   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;