X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/afdcb8c159a73aba95a017f1cfec98e8fa2b93c1..d86ee73da53a701b3e47de9eb2a047c6bf0b0bd1:/client/flasher.c?ds=inline

diff --git a/client/flasher.c b/client/flasher.c
index 40e40524..f257d994 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -10,15 +10,12 @@
 #include <stdlib.h>
 #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"
 
 #ifdef _WIN32
 # define unlink(x)
@@ -26,6 +23,9 @@
 # include <unistd.h>
 #endif
 
+static serial_port sp;
+static char* serial_port_name;
+
 void cmd_debug(UsbCommand* UC) {
   //  Debug
   printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
@@ -40,6 +40,45 @@ void cmd_debug(UsbCommand* UC) {
   printf("...\n");
 }
 
+void SendCommand(UsbCommand* txcmd) {
+//  printf("send: ");
+//  cmd_debug(txcmd);
+  if (!uart_send(sp,(byte_t*)txcmd,sizeof(UsbCommand))) {
+    printf("Sending bytes to proxmark failed\n");
+    exit(1);
+  }
+}
+
+void ReceiveCommand(UsbCommand* rxcmd) {
+  byte_t* prxcmd = (byte_t*)rxcmd;
+  byte_t* prx = prxcmd;
+  size_t rxlen;
+  while (true) {
+    if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-prxcmd), &rxlen)) {
+      prx += rxlen;
+      if ((prx-prxcmd) >= sizeof(UsbCommand)) {
+        return;
+      }
+    }
+  }
+}
+
+void CloseProxmark() {
+  // Clean up the port
+  uart_close(sp);
+  // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
+  unlink(serial_port_name);
+}
+
+int OpenProxmark(size_t i) {
+  sp = uart_open(serial_port_name);
+  if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
+    //poll once a second
+    return 0;
+  }
+  return 1;
+}
+
 static void usage(char *argv0)
 {
 	fprintf(stderr, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
@@ -47,10 +86,9 @@ static void usage(char *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 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");
+	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
@@ -61,10 +99,7 @@ int main(int argc, char **argv)
 	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) {
@@ -91,22 +126,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);
+  serial_port_name = argv[1];
+  
+  fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name);
+  do {
+    msleep(1000);
+    fprintf(stderr, ".");
+  } while (!OpenProxmark(0));
+  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;
 
@@ -126,11 +155,7 @@ int main(int argc, char **argv)
 	if (res < 0)
 		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");