X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3705330dd32f54cf15842511b7657d2f321c11ad..4f74075fad7f1e7a35d04ff534d9d6a57d2b97fc:/Projects/AVRISP/Lib/PDIProtocol.c

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index ecd2fe9c3..1b3fc53c4 100644
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -28,10 +28,6 @@
   this software.
 */
 
-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)
-
-#warning PDI Programming Protocol support is incomplete and not currently suitable for use.
-
 /** \file
  *
  *  PDI Protocol handler, to process V2 Protocol wrapped PDI commands used in Atmel programmer devices.
@@ -40,7 +36,11 @@
 #define  INCLUDE_FROM_PDIPROTOCOL_C
 #include "PDIProtocol.h"
 
+#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)
+/** Base absolute address for the target's NVM controller */
 uint32_t XPROG_Param_NVMBase;
+
+/** Size in bytes of the target's EEPROM page */
 uint32_t XPROG_Param_EEPageSize;
 
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI
@@ -59,7 +59,7 @@ void PDIProtocol_XPROG_SetMode(void)
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
 	Endpoint_Write_Byte(CMD_XPROG_SETMODE);
-	Endpoint_Write_Byte(SetMode_XPROG_Params.Protocol ? STATUS_CMD_FAILED : STATUS_CMD_OK);
+	Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol == XPRG_PROTOCOL_PDI) ? STATUS_CMD_OK : STATUS_CMD_FAILED);
 	Endpoint_ClearIN();	
 }
 
@@ -131,7 +131,7 @@ static void PDIProtocol_LeaveXPROGMode(void)
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
-	/* Clear the RESET key into the RESET PDI register to allow the XMEGA to run */
+	/* Clear the RESET key in the RESET PDI register to allow the XMEGA to run */
 	PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);	
 	PDITarget_SendByte(0x00);
 
@@ -155,11 +155,34 @@ static void PDIProtocol_Erase(void)
 	} Erase_XPROG_Params;
 
 	Endpoint_Read_Stream_LE(&Erase_XPROG_Params, sizeof(Erase_XPROG_Params));
+	Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);
 
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
-	// TODO: Send erase command here via PDI protocol
+	uint8_t EraseCommand = NVM_CMD_NOOP;
+	
+	/* Determine which NVM command to send to the device depending on the memory to erase */
+	if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)
+	  EraseCommand = NVM_CMD_CHIPERASE;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)
+	  EraseCommand = NVM_CMD_ERASEAPPSEC;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)
+	  EraseCommand = NVM_CMD_ERASEBOOTSEC;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)
+	  EraseCommand = NVM_CMD_ERASEEEPROM;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)
+	  EraseCommand = NVM_CMD_ERASEAPPSECPAGE;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)
+	  EraseCommand = NVM_CMD_ERASEBOOTSECPAGE;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)
+	  EraseCommand = NVM_CMD_ERASEEEPROMPAGE;
+	else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)
+	  EraseCommand = NVM_CMD_ERASEUSERSIG;
+	
+	/* Erase the target memory, indicate timeout if ocurred */
+	if (!(NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))
+	  ReturnStatus = XPRG_ERR_TIMEOUT;
 	
 	Endpoint_Write_Byte(CMD_XPROG);
 	Endpoint_Write_Byte(XPRG_CMD_ERASE);
@@ -175,6 +198,7 @@ static void PDIProtocol_WriteMemory(void)
 	struct
 	{
 		uint8_t  MemoryType;
+		uint8_t  PageMode;
 		uint32_t Address;
 		uint16_t Length;
 		uint8_t  ProgData[256];
@@ -188,11 +212,56 @@ static void PDIProtocol_WriteMemory(void)
 
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+
+	/* Assume FLASH page programming by default, as it is the common case */
+	uint8_t WriteCommand     = NVM_CMD_WRITEFLASHPAGE;
+	uint8_t WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF;
+	uint8_t EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF;
+	bool    PagedMemory      = true;
 	
-	// TODO: Send program command here via PDI protocol
+	if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)
+	{
+		WriteCommand     = NVM_CMD_WRITEAPPSECPAGE;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)
+	{
+		WriteCommand     = NVM_CMD_WRITEBOOTSECPAGE;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)
+	{
+		WriteCommand     = NVM_CMD_WRITEEEPROMPAGE;
+		WriteBuffCommand = NVM_CMD_LOADEEPROMPAGEBUFF;
+		EraseBuffCommand = NVM_CMD_ERASEEEPROMPAGEBUFF;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)
+	{
+		/* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */
+		WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);
+		WriteCommand     = NVM_CMD_WRITEUSERSIG;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)
+	{
+		WriteCommand     = NVM_CMD_WRITEFUSE;
+		PagedMemory      = false;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)
+	{
+		WriteCommand     = NVM_CMD_WRITELOCK;
+		PagedMemory      = false;
+	}
+	
+	/* Send the appropriate memory write commands to the device, indicate timeout if occurred */
+	if ((PagedMemory && !NVMTarget_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, 
+		                                           WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,
+		                                           WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) ||
+	   (!PagedMemory && !NVMTarget_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,
+	                                               WriteMemory_XPROG_Params.ProgData)))
+	{
+		ReturnStatus = XPRG_ERR_TIMEOUT;
+	}
 	
 	Endpoint_Write_Byte(CMD_XPROG);
