fix WaitForResponse (without timeout)

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 6670d637dca187bff1c7944961dbe20101198620..f3d2f420934a87c0282571502ebbcc63a536e430 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,14 +11,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "sleep.h"
-#include "proxusb.h"
+#include <inttypes.h>
+#include <unistd.h>
+#include "proxmark3.h"
+#include "util.h"
+#include "util_posix.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
-
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
+#include "usb_cmd.h"
+#include "comms.h"
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
@@ -26,7 +28,7 @@ unsigned int current_command = CMD_UNKNOWN;
 #define BOOTLOADER_SIZE        0x2000
 #define BOOTLOADER_END         (FLASH_START + BOOTLOADER_SIZE)
 
-#define BLOCK_SIZE             0x100
+#define BLOCK_SIZE             0x200
 
 static const uint8_t elf_ident[] = {
        0x7f, 'E', 'L', 'F',
@@ -35,9 +37,10 @@ static const uint8_t elf_ident[] = {
        EV_CURRENT
 };
 
+
 // 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;
@@ -182,13 +185,13 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
        return 0;
 }
 
+
 // 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;
-       int num_phdrs;
+       uint16_t num_phdrs;
        int res;
 
        fd = fopen(name, "rb");
@@ -264,15 +267,14 @@ fail:
        return -1;
 }
 
+
 // Get the state of the proxmark, backwards compatible
-static int get_proxmark_state(uint32_t *state)
-{
-       UsbCommand c;
+static int get_proxmark_state(uint32_t *state) {
+       UsbCommand c = {0};
        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
@@ -290,7 +292,7 @@ static int get_proxmark_state(uint32_t *state)
                        *state = resp.arg[0];
                        break;
                default:
-                       fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd);
+                       fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
                        return -1;
                        break;
        }
@@ -298,9 +300,9 @@ static int get_proxmark_state(uint32_t *state)
        return 0;
 }
 
+
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(void)
-{
+static int enter_bootloader(char *serial_port_name) {
        uint32_t state;
 
        if (get_proxmark_state(&state) < 0)
@@ -312,7 +314,7 @@ static int enter_bootloader(void)
        }
 
        if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-               fprintf(stderr,"Entering bootloader...\n");
+               fprintf(stderr, "Entering bootloader...\n");
                UsbCommand c;
                memset(&c, 0, sizeof (c));
 
@@ -330,40 +332,44 @@ static int enter_bootloader(void)
                        SendCommand(&c);
                        fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
                }
-               fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
 
+               msleep(100);
                CloseProxmark();
-               sleep(1);
-               while (!OpenProxmark(0)) {
-                       sleep(1);
-                       fprintf(stderr, ".");
-               }
-               fprintf(stderr," Found.\n");
 
-               return 0;
+               msleep(1000); // wait for OS to detect device disconnect.
+
+               bool opened = OpenProxmark(serial_port_name, true, 120);   // 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");
        return -1;
 }
 
+
 static int wait_for_ack(void)
 {
        UsbCommand ack;
-       ReceiveCommand(&ack);
+       WaitForResponse(CMD_UNKNOWN, &ack);
        if (ack.cmd != CMD_ACK) {
-               printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
+               printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
                return -1;
        }
        return 0;
 }
 
+
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes)
+int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
 {
        uint32_t state;
-
-       if (enter_bootloader() < 0)
+       if (enter_bootloader(serial_port_name) < 0)
                return -1;
 
        if (get_proxmark_state(&state) < 0)
@@ -399,19 +405,10 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 
        memset(block_buf, 0xFF, BLOCK_SIZE);
        memcpy(block_buf, data, length);
-
-       UsbCommand c = {CMD_SETUP_WRITE};
-       for (int i = 0; i < 240; i += 48) {
-               memcpy(c.d.asBytes, block_buf + i, 48);
-               c.arg[0] = i / 4;
-               SendCommand(&c);
-               if (wait_for_ack() < 0)
-                       return -1;
-       }
-
+       UsbCommand c;
        c.cmd = CMD_FINISH_WRITE;
        c.arg[0] = address;
-       memcpy(c.d.asBytes, block_buf+240, 16);
+       memcpy(c.d.asBytes, block_buf, length);
        SendCommand(&c);
        return wait_for_ack();
 }
@@ -474,5 +471,6 @@ void flash_free(flash_file_t *ctx)
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
        SendCommand(&c);
+       msleep(100);
        return 0;
 }