gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TPI mode chip erase code not properly erasing the target memory space.

Browse Source
This commit is contained in:
Dean Camera 2010-02-02 04:33:58 +00:00
parent 8d49480891
commit 5687ac7316
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
View File

@ -188,18 +188,25 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint
} }
/** Erases the target's memory space. /** Erases the target's memory space.
*
* \param[in] Address Address inside the memory space to erase
* *
* \return Boolean true if the command sequence complete successfully * \return Boolean true if the command sequence complete successfully
*/ */
bool TINYNVM_EraseMemory(void) bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint16_t Address)
{ {
/* Wait until the NVM controller is no longer busy */ /* Wait until the NVM controller is no longer busy */
if (!(TINYNVM_WaitWhileNVMControllerBusy())) if (!(TINYNVM_WaitWhileNVMControllerBusy()))
return false; return false;
/* Set the NVM control register to the CHIP ERASE command to erase the target */ /* Set the NVM control register to the target memory erase command */
TINYNVM_SendWriteNVMRegister(XPROG_Param_NVMCMDRegAddr); TINYNVM_SendWriteNVMRegister(XPROG_Param_NVMCMDRegAddr);
XPROGTarget_SendByte(TINY_NVM_CMD_CHIPERASE); XPROGTarget_SendByte(EraseCommand);
/* Write to a location within the target address space to start the erase process */
TINYNVM_SendPointerAddress(Address);
XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT);
XPROGTarget_SendByte(0x00);
/* Wait until the NVM bus is ready again */ /* Wait until the NVM bus is ready again */
if (!(TINYNVM_WaitWhileNVMBusBusy())) if (!(TINYNVM_WaitWhileNVMBusBusy()))

2
Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
View File

@ -65,7 +65,7 @@
bool TINYNVM_WaitWhileNVMBusBusy(void); bool TINYNVM_WaitWhileNVMBusBusy(void);
bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadLength); bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadLength);
bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteLength); bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteLength);
bool TINYNVM_EraseMemory(void); bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint16_t Address);
#if defined(INCLUDE_FROM_TINYNVM_C) #if defined(INCLUDE_FROM_TINYNVM_C)
static void TINYNVM_SendReadNVMRegister(const uint8_t Address); static void TINYNVM_SendReadNVMRegister(const uint8_t Address);

2
Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
View File

@ -322,7 +322,7 @@ bool XMEGANVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address)
{ {
/* Other erase modes just need us to address a byte within the target memory space */ /* Other erase modes just need us to address a byte within the target memory space */
XPROGTarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_4BYTES << 2)); XPROGTarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_4BYTES << 2));
XMEGANVM_SendAddress(Address); XMEGANVM_SendAddress(Address);
XPROGTarget_SendByte(0x00); XPROGTarget_SendByte(0x00);
} }

2
Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
View File

@ -237,7 +237,7 @@ static void XPROGProtocol_Erase(void)
else else
{ {
/* Erase the target memory, indicate timeout if ocurred */ /* Erase the target memory, indicate timeout if ocurred */
if (!(TINYNVM_EraseMemory())) if (!(TINYNVM_EraseMemory(TINY_NVM_CMD_CHIPERASE, Erase_XPROG_Params.Address)))
ReturnStatus = XPRG_ERR_TIMEOUT; ReturnStatus = XPRG_ERR_TIMEOUT;
} }