X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e12b82d362238b49d3b4b88ff7d7a1d7e618bac8..17556415a96c983ce0894adc9af64a026878195c:/client/flash.c
diff --git a/client/flash.c b/client/flash.c
index 9f547915..37ee8fb0 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -13,11 +13,11 @@
#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);
@@ -28,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)
@@ -276,8 +282,7 @@ static int get_proxmark_state(uint32_t *state)
{
UsbCommand c;
c.cmd = CMD_DEVICE_INFO;
-// SendCommand_(&c);
- SendCommand(&c);
+ SendCommand(&c);
UsbCommand resp;
ReceiveCommand(&resp);
@@ -297,7 +302,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;
}
@@ -313,10 +318,9 @@ static int enter_bootloader(char *serial_port_name)
if (get_proxmark_state(&state) < 0)
return -1;
- if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
- /* Already in flash state, we're done. */
+ /* Already in flash state, we're done. */
+ if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM)
return 0;
- }
if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
fprintf(stderr,"Entering bootloader...\n");
@@ -324,8 +328,7 @@ static int enter_bootloader(char *serial_port_name)
memset(&c, 0, sizeof (c));
if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
- && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT))
- {
+ && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
// New style handover: Send CMD_START_FLASH, which will reset the board
// and enter the bootrom on the next boot.
c.cmd = CMD_START_FLASH;
@@ -337,17 +340,15 @@ static int enter_bootloader(char *serial_port_name)
SendCommand(&c);
fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
}
- msleep(100);
+ msleep(100);
CloseProxmark();
- fprintf(stderr,"Waiting for Proxmark to reappear on ");
- fprintf(stderr,serial_port_name);
- do {
+ 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;
}
@@ -355,12 +356,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" PRIx64 " %s (expected ACK)\n", ack->cmd, (ack->cmd==CMD_NACK)?"NACK":"");
return -1;
}
return 0;
@@ -392,8 +392,7 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
c.arg[2] = 0;
}
SendCommand(&c);
-// 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");
@@ -405,29 +404,23 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
static int write_block(uint32_t address, uint8_t *data, uint32_t length)
{
uint8_t block_buf[BLOCK_SIZE];
-
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);
+ UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}};
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
@@ -487,8 +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);
- SendCommand(&c);
- msleep(100);
- return 0;
+ SendCommand(&c);
+ msleep(100);
+ return 0;
}