X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4a049b7847f69c9f4554c62c34085e1a0a77cb51..b69947c24598e870b0f08d661e10e390330e38a6:/client/flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 6019a6b9..e982ecf1 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -13,7 +13,7 @@
 #include "proxmark3.h"
 #include "flash.h"
 #include "uart.h"
-#include "usb_cmd.h"
+#include "../include/usb_cmd.h"
 
 #ifdef _WIN32
 # define unlink(x)
@@ -52,11 +52,8 @@ void ReceiveCommand(UsbCommand* rxcmd) {
   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;
       }
     }
@@ -72,7 +69,7 @@ void CloseProxmark() {
 
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);
-  if (sp == INVALID_SERIAL_PORT) {
+  if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
     //poll once a second
     return 0;
   }
@@ -83,7 +80,12 @@ 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);
+	//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, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
+	fprintf(stderr, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n");
+	fprintf(stderr, "              http://code.google.com/p/proxmark3/wiki/Linux\n\n");
 }
 
 #define MAX_FILES 4
@@ -123,14 +125,14 @@ int main(int argc, char **argv)
 
   serial_port_name = argv[1];
   
-  fprintf(stderr,"Waiting for Proxmark to appear on USB...");
+  fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name);
   do {
     sleep(1);
     fprintf(stderr, ".");
   } while (!OpenProxmark(0));
   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;