eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Oops - TPI programming is broken in the AVRISP project because the busy-flag check wasn't inverting the result.

This commit is contained in:
Dean Camera 2010-01-29 06:02:02 +00:00
parent 872f61ff53
commit a114878209
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress)
*/ */
static void TINYNVM_SendReadNVMRegister(uint8_t Address) static void TINYNVM_SendReadNVMRegister(uint8_t Address)
{ {
/* The TPI command for reading from the I/O space uses wierd addressing, where the I/O address's upper /* The TPI command for reading from the I/O space uses strange addressing, where the I/O address's upper
* two bits of the 6-bit address are shifted left once */ * two bits of the 6-bit address are shifted left once */
XPROGTarget_SendByte(TPI_CMD_SIN | ((Address & 0x30) << 1) | (Address & 0x0F)); XPROGTarget_SendByte(TPI_CMD_SIN | ((Address & 0x30) << 1) | (Address & 0x0F));
} }
@ -99,9 +99,11 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
/* Poll the STATUS register to check to see if NVM access has been enabled */ /* Poll the STATUS register to check to see if NVM access has been enabled */
while (TimeoutMSRemaining) while (TimeoutMSRemaining)
{ {
/* Send the SIN command to read the TPI STATUS register to see the NVM bus is active */ /* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */
TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr); TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr);
if (XPROGTarget_ReceiveByte() & (1 << 7))
/* Check to see if the BUSY flag is still set */
if (!(XPROGTarget_ReceiveByte() & (1 << 7)))
return true; return true;
} }