Oops - TPI programming is broken in the AVRISP project because the busy-flag check...

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index 0e6833a..e751303 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -55,7 +55,7 @@ static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress)
  */\r
 static void TINYNVM_SendReadNVMRegister(uint8_t Address)\r
 {\r
  */\r
 static void TINYNVM_SendReadNVMRegister(uint8_t Address)\r
 {\r

-       /* The TPI command for reading from the I/O space uses wierd addressing, where the I/O address's upper\r
+       /* The TPI command for reading from the I/O space uses strange addressing, where the I/O address's upper\r

         * two bits of the 6-bit address are shifted left once */\r
        XPROGTarget_SendByte(TPI_CMD_SIN | ((Address & 0x30) << 1) | (Address & 0x0F));\r
 }\r
         * two bits of the 6-bit address are shifted left once */\r
        XPROGTarget_SendByte(TPI_CMD_SIN | ((Address & 0x30) << 1) | (Address & 0x0F));\r
 }\r


@@ -99,9 +99,11 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
        /* Poll the STATUS register to check to see if NVM access has been enabled */\r
        while (TimeoutMSRemaining)\r
        {\r
        /* Poll the STATUS register to check to see if NVM access has been enabled */\r
        while (TimeoutMSRemaining)\r
        {\r

-               /* Send the SIN command to read the TPI STATUS register to see the NVM bus is active */\r
+               /* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */\r

                TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr);\r
                TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr);\r

-               if (XPROGTarget_ReceiveByte() & (1 << 7))\r
+\r
+               /* Check to see if the BUSY flag is still set */\r
+               if (!(XPROGTarget_ReceiveByte() & (1 << 7)))\r

                  return true;\r
        }\r
        \r
                  return true;\r
        }\r
        \r