X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2cab856f9f8cf6798447f4e66559975692225706..f397b5cc874ac7d658173199d92c30f3f717a300:/client/flasher.c?ds=sidebyside

diff --git a/client/flasher.c b/client/flasher.c
index a425023d..85aae049 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -1,67 +1,93 @@
-#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 <unistd.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <strings.h>
 #include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "prox.h"
-#include "proxmark3.h"
+#include "sleep.h"
+#include "proxusb.h"
 #include "flash.h"
 
-unsigned int current_command = CMD_UNKNOWN;
+static void usage(char *argv0)
+{
+	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);
+}
 
-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 = 0;
+	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 < 2) {
+		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 = 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++;
+		}
+	}
 
-int main(int argc, char **argv) {
-	if(argc < 2) {
-		usage(argv);
-		exit(-1);
+	usb_init();
+
+	fprintf(stderr, "Waiting for Proxmark to appear on USB...");
+	while (!OpenProxmark(0)) {
+		sleep(1);
+		fprintf(stderr, ".");
 	}
-	
-	/* 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);
+	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");
 	}
-	
-	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;
 
 	CloseProxmark();
 
-	fprintf(stderr,"Have a nice day!\n");
+	fprintf(stderr, "All done.\n\n");
+	fprintf(stderr, "Have a nice day!\n");
 
 	return 0;
 }