PCF7931: Print found single/consecutive block(s), fixes to block 1 check

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index d494810aa5b64ca9a476c047dc19727dcb5c2ba2..a008f7bc9d85c82cb3dac55a723e6dbac83e2a04 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -9,22 +9,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sleep.h"
+#include <inttypes.h>
+#include <pthread.h>
 #include "proxmark3.h"
+#include "util.h"
+#include "util_posix.h"
 #include "flash.h"
-#include "uart.h"
+#include "comms.h"
 #include "usb_cmd.h"
 
-static serial_port sp;
-static char* serial_port_name;
 
 void cmd_debug(UsbCommand* UC) {
   //  Debug
   printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
-  printf("  cmd[len=%zd]: %016"llx"\n",sizeof(UC->cmd),UC->cmd);
-  printf(" arg0[len=%zd]: %016"llx"\n",sizeof(UC->arg[0]),UC->arg[0]);
-  printf(" arg1[len=%zd]: %016"llx"\n",sizeof(UC->arg[1]),UC->arg[1]);
-  printf(" arg2[len=%zd]: %016"llx"\n",sizeof(UC->arg[2]),UC->arg[2]);
+  printf("  cmd[len=%zd]: %016" PRIx64 "\n",sizeof(UC->cmd),UC->cmd);
+  printf(" arg0[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[0]),UC->arg[0]);
+  printf(" arg1[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[1]),UC->arg[1]);
+  printf(" arg2[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[2]),UC->arg[2]);
   printf(" data[len=%zd]: ",sizeof(UC->d.asBytes));
   for (size_t i=0; i<16; i++) {
     printf("%02x",UC->d.asBytes[i]);
@@ -32,60 +33,24 @@ void cmd_debug(UsbCommand* UC) {
   printf("...\n");
 }
 
-void SendCommand(UsbCommand* txcmd) {
-//  printf("send: ");
-//  cmd_debug(txcmd);
-  if (!uart_send(sp,(byte_t*)txcmd,sizeof(UsbCommand))) {
-    printf("Sending bytes to proxmark failed\n");
-    exit(1);
-  }
-}
-
-void ReceiveCommand(UsbCommand* rxcmd) {
-  byte_t* prxcmd = (byte_t*)rxcmd;
-  byte_t* prx = prxcmd;
-  size_t rxlen;
-  while (true) {
-    rxlen = sizeof(UsbCommand) - (prx-prxcmd);
-    if (uart_receive(sp,prx,&rxlen)) {
-//      printf("received [%zd] bytes\n",rxlen);
-      prx += rxlen;
-      if ((prx-prxcmd) >= sizeof(UsbCommand)) {
-//        printf("received: ");
-//        cmd_debug(rxcmd);
-        return;
-      }
-    }
-  }
-}
-
-void CloseProxmark() {
-  // Clean up the port
-  uart_close(sp);
-}
-
-int OpenProxmark(size_t i) {
-  sp = uart_open(serial_port_name);
-  if (sp == INVALID_SERIAL_PORT) {
-    //poll once a second
-    msleep(100);
-    return 0;
-  }
-  return 1;
-}
-
 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");
-       fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.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
 
 int main(int argc, char **argv)
 {
-       int can_write_bl = 0;
+       int can_write_bl = false;
        int num_files = 0;
        int res;
        flash_file_t files[MAX_FILES];
@@ -100,7 +65,7 @@ int main(int argc, char **argv)
        for (int i = 2; i < argc; i++) {
                if (argv[i][0] == '-') {
                        if (!strcmp(argv[i], "-b")) {
-                               can_write_bl = 1;
+                               can_write_bl = true;
                        } else {
                                usage(argv[0]);
                                return -1;
@@ -116,14 +81,16 @@ int main(int argc, char **argv)
                }
        }
 
-  serial_port_name = argv[1];
-       fprintf(stderr, "Waiting for Proxmark to appear on USB...");
-       while (!OpenProxmark(0)) {
-               fprintf(stderr, ".");
+       char* serial_port_name = argv[1];
+
+       if (!OpenProxmark(serial_port_name, true, 120, true)) {   // wait for 2 minutes
+               fprintf(stderr, "Could not find Proxmark on %s.\n\n", serial_port_name);
+               return -1;
+       } else {
+               fprintf(stderr," Found.\n");
        }
-       fprintf(stderr, " Found.\n");
 
-       res = flash_start_flashing(can_write_bl);
+       res = flash_start_flashing(can_write_bl, serial_port_name);
        if (res < 0)
                return -1;
 
@@ -143,6 +110,7 @@ int main(int argc, char **argv)
        if (res < 0)
                return -1;
 
+       // Stop the command thread.
        CloseProxmark();
 
        fprintf(stderr, "All done.\n\n");