Merge branch 'master' into master

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index e3714185dbf195ed1881c49a975f1a1a964ec36c..9a443cb84fce8df45ee0ec70ca3d6e9b26753b36 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -20,12 +20,7 @@
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"
 #include "elf.h"
 #include "proxendian.h"
 #include "usb_cmd.h"

-#include "uart.h"
-
-void SendCommand(UsbCommand* txcmd);
-void ReceiveCommand(UsbCommand* rxcmd);
-
-serial_port sp;
+#include "comms.h"

 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)


@@ -42,26 +37,10 @@ static const uint8_t elf_ident[] = {
        EV_CURRENT
 };
 
        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
 
 // 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)
+static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs)

 {
        Elf32_Phdr *phdr = phdrs;
        flash_seg_t *seg;
 {
        Elf32_Phdr *phdr = phdrs;
        flash_seg_t *seg;


@@ -207,12 +186,12 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
 }
 
 // Load an ELF file and prepare it for flashing
 }
 
 // Load an ELF file and prepare it for flashing

-int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
+int flash_load(flash_file_t *ctx, const char *name, bool can_write_bl)

 {
        FILE *fd = NULL;
        Elf32_Ehdr ehdr;
        Elf32_Phdr *phdrs = NULL;
 {
        FILE *fd = NULL;
        Elf32_Ehdr ehdr;
        Elf32_Phdr *phdrs = NULL;

-       int num_phdrs;
+       uint16_t num_phdrs;

        int res;
 
        fd = fopen(name, "rb");
        int res;
 
        fd = fopen(name, "rb");


@@ -291,11 +270,11 @@ fail:
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state)
 {
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state)
 {

-       UsbCommand c;
+       UsbCommand c = {0};

        c.cmd = CMD_DEVICE_INFO;
        SendCommand(&c);
        UsbCommand resp;
        c.cmd = CMD_DEVICE_INFO;
        SendCommand(&c);
        UsbCommand resp;

-       ReceiveCommand(&resp);
+       WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.

 
        // 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


@@ -355,17 +334,16 @@ static int enter_bootloader(char *serial_port_name)
                }
 
                msleep(100);
                }
 
                msleep(100);

-               CloseProxmark(serial_port_name);
+               CloseProxmark();

 
 

-               fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
-               do {
-                       sleep(1);
-                       fprintf(stderr, ".");
-               } while (!OpenProxmark(0, serial_port_name));
-
-               fprintf(stderr," Found.\n");
-
-               return 0;
+               bool opened = OpenProxmark(serial_port_name, true, 120, true);   // wait for 2 minutes
+               if (opened) {
+                       fprintf(stderr," Found.\n");
+                       return 0;
+               } else {
+                       fprintf(stderr,"Error: Proxmark not found.\n");
+                       return -1;
+               }

        }
 
        fprintf(stderr, "Error: Unknown Proxmark mode\n");
        }
 
        fprintf(stderr, "Error: Unknown Proxmark mode\n");


@@ -375,7 +353,7 @@ static int enter_bootloader(char *serial_port_name)
 static int wait_for_ack(void)
 {
        UsbCommand ack;
 static int wait_for_ack(void)
 {
        UsbCommand ack;

-       ReceiveCommand(&ack);
+       WaitForResponse(CMD_UNKNOWN, &ack);

        if (ack.cmd != CMD_ACK) {
                printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
                return -1;
        if (ack.cmd != CMD_ACK) {
                printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
                return -1;


@@ -424,12 +402,12 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 
        memset(block_buf, 0xFF, BLOCK_SIZE);
        memcpy(block_buf, data, length);
 
        memset(block_buf, 0xFF, BLOCK_SIZE);
        memcpy(block_buf, data, length);

-  UsbCommand c;
+       UsbCommand c;

        c.cmd = CMD_FINISH_WRITE;
        c.arg[0] = address;
        memcpy(c.d.asBytes, block_buf, length);
        c.cmd = CMD_FINISH_WRITE;
        c.arg[0] = address;
        memcpy(c.d.asBytes, block_buf, length);

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

 }
 
 // Write a file's segments to Flash
 }
 
 // Write a file's segments to Flash