Merge pull request #355 from pwpiwi/io_fix

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 98f7880e3bc6d35116618f5085c36466ae31a9c9..fa389dd1678d35afd13def5ce2960961b88b1591 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -57,31 +57,22 @@ struct receiver_arg {
        int run;
 };
 
        int run;
 };
 

-struct main_loop_arg {
-       int usb_present;
-       char *script_cmds_file;
-};
-
-byte_t rx[0x1000000];
+byte_t rx[sizeof(UsbCommand)];

 byte_t* prx = rx;
 
 static void *uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
 byte_t* prx = rx;
 
 static void *uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;

-       size_t cmd_count;

 
        while (arg->run) {
 
        while (arg->run) {

-               rxlen = sizeof(UsbCommand);
-               if (uart_receive(sp, prx, &rxlen)) {
+               rxlen = 0;
+               if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-rx), &rxlen)) {

                        prx += rxlen;
                        prx += rxlen;

-                       if (((prx-rx) % sizeof(UsbCommand)) != 0) {
+                       if (prx-rx < sizeof(UsbCommand)) {

                                continue;
                        }
                                continue;
                        }

-                       cmd_count = (prx-rx) / sizeof(UsbCommand);
-
-                       for (size_t i = 0; i < cmd_count; i++) {
-                               UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
-                       }
+                       
+                       UsbCommandReceived((UsbCommand*)rx);

                }
                prx = rx;
 
                }
                prx = rx;
 


@@ -97,13 +88,13 @@ static void *uart_receiver(void *targ) {
        return NULL;
 }
 
        return NULL;
 }
 

-static void *main_loop(void *targ) {
-       struct main_loop_arg *arg = (struct main_loop_arg*)targ;
+
+void main_loop(char *script_cmds_file, bool usb_present) {

        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;
        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;

-  
-       if (arg->usb_present == 1) {
+
+       if (usb_present) {

                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
                // cache Version information now:
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
                // cache Version information now:


@@ -113,10 +104,10 @@ static void *main_loop(void *targ) {
        FILE *script_file = NULL;
        char script_cmd_buf[256];  // iceman, needs lua script the same file_path_buffer as the rest
 
        FILE *script_file = NULL;
        char script_cmd_buf[256];  // iceman, needs lua script the same file_path_buffer as the rest
 

-       if (arg->script_cmds_file) {
-               script_file = fopen(arg->script_cmds_file, "r");
+       if (script_cmds_file) {
+               script_file = fopen(script_cmds_file, "r");

                if (script_file) {
                if (script_file) {

-                       printf("using 'scripting' commands file %s\n", arg->script_cmds_file);
+                       printf("using 'scripting' commands file %s\n", script_cmds_file);

                }
        }
 
                }
        }
 


@@ -171,19 +162,16 @@ static void *main_loop(void *targ) {
   
        write_history(".history");
   
   
        write_history(".history");
   

-       if (arg->usb_present == 1) {
+       if (usb_present) {

                rarg.run = 0;
                pthread_join(reader_thread, NULL);
        }
                rarg.run = 0;
                pthread_join(reader_thread, NULL);
        }

-
+       

        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }
 
        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }
 

-       ExitGraphics();
-       pthread_exit(NULL);
-       return NULL;

 }
 
 static void dumpAllHelp(int markdown)
 }
 
 static void dumpAllHelp(int markdown)


@@ -224,6 +212,7 @@ static void set_my_executable_path(void)
        }
 }
 
        }
 }
 

+

 int main(int argc, char* argv[]) {
        srand(time(0));
   
 int main(int argc, char* argv[]) {
        srand(time(0));
   


@@ -249,25 +238,20 @@ int main(int argc, char* argv[]) {
 
        set_my_executable_path();
        
 
        set_my_executable_path();
        

-       // Make sure to initialize
-       struct main_loop_arg marg = {
-               .usb_present = 0,
-               .script_cmds_file = NULL
-       };
-       pthread_t main_loop_threat;
-
+       bool usb_present = false;
+       char *script_cmds_file = NULL;

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

-               marg.usb_present = 0;
+               usb_present = false;

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

-               marg.usb_present = 0;
+               usb_present = false;

                offline = 1;
        } else {
                offline = 1;
        } else {

-               marg.usb_present = 1;
+               usb_present = true;

                offline = 0;
        }
 
                offline = 0;
        }
 


@@ -283,21 +267,21 @@ int main(int argc, char* argv[]) {
                        flushAfterWrite = 1;
                }
                else
                        flushAfterWrite = 1;
                }
                else

-               marg.script_cmds_file = argv[2];
+               script_cmds_file = argv[2];

        }
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);
 
        }
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);
 

-       pthread_create(&main_loop_threat, NULL, &main_loop, &marg);
-       InitGraphics(argc, argv);
-
+#ifdef HAVE_GUI
+       InitGraphics(argc, argv, script_cmds_file, usb_present);

        MainGraphics();
        MainGraphics();

-
-       pthread_join(main_loop_threat, NULL);
+#else
+       main_loop(script_cmds_file, usb_present);
+#endif 

 
        // Clean up the port
 
        // Clean up the port

-       if (offline == 0) {
+       if (usb_present) {

                uart_close(sp);
        }
 
                uart_close(sp);
        }