gcc10 compiler fixes:

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index a425023d0794c87507b493467a4775a00040a1c8..d7fa0b5e866ee098ed0dbb79fc86d69b8f19f281 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -1,67 +1,120 @@
-#include <usb.h>
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Flasher frontend tool
+//-----------------------------------------------------------------------------
+

 #include <stdio.h>
 #include <stdio.h>

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <stdint.h>
-#include <stdbool.h>
-#include <strings.h>

 #include <string.h>
 #include <string.h>

-#include <errno.h>
-#include <ctype.h>
-
-#include "prox.h"
+#include <inttypes.h>
+#include <pthread.h>

 #include "proxmark3.h"
 #include "proxmark3.h"

+#include "util.h"
+#include "util_posix.h"

 #include "flash.h"
 #include "flash.h"

+#include "comms.h"
+#include "usb_cmd.h"
+#include "uart.h"
+
+void cmd_debug(UsbCommand* UC) {
+  //  Debug
+  printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
+  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]);
+  }
+  printf("...\n");
+}

 
 

-unsigned int current_command = CMD_UNKNOWN;
+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, "\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
+}

 
 

-extern struct partition partitions[];
+#define MAX_FILES 4

 
 

-static void usage(char **argv)
+int main(int argc, char **argv)

 {
 {

-       int i;
-       fprintf(stderr, "Usage:   %s areas image [image [image]]\n", argv[0]);
-       fprintf(stderr, "         areas is a comma-separated list of areas to flash, with no spaces\n");
-       fprintf(stderr, "               Known areas are:");
+       int can_write_bl = false;
+       int num_files = 0;
+       int res;
+       flash_file_t files[MAX_FILES];

 
 

-       for(i=0; partitions[i].name != NULL; i++) {
-               fprintf(stderr, " %s", partitions[i].name);
+       memset(files, 0, sizeof(files));
+
+       if (argc < 3) {
+               usage(argv[0]);
+               return -1;

        }
 
        }
 

-       fprintf(stderr, "\n");
-       fprintf(stderr, "         image is the path to the corresponding image\n\n");
-       fprintf(stderr, "Example: %s os,fpga path/to/osimage.elf path/to/fpgaimage.elf\n", argv[0]);
-}
+       for (int i = 2; i < argc; i++) {
+               if (argv[i][0] == '-') {
+                       if (!strcmp(argv[i], "-b")) {
+                               can_write_bl = true;
+                       } else {
+                               usage(argv[0]);
+                               return -1;
+                       }
+               } else {
+                       res = flash_load(&files[num_files], argv[i], can_write_bl);
+                       if (res < 0) {
+                               fprintf(stderr, "Error while loading %s\n", argv[i]);
+                               return -1;
+                       }
+                       fprintf(stderr, "\n");
+                       num_files++;
+               }
+       }
+
+       char* serial_port_name = argv[1];

 
 

-int main(int argc, char **argv) {
-       if(argc < 2) {
-               usage(argv);
-               exit(-1);
+       if (!OpenProxmark(serial_port_name, true, 120)) {   // wait for 2 minutes
+               fprintf(stderr, "Could not find Proxmark on %s.\n\n", serial_port_name);
+               return -1;
+       } else {
+               fprintf(stderr," Found.\n");

        }
        }

-       
-       /* Count area arguments */
-       int areas = 0, offset=-1, length=0;
-       while(find_next_area(argv[1], &offset, &length)) areas++;
-       
-       if(areas != argc - 2) {
-               usage(argv);
-               exit(-1);
+
+       res = flash_start_flashing(can_write_bl, serial_port_name);
+       if (res < 0)
+               return -1;
+
+       fprintf(stderr, "\nFlashing...\n");
+
+       for (int i = 0; i < num_files; i++) {
+               res = flash_write(&files[i]);
+               if (res < 0)
+                       return -1;
+               flash_free(&files[i]);
+               fprintf(stderr, "\n");

        }
        }

-       
-       usb_init();
-
-       fprintf(stderr,"Waiting for Proxmark to appear on USB... ");
-       while(!(devh=OpenProxmark(0))) { sleep(1); }
-       fprintf(stderr,"Found.\n");
-       
-       do_flash(argv);
-       
-       UsbCommand c = {CMD_HARDWARE_RESET};
-       SendCommand(&c);

 
 

+       fprintf(stderr, "Resetting hardware...\n");
+
+       res = flash_stop_flashing();
+       if (res < 0)
+               return -1;
+
+       // Stop the command thread.

        CloseProxmark();
 
        CloseProxmark();
 

-       fprintf(stderr,"Have a nice day!\n");
+       fprintf(stderr, "All done.\n\n");
+       fprintf(stderr, "Have a nice day!\n");

 
        return 0;
 }
 
        return 0;
 }