X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cec699ac591a679010e07431dfb17823a79856df..53eca61d02f296262011b802e80f145329ace34b:/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 9dac31ca2..c7e64a5eb 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -53,9 +53,9 @@ static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress)
  *
  *  \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)
+static void TINYNVM_SendReadNVMRegister(const 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));
 }
@@ -64,7 +64,7 @@ static void TINYNVM_SendReadNVMRegister(uint8_t Address)
  *
  *  \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)
+static void TINYNVM_SendWriteNVMRegister(const uint8_t Address)
 {
 	/* The TPI command for writing to the I/O space uses wierd addressing, where the I/O address's upper
 	 * two bits of the 6-bit address are shifted left once */
@@ -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()))
@@ -139,19 +141,23 @@ bool TINYNVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_
 	return true;
 }
 
-/** Writes byte addressed memory to the target's memory spaces.
+/** Writes word addressed memory to the target's memory spaces.
  *
- *  \param[in]  WriteAddress  Start address to write to within the target's address space
- *  \param[in]  WriteBuffer   Buffer to source data from
- *  \param[in]  WriteLength   Total number of bytes to write to the device
+ *  \param[in] WriteAddress  Start address to write to within the target's address space
+ *  \param[in] WriteBuffer   Buffer to source data from
+ *  \param[in] WriteLength   Total number of bytes to write to the device (must be an integer multiple of 2)
  *
  *  \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, uint8_t* WriteBuffer, uint16_t WriteLength)
 {
 	/* Wait until the NVM controller is no longer busy */
 	if (!(TINYNVM_WaitWhileNVMControllerBusy()))
 	  return false;
+	  
+	/* Must have an integer number of words to write - if extra byte, word-align via a dummy high byte */
+	if (WriteLength & 0x01)
+	  WriteBuffer[WriteLength++] = 0xFF;
 
 	/* Set the NVM control register to the WORD WRITE command for memory reading */
 	TINYNVM_SendWriteNVMRegister(XPROG_Param_NVMCMDRegAddr);
@@ -160,11 +166,22 @@ bool TINYNVM_WriteMemory(const uint32_t WriteAddress, const uint8_t* WriteBuffer
 	/* Send the address of the location to write to */
 	TINYNVM_SendPointerAddress(WriteAddress);
 	
-	while (WriteLength--)
+	while (WriteLength)
 	{
-		/* Write the byte of data to the target */
+		/* Wait until the NVM controller is no longer busy */
+		if (!(TINYNVM_WaitWhileNVMControllerBusy()))
+		  return false;
+
+		/* Write the low byte of data to the target */
+		XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
+		XPROGTarget_SendByte(*(WriteBuffer++));
+		
+		/* Write the high byte of data to the target */
 		XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
 		XPROGTarget_SendByte(*(WriteBuffer++));
+
+		/* Need to decrement the write length twice, since we read out a whole word */
+		WriteLength -= 2;
 	}
 	
 	return true;
@@ -172,17 +189,25 @@ bool TINYNVM_WriteMemory(const uint32_t WriteAddress, const uint8_t* WriteBuffer
 
 /** Erases the target's memory space.
  *
+ *  \param[in] EraseCommand  NVM erase command to send to the device
+ *  \param[in] Address       Address inside the memory space to erase
+ *
  *  \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 */
 	if (!(TINYNVM_WaitWhileNVMControllerBusy()))
 	  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);
-	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 */
 	if (!(TINYNVM_WaitWhileNVMBusBusy()))