X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/74b6993d66d70c323beb4d7eccf5b8f45bf6d31f..331e8dece66e632ef3f91b052674948fd74e62a1:/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index c650f0dd8..e7513032f 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -51,18 +51,18 @@ static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress)
 
 /** Sends a SIN command to the target with the specified I/O address, ready for the data byte to be written.
  *
- *  \param Address  6-bit I/O address to write to in the target's I/O memory space
+ *  \param[in] Address  6-bit I/O address to write to in the target's I/O memory space
  */
 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 */
 	XPROGTarget_SendByte(TPI_CMD_SIN | ((Address & 0x30) << 1) | (Address & 0x0F));
 }
 
 /** Sends a SOUT command to the target with the specified I/O address, ready for the data byte to be read.
  *
- *  \param Address  6-bit I/O address to read from in the target's I/O memory space
+ *  \param[in] Address  6-bit I/O address to read from in the target's I/O memory space
  */
 static void TINYNVM_SendWriteNVMRegister(uint8_t Address)
 {
@@ -99,9 +99,11 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
 	/* Poll the STATUS register to check to see if NVM access has been enabled */
 	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);
-		if (XPROGTarget_ReceiveByte() & (1 << 7))
+
+		/* Check to see if the BUSY flag is still set */
+		if (!(XPROGTarget_ReceiveByte() & (1 << 7)))
 		  return true;
 	}
 	
@@ -116,7 +118,7 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
  *
  *  \return Boolean true if the command sequence complete successfully
  */
-bool TINYNVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadSize)
+bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadSize)
 {
 	/* Wait until the NVM controller is no longer busy */
 	if (!(TINYNVM_WaitWhileNVMControllerBusy()))
@@ -147,7 +149,7 @@ bool TINYNVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_
  *
  *  \return Boolean true if the command sequence complete successfully
  */
-bool TINYNVM_WriteMemory(const uint32_t WriteAddress, const uint8_t* WriteBuffer, uint16_t WriteLength)
+bool TINYNVM_WriteMemory(const uint16_t WriteAddress, const uint8_t* WriteBuffer, uint16_t WriteLength)
 {
 	/* Wait until the NVM controller is no longer busy */
 	if (!(TINYNVM_WaitWhileNVMControllerBusy()))