-	Endpoint_Write_Byte(XPRG_CMD_READ_MEM);
+	Endpoint_Write_Byte(XPRG_CMD_WRITE_MEM);
 	Endpoint_Write_Byte(ReturnStatus);	
 	Endpoint_ClearIN();
 }
@@ -217,20 +286,20 @@ static void PDIProtocol_ReadMemory(void)
 
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
-	
-	if (ReadMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)
-	{
-		PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
-		PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);
-		PDITarget_SendByte(NVM_CMD_READUSERSIG);
 
-		
-	}
+	uint8_t ReadBuffer[256];
 	
+	/* Read the target's memory, indicate timeout if occurred */
+	if (!(NVMTarget_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))
+	  ReturnStatus = XPRG_ERR_TIMEOUT;
+
 	Endpoint_Write_Byte(CMD_XPROG);
 	Endpoint_Write_Byte(XPRG_CMD_READ_MEM);
 	Endpoint_Write_Byte(ReturnStatus);
 	
+	if (ReturnStatus == XPRG_ERR_OK)
+	  Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length);
+	
 	Endpoint_ClearIN();
 }
 
@@ -250,36 +319,20 @@ static void PDIProtocol_ReadCRC(void)
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
-	uint32_t MemoryCRC = 0;
-	uint8_t  CRCReadCommand;
+	uint8_t  CRCCommand = NVM_CMD_NOOP;
+	uint32_t MemoryCRC;
 
+	/* Determine which NVM command to send to the device depending on the memory to CRC */
 	if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)
-	  CRCReadCommand = NVM_CMD_APPCRC;
+	  CRCCommand = NVM_CMD_APPCRC;
 	else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)
-	  CRCReadCommand = NVM_CMD_BOOTCRC;
+	  CRCCommand = NVM_CMD_BOOTCRC;
 	else
-	  CRCReadCommand = NVM_CMD_FLASHCRC;
-	
-	/* Set the NVM command to the correct CRC read command */
-	PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
-	PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);
-	PDITarget_SendByte(CRCReadCommand);
-
-	/* Set CMDEX bit in NVM CTRLA register to start the CRC generation */
-	PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
-	PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CTRLA);
-	PDITarget_SendByte(1 << 0);
-
-	/* Wait until the NVM bus and controller is no longer busy */
-	PDITarget_WaitWhileNVMBusBusy();
-	PDITarget_WaitWhileNVMControllerBusy();
+	  CRCCommand = NVM_CMD_FLASHCRC;
 	
-	/* Read the three byte generated CRC value */
-	PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_3BYTES << 2));
-	PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_DAT0);
-	MemoryCRC  = PDITarget_ReceiveByte();
-	MemoryCRC |= ((uint16_t)PDITarget_ReceiveByte() << 8);
-	MemoryCRC |= ((uint32_t)PDITarget_ReceiveByte() << 16);
+	/* Perform and retrieve the memory CRC, indicate timeout if occurred */
+	if (!(NVMTarget_GetMemoryCRC(CRCCommand, &MemoryCRC)))
+	  ReturnStatus = XPRG_ERR_TIMEOUT;
 	
 	Endpoint_Write_Byte(CMD_XPROG);
 	Endpoint_Write_Byte(XPRG_CMD_CRC);
@@ -303,10 +356,11 @@ static void PDIProtocol_SetParam(void)
 
 	uint8_t XPROGParam = Endpoint_Read_Byte();
 	
+	/* Determine which parameter is being set, store the new parameter value */
 	if (XPROGParam == XPRG_PARAM_NVMBASE)
-	  XPROG_Param_NVMBase = Endpoint_Read_DWord_LE();
+	  XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();
 	else if (XPROGParam == XPRG_PARAM_EEPPAGESIZE)
-	  XPROG_Param_EEPageSize = Endpoint_Read_Word_LE();
+	  XPROG_Param_EEPageSize = Endpoint_Read_Word_BE();
 	else
 	  ReturnStatus = XPRG_ERR_FAILED;