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

diff --git a/client/flasher.c b/client/flasher.c
index 40e40524..a008f7bc 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -11,20 +11,13 @@
 #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"
+#include "usb_cmd.h"
 
-#ifdef _WIN32
-# define unlink(x)
-#else
-# include <unistd.h>
-#endif
 
 void cmd_debug(UsbCommand* UC) {
   //  Debug
@@ -44,27 +37,24 @@ 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
 
 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];
-	receiver_arg conn;
-	pthread_t reader_thread;
 
-	memset(&conn, 0, sizeof(receiver_arg));
 	memset(files, 0, sizeof(files));
 
 	if (argc < 3) {
@@ -75,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;
@@ -91,22 +81,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);
-		fprintf(stderr, ".");
-	} while (!OpenProxmark(serial_port_name));
-	fprintf(stderr," Found.\n");
-
-	// Lets start up the communications thread
-	conn.run = true;
-	pthread_create(&reader_thread, NULL, &uart_receiver, &conn);
+	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");
+	}
 
-	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;
 
@@ -127,10 +111,7 @@ int main(int argc, char **argv)
 		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();
 
 	fprintf(stderr, "All done.\n\n");
 	fprintf(stderr, "Have a nice day!\n");