Experimeting with finding the "WDT_HIT" bug in "Hf mf mifare", which not shows if...

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 7976d41098178f10db1780bf0685b87be6f78420..576f0d27a340a0e7cb648672a7483e9322d84fa8 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -16,7 +16,8 @@
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"

-#include "../include/usb_cmd.h"
+#include "usb_cmd.h"
+#include "at91sam7s512.h"

 
 void SendCommand(UsbCommand* txcmd);
 void ReceiveCommand(UsbCommand* rxcmd);
 
 void SendCommand(UsbCommand* txcmd);
 void ReceiveCommand(UsbCommand* rxcmd);


@@ -352,12 +353,11 @@ static int enter_bootloader(char *serial_port_name)
        return -1;
 }
 
        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%04"llx" (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;
                return -1;
        }
        return 0;


@@ -389,7 +389,7 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
                        c.arg[2] = 0;
                }
                SendCommand(&c);
                        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");
        } 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");


@@ -404,12 +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);
 
        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);
+       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
 }
 
 // Write a file's segments to Flash


@@ -469,7 +480,7 @@ void flash_free(flash_file_t *ctx)
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};

-       SendCommand(&c);
-       msleep(100);
-       return 0;
+  SendCommand(&c);
+  msleep(100);
+  return 0;

 }
 }