Merge pull request #600 from marshmellow42/master

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index c840c92215224192624f3fe6f51971c0e97f8eb0..e3714185dbf195ed1881c49a975f1a1a964ec36c 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -12,20 +12,20 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include <unistd.h>
 #include "proxmark3.h"
-#include "sleep.h"
+#include "util.h"
+#include "util_posix.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"
+#include "uart.h"
 
 void SendCommand(UsbCommand* txcmd);
 void ReceiveCommand(UsbCommand* rxcmd);
-void CloseProxmark();
-int OpenProxmark(size_t i);
 
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
+serial_port sp;
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
@@ -42,6 +42,23 @@ static const uint8_t elf_ident[] = {
        EV_CURRENT
 };
 
+void CloseProxmark(const char *serial_port_name) {
+       // 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);
+}
+
+bool OpenProxmark(size_t i, const char *serial_port_name) {
+       sp = uart_open(serial_port_name);
+       if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
+               //poll once a second
+               return false;
+       }
+
+       return true;
+}
+
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
 static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs)
@@ -276,7 +293,7 @@ static int get_proxmark_state(uint32_t *state)
 {
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
-  SendCommand(&c);
+       SendCommand(&c);
        UsbCommand resp;
        ReceiveCommand(&resp);
 
@@ -336,14 +353,16 @@ static int enter_bootloader(char *serial_port_name)
                        SendCommand(&c);
                        fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
                }
-    msleep(100);
-               CloseProxmark();
+
+               msleep(100);
+               CloseProxmark(serial_port_name);
 
                fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
-    do {
+               do {
                        sleep(1);
                        fprintf(stderr, ".");
-               } while (!OpenProxmark(0));
+               } while (!OpenProxmark(0, serial_port_name));
+
                fprintf(stderr," Found.\n");
 
                return 0;
@@ -355,7 +374,7 @@ static int enter_bootloader(char *serial_port_name)
 
 static int wait_for_ack(void)
 {
-  UsbCommand ack;
+       UsbCommand ack;
        ReceiveCommand(&ack);
        if (ack.cmd != CMD_ACK) {
                printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
@@ -470,7 +489,7 @@ void flash_free(flash_file_t *ctx)
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
-  SendCommand(&c);
-  msleep(100);
-  return 0;
+       SendCommand(&c);
+       msleep(100);
+       return 0;
 }