Comms refactor (prerequisite of libproxmark work) (#371)

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 0b940e99df6bbf687f1cd3d9acf693a3ccc376a5..bf01b911f116b7d2a89cfd2a792f43dcfdde5af7 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -13,17 +13,15 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <unistd.h>

+

 #include "proxmark3.h"
 #include "util.h"
 #include "proxmark3.h"
 #include "util.h"

+#include "util_posix.h"

 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"

-
-void SendCommand(UsbCommand* txcmd);
-void ReceiveCommand(UsbCommand* rxcmd);
-void CloseProxmark();
-int OpenProxmark(size_t i);
+#include "comms.h"

 
 // FIXME: what the fuckity fuck
 unsigned int current_command = CMD_UNKNOWN;
 
 // FIXME: what the fuckity fuck
 unsigned int current_command = CMD_UNKNOWN;


@@ -43,6 +41,32 @@ static const uint8_t elf_ident[] = {
        EV_CURRENT
 };
 
        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);
+
+       // 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) {
+               //poll once a second
+               return false;
+       }
+       
+       SetSerialPort(new_port);
+       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)
 // 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)


@@ -277,9 +301,12 @@ static int get_proxmark_state(uint32_t *state)
 {
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
 {
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;

-  SendCommand(&c);
+       SendCommand(&c);

        UsbCommand resp;
        UsbCommand resp;

-       ReceiveCommand(&resp);
+       while (!WaitForResponse(CMD_ANY, &resp)) {
+               // Keep waiting for a response
+               msleep(100);
+       }

 
        // Three outcomes:
        // 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
 
        // Three outcomes:
        // 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK


@@ -306,7 +333,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
 }
 
 // Enter the bootloader to be able to start flashing

-static int enter_bootloader(char *serial_port_name)
+static int enter_bootloader(receiver_arg* conn, char *serial_port_name)

 {
        uint32_t state;
 
 {
        uint32_t state;
 


@@ -337,16 +364,17 @@ static int enter_bootloader(char *serial_port_name)
                        SendCommand(&c);
                        fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
                }
                        SendCommand(&c);
                        fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
                }

-    msleep(100);
-               CloseProxmark();
+               
+               msleep(100);
+               CloseProxmark(conn, serial_port_name);

 
                fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
 
                fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);

-    do {
+               do {

                        sleep(1);
                        fprintf(stderr, ".");
                        sleep(1);
                        fprintf(stderr, ".");

-               } while (!OpenProxmark(0));
+               } while (!OpenProxmark(serial_port_name));
+               

                fprintf(stderr," Found.\n");
                fprintf(stderr," Found.\n");

-

                return 0;
        }
 
                return 0;
        }
 


@@ -354,23 +382,25 @@ static int enter_bootloader(char *serial_port_name)
        return -1;
 }
 
        return -1;
 }
 

-static int wait_for_ack(void)
+static int wait_for_ack()

 {
 {

-  UsbCommand ack;
-       ReceiveCommand(&ack);
-       if (ack.cmd != CMD_ACK) {
-               printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
+       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);

                return -1;
        }
        return 0;
 }
 
 // Go into flashing mode
                return -1;
        }
        return 0;
 }
 
 // Go into flashing mode

-int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
+int flash_start_flashing(receiver_arg* conn, int enable_bl_writes,char *serial_port_name)

 {
        uint32_t state;
 
 {
        uint32_t state;
 

-       if (enter_bootloader(serial_port_name) < 0)
+       if (enter_bootloader(conn, serial_port_name) < 0)

                return -1;
 
        if (get_proxmark_state(&state) < 0)
                return -1;
 
        if (get_proxmark_state(&state) < 0)


@@ -469,9 +499,9 @@ void flash_free(flash_file_t *ctx)
 }
 
 // just reset the unit
 }
 
 // just reset the unit

-int flash_stop_flashing(void) {
+int flash_stop_flashing() {

        UsbCommand c = {CMD_HARDWARE_RESET};
        UsbCommand c = {CMD_HARDWARE_RESET};

-  SendCommand(&c);
-  msleep(100);
-  return 0;
+       SendCommand(&c);
+       msleep(100);
+       return 0;

 }
 }