X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a501c82b196b614295a6e3bf7481da84affb0d8e..516dbac2105d8195ba52f46f4d5d75d598868f45:/client/flash.c

diff --git a/client/flash.c b/client/flash.c
index 7976d410..b0ae46b3 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -16,7 +16,8 @@
 #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);
@@ -27,7 +28,13 @@ int OpenProxmark(size_t i);
 unsigned int current_command = CMD_UNKNOWN;
 
 #define FLASH_START            0x100000
-#define FLASH_SIZE             (256*1024)
+
+#ifdef HAS_512_FLASH
+# define FLASH_SIZE             (512*1024)
+#else
+# define FLASH_SIZE             (256*1024)
+#endif
+
 #define FLASH_END              (FLASH_START + FLASH_SIZE)
 #define BOOTLOADER_SIZE        0x2000
 #define BOOTLOADER_END         (FLASH_START + BOOTLOADER_SIZE)
@@ -352,12 +359,11 @@ static int enter_bootloader(char *serial_port_name)
 	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;
@@ -389,7 +395,7 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
 			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");
@@ -404,12 +410,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;
+  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);
+	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
@@ -469,7 +486,7 @@ void flash_free(flash_file_t *ctx)
 // 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;
 }