Merge pull request #600 from marshmellow42/master

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index bf01b911f116b7d2a89cfd2a792f43dcfdde5af7..e3714185dbf195ed1881c49a975f1a1a964ec36c 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <unistd.h>
-
 #include "proxmark3.h"
 #include "util.h"
 #include "util_posix.h"
@@ -21,10 +20,12 @@
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"
-#include "comms.h"
+#include "uart.h"
+
+void SendCommand(UsbCommand* txcmd);
+void ReceiveCommand(UsbCommand* rxcmd);
 
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
+serial_port sp;
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
@@ -41,29 +42,20 @@ static const uint8_t elf_ident[] = {
        EV_CURRENT
 };
 
-void CloseProxmark(receiver_arg* conn, char* serial_port_name) {
-       pthread_mutex_lock(&conn->recv_lock);
-
-       // Block the port from being used by anything
-       serial_port* my_port = GetSerialPort();
-       SetSerialPort(NULL);
-
-       // Then close the port.
-       uart_close(my_port);
-       pthread_mutex_unlock(&conn->recv_lock);
-
+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(char* serial_port_name) {
-       serial_port *new_port = uart_open(serial_port_name);
-       if (new_port == INVALID_SERIAL_PORT || new_port == CLAIMED_SERIAL_PORT) {
+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;
        }
-       
-       SetSerialPort(new_port);
+
        return true;
 }
 
@@ -303,10 +295,7 @@ static int get_proxmark_state(uint32_t *state)
        c.cmd = CMD_DEVICE_INFO;
        SendCommand(&c);
        UsbCommand resp;
-       while (!WaitForResponse(CMD_ANY, &resp)) {
-               // Keep waiting for a response
-               msleep(100);
-       }
+       ReceiveCommand(&resp);
 
        // Three outcomes:
        // 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
@@ -333,7 +322,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
+static int enter_bootloader(char *serial_port_name)
 {
        uint32_t state;
 
@@ -364,17 +353,18 @@ static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
                        SendCommand(&c);
                        fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
                }
-               
+
                msleep(100);
-               CloseProxmark(conn, serial_port_name);
+               CloseProxmark(serial_port_name);
 
                fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
                do {
                        sleep(1);
                        fprintf(stderr, ".");
-               } while (!OpenProxmark(serial_port_name));
-               
+               } while (!OpenProxmark(0, serial_port_name));
+
                fprintf(stderr," Found.\n");
+
                return 0;
        }
 
@@ -382,25 +372,23 @@ static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
        return -1;
 }
 
-static int wait_for_ack()
+static int wait_for_ack(void)
 {
-       UsbCommand resp;
-       while (!WaitForResponse(CMD_ANY, &resp)) {
-               msleep(100);
-       }
-       if (resp.cmd != CMD_ACK) {
-               printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", resp.cmd);
+       UsbCommand ack;
+       ReceiveCommand(&ack);
+       if (ack.cmd != CMD_ACK) {
+               printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
                return -1;
        }
        return 0;
 }
 
 // Go into flashing mode
-int flash_start_flashing(receiver_arg* conn, int enable_bl_writes,char *serial_port_name)
+int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
 {
        uint32_t state;
 
-       if (enter_bootloader(conn, serial_port_name) < 0)
+       if (enter_bootloader(serial_port_name) < 0)
                return -1;
 
        if (get_proxmark_state(&state) < 0)
@@ -499,7 +487,7 @@ void flash_free(flash_file_t *ctx)
 }
 
 // just reset the unit
-int flash_stop_flashing() {
+int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
        SendCommand(&c);
        msleep(100);