Change driver file proxmark3.inf to support both old and new Vendor/Product IDs

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 40e40524e6dc8e317cce0a53ccda779b82b77445..2bb87df9a96ea1ab5ab63a56a9e387a545f72272 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -10,15 +10,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <pthread.h>
-
 #include "proxmark3.h"
 #include "util.h"
 #include "util_posix.h"
 #include "flash.h"
 #include "uart.h"
 #include "usb_cmd.h"
-#include "comms.h"
 
 #ifdef _WIN32
 # define unlink(x)
@@ -40,17 +37,40 @@ void cmd_debug(UsbCommand* UC) {
   printf("...\n");
 }
 
+void SendCommand(UsbCommand* txcmd) {
+//  printf("send: ");
+//  cmd_debug(txcmd);
+  if (!uart_send(sp,(uint8_t*)txcmd,sizeof(UsbCommand))) {
+    printf("Sending bytes to proxmark failed\n");
+    exit(1);
+  }
+}
+
+void ReceiveCommand(UsbCommand* rxcmd) {
+  uint8_t* prxcmd = (uint8_t*)rxcmd;
+  uint8_t* prx = prxcmd;
+  size_t rxlen;
+  while (true) {
+    if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-prxcmd), &rxlen)) {
+      prx += rxlen;
+      if ((prx-prxcmd) >= sizeof(UsbCommand)) {
+        return;
+      }
+    }
+  }
+}
+
 static void usage(char *argv0)
 {
        fprintf(stderr, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
        fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
-       //Is the example below really true? /Martin
-       fprintf(stderr, "Example:\n\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
-       fprintf(stderr, "\nExample (Linux):\n\n\t %s  /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0);
+       fprintf(stderr, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
+#ifdef __linux__
        fprintf(stderr, "\nNote (Linux): if the flasher gets stuck at 'Waiting for Proxmark to reappear',\n");
        fprintf(stderr, "       you may need to blacklist proxmark for modem-manager. v1.4.14 and later\n");
        fprintf(stderr, "       include this configuration patch already. The change can be found at:\n");
        fprintf(stderr, "       https://cgit.freedesktop.org/ModemManager/ModemManager/commit/?id=6e7ff47\n\n");
+#endif
 }
 
 #define MAX_FILES 4
@@ -61,10 +81,7 @@ int main(int argc, char **argv)
        int num_files = 0;
        int res;
        flash_file_t files[MAX_FILES];
-       receiver_arg conn;
-       pthread_t reader_thread;
 
-       memset(&conn, 0, sizeof(receiver_arg));
        memset(files, 0, sizeof(files));
 
        if (argc < 3) {
@@ -91,22 +108,16 @@ int main(int argc, char **argv)
                }
        }
 
-       pthread_mutex_init(&conn.recv_lock, NULL);
-
        char* serial_port_name = argv[1];
 
        fprintf(stderr,"Waiting for Proxmark to appear on %s", serial_port_name);
        do {
-               sleep(1);
+               msleep(1000);
                fprintf(stderr, ".");
-       } while (!OpenProxmark(serial_port_name));
+       } while (!OpenProxmark(0, serial_port_name));
        fprintf(stderr," Found.\n");
 
-       // Lets start up the communications thread
-       conn.run = true;
-       pthread_create(&reader_thread, NULL, &uart_receiver, &conn);
-
-       res = flash_start_flashing(&conn, can_write_bl, serial_port_name);
+       res = flash_start_flashing(can_write_bl, serial_port_name);
        if (res < 0)
                return -1;
 
@@ -126,11 +137,7 @@ int main(int argc, char **argv)
        if (res < 0)
                return -1;
 
-       // Stop the command thread.
-       conn.run = false;
-       pthread_join(reader_thread, NULL);
-       CloseProxmark(&conn, serial_port_name);
-       pthread_mutex_destroy(&conn.recv_lock);
+       CloseProxmark(serial_port_name);
 
        fprintf(stderr, "All done.\n\n");
        fprintf(stderr, "Have a nice day!\n");