Remove built file

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 4af0dea82cc5b66a562c1492198c9076f3e57f4e..0b940e99df6bbf687f1cd3d9acf693a3ccc376a5 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,9 +11,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.h>
+#include <unistd.h>
 #include "proxmark3.h"
-#include "sleep.h"
-//#include "proxusb.h"
+#include "util.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
@@ -276,7 +277,6 @@ static int get_proxmark_state(uint32_t *state)
 {
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
-//     SendCommand_(&c);
   SendCommand(&c);
        UsbCommand resp;
        ReceiveCommand(&resp);
@@ -297,7 +297,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%04"llx"\n", resp.cmd);
+                       fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
                        return -1;
                        break;
        }
@@ -306,7 +306,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // 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;
 
@@ -337,14 +337,14 @@ 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)) {
+
+               fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
+    do {
                        sleep(1);
                        fprintf(stderr, ".");
-               }
+               } while (!OpenProxmark(0));
                fprintf(stderr," Found.\n");
 
                return 0;
@@ -359,18 +359,18 @@ static int wait_for_ack(void)
   UsbCommand ack;
        ReceiveCommand(&ack);
        if (ack.cmd != CMD_ACK) {
-               printf("Error: Unexpected reply 0x%04"llx" (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)
@@ -391,7 +391,6 @@ int flash_start_flashing(int enable_bl_writes)
                        c.arg[2] = 0;
                }
                SendCommand(&c);
-//             SendCommand_(&c);
                return wait_for_ack();
        } else {
                fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
@@ -408,22 +407,8 @@ 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;
-/*
-       c.cmd = {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);
-//             SendCommand_(&c);
-               if (wait_for_ack() < 0) {
-                       return -1;
-    }
-       }
-*/
        c.cmd = CMD_FINISH_WRITE;
        c.arg[0] = address;
-//     memcpy(c.d.asBytes, block_buf+240, 16);
-//     SendCommand_(&c);
        memcpy(c.d.asBytes, block_buf, length);
   SendCommand(&c);
   return wait_for_ack();
@@ -486,7 +471,7 @@ void flash_free(flash_file_t *ctx)
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
-//     SendCommand_(&c);
   SendCommand(&c);
+  msleep(100);
   return 0;
 }