X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8fe1a992c771bd7aef1b9a7151fee0645ab59172..5ebba500dcfb84f30666f9654c4bcb7e65a4ea32:/client/flash.c diff --git a/client/flash.c b/client/flash.c index 0756b2fa..c26dd307 100644 --- a/client/flash.c +++ b/client/flash.c @@ -11,25 +11,35 @@ #include #include #include +#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" -//static uint32_t ExpectedAddr; -//static uint8_t QueuedToSend[256]; +void SendCommand(UsbCommand* txcmd); +void ReceiveCommand(UsbCommand* rxcmd); +void CloseProxmark(); +int OpenProxmark(size_t i); -// TODO: what the fuckity fuck +// FIXME: what the fuckity fuck 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) -#define BLOCK_SIZE 0x100 +#define BLOCK_SIZE 0x200 static const uint8_t elf_ident[] = { 0x7f, 'E', 'L', 'F', @@ -253,6 +263,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) if (res < 0) goto fail; + free(phdrs); fclose(fd); ctx->filename = name; return 0; @@ -272,7 +283,6 @@ static int get_proxmark_state(uint32_t *state) UsbCommand c; c.cmd = CMD_DEVICE_INFO; SendCommand(&c); - UsbCommand resp; ReceiveCommand(&resp); @@ -292,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%04x\n", resp.cmd); + fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04"llx"\n", resp.cmd); return -1; break; } @@ -301,17 +311,16 @@ 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; 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"); @@ -319,8 +328,7 @@ static int enter_bootloader(void) 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; @@ -332,16 +340,15 @@ 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; } @@ -349,23 +356,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" %s (expected ACK)\n", ack->cmd, (ack->cmd==CMD_NACK)?"NACK":""); 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) @@ -386,7 +392,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"); @@ -398,24 +404,23 @@ int flash_start_flashing(int enable_bl_writes) 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 = {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; - } - - c.cmd = CMD_FINISH_WRITE; - c.arg[0] = address; - memcpy(c.d.asBytes, block_buf+240, 16); + UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}}; + memcpy(c.d.asBytes, block_buf, length); SendCommand(&c); - return wait_for_ack(); + 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 @@ -476,5 +481,6 @@ void flash_free(flash_file_t *ctx) int flash_stop_flashing(void) { UsbCommand c = {CMD_HARDWARE_RESET}; SendCommand(&c); + msleep(100); return 0; }