X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f004ba08d4e1bb3472f931924234c901a41d1ae1..64d1b4efc932898dc250dbc5d8f7418e3643b27b:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index 7d50c35a..c100bbea 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -34,15 +34,15 @@ static UsbCommand txcmd; volatile static bool txcmd_pending = false; void SendCommand(UsbCommand *c) { -#if 0 + #if 0 printf("Sending %d bytes\n", sizeof(UsbCommand)); -#endif + #endif if (offline) { PrintAndLog("Sending bytes to proxmark failed - offline"); return; } - /** + /** The while-loop below causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive, but comm thread just spins here. Not good.../holiman @@ -68,30 +68,30 @@ static void *uart_receiver(void *targ) { struct receiver_arg *arg = (struct receiver_arg*)targ; size_t rxlen; size_t cmd_count; - + while (arg->run) { rxlen = sizeof(UsbCommand); - if (uart_receive(sp,prx,&rxlen)) { + if (uart_receive(sp, prx, &rxlen)) { prx += rxlen; if (((prx-rx) % sizeof(UsbCommand)) != 0) { continue; } cmd_count = (prx-rx) / sizeof(UsbCommand); - for (size_t i=0; iusb_present == 1) { - rarg.run=1; + rarg.run = 1; pthread_create(&reader_thread, NULL, &uart_receiver, &rarg); } - + FILE *script_file = NULL; - char script_cmd_buf[256]; // iceman, needs lua script the same file_path_buffer as the rest - + 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_file) { @@ -134,7 +134,7 @@ static void *main_loop(void *targ) { nl = strrchr(script_cmd_buf, '\n'); if (nl) *nl = '\0'; - + if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) { memset(cmd, 0, strlen(script_cmd_buf)); strcpy(cmd, script_cmd_buf); @@ -173,12 +173,12 @@ static void *main_loop(void *targ) { rarg.run = 0; pthread_join(reader_thread, NULL); } - + if (script_file) { fclose(script_file); script_file = NULL; } - + ExitGraphics(); pthread_exit(NULL); return NULL;