github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 21:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the bootrom correctly nack in case of flash write error (e.g. due to lock bits)

Browse source
This commit is contained in:
henryk@ploetzli.ch 2010-01-01 14:56:25 +00:00
commit 4ab6281664
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bootrom/bootrom.c
View file

@ -117,8 +117,16 @@ void UsbPacketReceived(BYTE *packet, int len)
MC_FLASH_COMMAND_PAGEN((c->arg[0]-(int)&_flash_start)/AT91C_IFLASH_PAGE_SIZE) | MC_FLASH_COMMAND_PAGEN((c->arg[0]-(int)&_flash_start)/AT91C_IFLASH_PAGE_SIZE) |
AT91C_MC_FCMD_START_PROG; AT91C_MC_FCMD_START_PROG;
} }
while(!(AT91C_BASE_EFC0->EFC_FSR & MC_FLASH_STATUS_READY))
uint32_t sr;
while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & MC_FLASH_STATUS_READY))
; ;
if(sr & (MC_FLASH_STATUS_LOCKE | MC_FLASH_STATUS_PROGE)) {
dont_ack = 1;
c->cmd = CMD_NACK;
UsbSendPacket(packet, len);
}
break; break;
case CMD_HARDWARE_RESET: case CMD_HARDWARE_RESET:

2
include/proxmark3.h
View file

@ -36,6 +36,8 @@
#define MC_FLASH_COMMAND_KEY ((0x5a)<<24) #define MC_FLASH_COMMAND_KEY ((0x5a)<<24)
#define MC_FLASH_STATUS_READY (1<<0) #define MC_FLASH_STATUS_READY (1<<0)
#define MC_FLASH_STATUS_LOCKE (1<<2)
#define MC_FLASH_STATUS_PROGE (1<<3)
#define MC_FLASH_MODE_FLASH_WAIT_STATES(x) ((x)<<8) #define MC_FLASH_MODE_FLASH_WAIT_STATES(x) ((x)<<8)
#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x) ((x)<<16) #define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x) ((x)<<16)
#define MC_FLASH_COMMAND_PAGEN(x) ((x)<<8) #define MC_FLASH_COMMAND_PAGEN(x) ((x)<<8)