Split out NVM access code in the AVRISP project into a seperate NVMTarget.c source file and header. Make NVM register accesses use the NVM base address as set by the host, rather than using the fixed value from the XMEGA datasheet.

1 files changed, 2 insertions, 38 deletions

diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c
index 7fa48e6aa..e1b77f046 100644
--- a/Projects/AVRISP/Lib/PDITarget.c
+++ b/Projects/AVRISP/Lib/PDITarget.c
@@ -28,8 +28,6 @@
   this software.

 */

 

-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)

-

 /** \file

  *

  *  Target-related functions for the PDI Protocol decoder.

@@ -38,6 +36,8 @@
 #define  INCLUDE_FROM_PDITARGET_C

 #include "PDITarget.h"

 

+#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)

+

 volatile bool     IsSending;

 

 #if !defined(PDI_VIA_HARDWARE_USART)

@@ -275,40 +275,4 @@ void PDITarget_SendBreak(void)
 #endif

 }

 

-void PDITarget_SendAddress(uint32_t Address)

-{

-	PDITarget_SendByte(Address >> 24);

-	PDITarget_SendByte(Address >> 26);

-	PDITarget_SendByte(Address >> 8);

-	PDITarget_SendByte(Address &  0xFF);

-}

-

-bool PDITarget_WaitWhileNVMBusBusy(void)

-{

-	uint8_t AttemptsRemaining = 255;

-

-	/* Poll the STATUS register to check to see if NVM access has been enabled */

-	while (AttemptsRemaining--)

-	{

-		PDITarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG);

-		if (PDITarget_ReceiveByte() & PDI_STATUS_NVM)

-		  return true;

-	}

-	

-	return false;

-}

-

-void PDITarget_WaitWhileNVMControllerBusy(void)

-{

-	/* Poll the NVM STATUS register to check to see if NVM controller is busy */

-	for (;;)

-	{

-		PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_1BYTE << 2));

-		PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_STATUS);

-		

-		if (!(PDITarget_ReceiveByte() & (1 << 7)))

-		  return;

-	}

-}

-

 #endif