CHG: textual fixes in help text

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 6670d637dca187bff1c7944961dbe20101198620..576f0d27a340a0e7cb648672a7483e9322d84fa8 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,11 +11,18 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "proxmark3.h"
 #include "sleep.h"
-#include "proxusb.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
+#include "usb_cmd.h"
+#include "at91sam7s512.h"
+
+void SendCommand(UsbCommand* txcmd);
+void ReceiveCommand(UsbCommand* rxcmd);
+void CloseProxmark();
+int OpenProxmark(size_t i);
 
 // FIXME: what the fuckity fuck
 unsigned int current_command = CMD_UNKNOWN;
@@ -26,7 +33,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',
@@ -270,7 +277,6 @@ static int get_proxmark_state(uint32_t *state)
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
        SendCommand(&c);
-
        UsbCommand resp;
        ReceiveCommand(&resp);
 
@@ -290,7 +296,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"llx"\n", resp.cmd);
                        return -1;
                        break;
        }
@@ -299,7 +305,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;
 
@@ -330,14 +336,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;
@@ -347,23 +353,22 @@ static int enter_bootloader(void)
        return -1;
 }
 
-static int wait_for_ack(void)
+static int wait_for_ack(UsbCommand *ack)
 {
-       UsbCommand ack;
-       ReceiveCommand(&ack);
-       if (ack.cmd != CMD_ACK) {
-               printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
+       ReceiveCommand(ack);
+       if (ack->cmd != CMD_ACK) {
+               printf("Error: Unexpected reply 0x%04"llx" (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)
@@ -384,7 +389,7 @@ int flash_start_flashing(int enable_bl_writes)
                        c.arg[2] = 0;
                }
                SendCommand(&c);
-               return wait_for_ack();
+               return wait_for_ack(&c);
        } else {
                fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
                fprintf(stderr, "      It is recommended that you update your bootloader\n\n");
@@ -399,21 +404,23 @@ 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);
-       SendCommand(&c);
-       return wait_for_ack();
+       memcpy(c.d.asBytes, block_buf, length);
+  SendCommand(&c);
+       int ret = wait_for_ack(&c);
+       if (ret && c.arg[0]) {
+               uint32_t lock_bits = c.arg[0] >> 16;
+               bool lock_error = c.arg[0] & AT91C_MC_LOCKE;
+               bool prog_error = c.arg[0] & AT91C_MC_PROGE;
+               bool security_bit = c.arg[0] & AT91C_MC_SECURITY;
+               printf("%s", lock_error?"       Lock Error\n":"");
+               printf("%s", prog_error?"       Invalid Command or bad Keyword\n":"");
+               printf("%s", security_bit?"       Security Bit is set!\n":"");
+               printf("       Lock Bits:      0x%04x\n", lock_bits);
+       }
+       return ret;
 }
 
 // Write a file's segments to Flash
@@ -473,6 +480,7 @@ void flash_free(flash_file_t *ctx)
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
-       SendCommand(&c);
-       return 0;
+  SendCommand(&c);
+  msleep(100);
+  return 0;
 }