X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a553f2674865fa544d04ca7b8194e30c008644ae..cc7580be7ad9f51968aa75174071341dad2d4f6a:/client/flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 0b8a3368..85aae049 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -3,64 +3,91 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Flashing binary
+// Flasher frontend tool
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "sleep.h"
 #include "proxusb.h"
 #include "flash.h"
 
-unsigned int current_command = CMD_UNKNOWN;
-
-extern struct partition partitions[];
-
-static void usage(char **argv)
+static void usage(char *argv0)
 {
-  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:");
-
-  for (int i = 0; partitions[i].name != NULL; ++i) {
-    fprintf(stderr, " %s", partitions[i].name);
-  }
-
-  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]);
+	fprintf(stderr, "Usage:   %s [-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);
 }
 
+#define MAX_FILES 4
+
 int main(int argc, char **argv)
 {
-  if (argc < 2) {
-    usage(argv);
-    exit(-1);
-  }
-
-  /* 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);
-  }
-
-  usb_init();
-
-  fprintf(stderr,"Waiting for Proxmark to appear on USB... ");
-  while (!OpenProxmark(0)) { sleep(1); }
-  fprintf(stderr,"Found.\n");
-
-  do_flash(argv);
-
-  UsbCommand c = {CMD_HARDWARE_RESET};
-  SendCommand(&c);
-
-  CloseProxmark();
-
-  fprintf(stderr,"Have a nice day!\n");
-
-  return 0;
+	int can_write_bl = 0;
+	int num_files = 0;
+	int res;
+	flash_file_t files[MAX_FILES];
+
+	memset(files, 0, sizeof(files));
+
+	if (argc < 2) {
+		usage(argv[0]);
+		return -1;
+	}
+
+	for (int i = 1; i < argc; i++) {
+		if (argv[i][0] == '-') {
+			if (!strcmp(argv[i], "-b")) {
+				can_write_bl = 1;
+			} 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++;
+		}
+	}
+
+	usb_init();
+
+	fprintf(stderr, "Waiting for Proxmark to appear on USB...");
+	while (!OpenProxmark(0)) {
+		sleep(1);
+		fprintf(stderr, ".");
+	}
+	fprintf(stderr, " Found.\n");
+
+	res = flash_start_flashing(can_write_bl);
+	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");
+	}
+
+	fprintf(stderr, "Resetting hardware...\n");
+
+	res = flash_stop_flashing();
+	if (res < 0)
+		return -1;
+
+	CloseProxmark();
+
+	fprintf(stderr, "All done.\n\n");
+	fprintf(stderr, "Have a nice day!\n");
+
+	return 0;
 }