USB comms: part 2 towards @micolous PR#463 (#595)

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index fc258609a150cbf062fd26c4249c1a4b3bac5d65..6587bcff6508a1fe6ff05d568a3cead7d22f6557 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -41,14 +41,17 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
        pthread_t reader_thread;
        bool execCommand = (script_cmd != NULL);
        bool stdinOnPipe = !isatty(STDIN_FILENO);
-       
+
        memset(&conn, 0, sizeof(receiver_arg));
 
        if (usb_present) {
                conn.run = true;
+               SetOffline(false);
                pthread_create(&reader_thread, NULL, &uart_receiver, &conn);
                // cache Version information now:
                CmdVersion(NULL);
+       } else {
+               SetOffline(true);
        }
 
        // file with script
@@ -64,7 +67,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
        read_history(".history");
 
-       while (1)  {
+       while (1) {
                // If there is a script file
                if (script_file)
                {
@@ -235,7 +238,7 @@ int main(int argc, char* argv[]) {
                
                if(strcmp(argv[i],"-f") == 0 || strcmp(argv[i],"-flush") == 0){
                        printf("Output will be flushed after every print.\n");
-                       flushAfterWrite = 1;
+                       SetFlushAfterWrite(true);
                }
                
                if(strcmp(argv[i],"-w") == 0 || strcmp(argv[i],"-wait") == 0){
@@ -311,14 +314,11 @@ int main(int argc, char* argv[]) {
        if (sp == INVALID_SERIAL_PORT) {
                printf("ERROR: invalid serial port\n");
                usb_present = false;
-               offline = 1;
        } else if (sp == CLAIMED_SERIAL_PORT) {
                printf("ERROR: serial port is claimed by another process\n");
                usb_present = false;
-               offline = 1;
        } else {
                usb_present = true;
-               offline = 0;
        }
 
 #ifdef HAVE_GUI