PCF7931: Print found single/consecutive block(s), fixes to block 1 check

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index bf01b911f116b7d2a89cfd2a792f43dcfdde5af7..9a443cb84fce8df45ee0ec70ca3d6e9b26753b36 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"
@@ -23,9 +22,6 @@
 #include "usb_cmd.h"
 #include "comms.h"
 
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
-
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
 #define FLASH_END              (FLASH_START + FLASH_SIZE)
@@ -41,35 +37,10 @@ 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);
-
-       // 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)
+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;
@@ -215,12 +186,12 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
 }
 
 // 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");
@@ -299,14 +270,11 @@ fail:
 // 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;
-       while (!WaitForResponse(CMD_ANY, &resp)) {
-               // Keep waiting for a response
-               msleep(100);
-       }
+       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
@@ -333,7 +301,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,43 +332,41 @@ 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();
 
-               fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
-               do {
-                       sleep(1);
-                       fprintf(stderr, ".");
-               } while (!OpenProxmark(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");
        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;
+       WaitForResponse(CMD_UNKNOWN, &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)
@@ -436,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);
-  UsbCommand c;
+       UsbCommand c;
        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
@@ -499,7 +465,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);