From 8ea051de637f09f0fd2895f5a18ee9f337b9b1f1 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 15 Dec 2009 00:58:22 +0000
Subject: Add Lock/Fuse byte programming support to the AVRISP PDI programming
 protocol code.

---
 Projects/AVRISP/Lib/PDIProtocol.c | 52 +++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 5 deletions(-)

(limited to 'Projects/AVRISP/Lib/PDIProtocol.c')

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 46d6dd417..36aa3b4c5 100644
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -162,7 +162,7 @@ static void PDIProtocol_Erase(void)
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
-	uint8_t EraseCommand;
+	uint8_t EraseCommand = NVM_CMD_NOOP;
 	
 	if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)
 	  EraseCommand = NVM_CMD_CHIPERASE;
@@ -198,9 +198,10 @@ static void PDIProtocol_WriteMemory(void)
 	struct
 	{
 		uint8_t  MemoryType;
+		uint8_t  PageMode;
 		uint32_t Address;
 		uint16_t Length;
-		uint8_t  ProgData[256];
+		uint8_t  ProgData[512];
 	} WriteMemory_XPROG_Params;
 	
 	Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params, (sizeof(WriteMemory_XPROG_Params) -
@@ -211,11 +212,52 @@ static void PDIProtocol_WriteMemory(void)
 
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+
+
+	uint8_t WriteCommand     = NVM_CMD_NOOP;
+	uint8_t WritePageCommand = NVM_CMD_NOOP;
+	bool    PagedMemory      = false;
+	
+	if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)
+	{
+		PagedMemory = true;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)
+	{
+		PagedMemory = true;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)
+	{
+		PagedMemory = true;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)
+	{
+		PagedMemory = true;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)
+	{
+		WriteCommand = NVM_CMD_WRITEFUSE;
+	}
+	else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)
+	{
+		WriteCommand = NVM_CMD_WRITELOCK;
+	}
 	
-	// TODO: Send program command here via PDI protocol
+	if (PagedMemory)
+	{
+
+	}
+	else
+	{
+		if (!(NVMTarget_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData,
+										WriteMemory_XPROG_Params.Length)))
+		{
+			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();
 }
@@ -272,8 +314,8 @@ static void PDIProtocol_ReadCRC(void)
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
+	uint8_t  CRCCommand = NVM_CMD_NOOP;
 	uint32_t MemoryCRC;
-	uint8_t  CRCCommand;
 
 	if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)
 	  CRCCommand = NVM_CMD_APPCRC;
-- 
cgit v1.2.3