Added memory erase handling to the PDI protocol in the AVRISP project.

[pub/USBasp.git] / Projects / AVRISP / Lib / PDIProtocol.c

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 7769343..39f33cf 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -28,10 +28,6 @@
   this software.\r
 */\r
 \r
-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
-\r
-#warning PDI Programming Protocol support is incomplete and not currently suitable for use.\r
-\r
 /** \file\r
  *\r
  *  PDI Protocol handler, to process V2 Protocol wrapped PDI commands used in Atmel programmer devices.\r
@@ -40,6 +36,9 @@
 #define  INCLUDE_FROM_PDIPROTOCOL_C\r
 #include "PDIProtocol.h"\r
 \r
+#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
+#warning PDI Programming Protocol support is incomplete and not currently suitable for use.\r
+\r
 uint32_t XPROG_Param_NVMBase;\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r
@@ -59,7 +58,7 @@ void PDIProtocol_XPROG_SetMode(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG_SETMODE);\r
-       Endpoint_Write_Byte(SetMode_XPROG_Params.Protocol ? STATUS_CMD_FAILED : STATUS_CMD_OK);\r
+       Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol == XPRG_PROTOCOL_PDI) ? STATUS_CMD_OK : STATUS_CMD_FAILED);\r
        Endpoint_ClearIN();     \r
 }\r
 \r
@@ -115,7 +114,7 @@ static void PDIProtocol_EnterXPROGMode(void)
          PDITarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);\r
 \r
        /* Wait until the NVM bus becomes active */\r
-       bool NVMBusEnabled = PDITarget_WaitWhileNVMBusBusy();\r
+       bool NVMBusEnabled = NVMTarget_WaitWhileNVMBusBusy();\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
@@ -131,7 +130,7 @@ static void PDIProtocol_LeaveXPROGMode(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       /* Clear the RESET key into the RESET PDI register to allow the XMEGA to run */\r
+       /* Clear the RESET key in the RESET PDI register to allow the XMEGA to run */\r
        PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
        PDITarget_SendByte(0x00);\r
 \r
@@ -155,11 +154,31 @@ static void PDIProtocol_Erase(void)
        } Erase_XPROG_Params;\r
 \r
        Endpoint_Read_Stream_LE(&Erase_XPROG_Params, sizeof(Erase_XPROG_Params));\r
+       Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       // TODO: Send erase command here via PDI protocol\r
+       uint8_t EraseCommand;\r
+       \r
+       if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
+         EraseCommand = NVM_CMD_CHIPERASE;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r
+         EraseCommand = NVM_CMD_ERASEAPPSEC;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r
+         EraseCommand = NVM_CMD_ERASEBOOTSEC;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r
+         EraseCommand = NVM_CMD_ERASEEEPROM;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r
+         EraseCommand = NVM_CMD_ERASEAPPSECPAGE;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r
+         EraseCommand = NVM_CMD_ERASEBOOTSECPAGE;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r
+         EraseCommand = NVM_CMD_ERASEEEPROMPAGE;\r
+       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
+         EraseCommand = NVM_CMD_ERASEUSERSIG;\r
+       \r
+       NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ERASE);\r
@@ -217,13 +236,17 @@ static void PDIProtocol_ReadMemory(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       \r
-       // TODO: Send read command here via PDI protocol\r
-       \r
+\r
+       uint8_t ReadBuffer[ReadMemory_XPROG_Params.Length];\r
+       NVMTarget_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length);\r
+\r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r
        Endpoint_Write_Byte(ReturnStatus);\r
        \r
+       if (ReturnStatus == XPRG_ERR_OK)\r
+         Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length);\r
+       \r
        Endpoint_ClearIN();\r
 }\r
 \r
@@ -233,15 +256,27 @@ static void PDIProtocol_ReadMemory(void)
 static void PDIProtocol_ReadCRC(void)\r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
-\r
-       uint8_t CRCType = Endpoint_Read_Byte();\r
        \r
+       struct\r
+       {\r
+               uint8_t CRCType;\r
+       } ReadCRC_XPROG_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params));\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       uint32_t MemoryCRC = 0;\r
+       uint32_t MemoryCRC;\r
+       uint8_t  CRCCommand;\r
+\r
+       if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
+         CRCCommand = NVM_CMD_APPCRC;\r
+       else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
+         CRCCommand = NVM_CMD_BOOTCRC;\r
+       else\r
+         CRCCommand = NVM_CMD_FLASHCRC;\r
        \r
-       // TODO: Read device CRC for desired memory via PDI protocol\r
+       MemoryCRC = NVMTarget_GetMemoryCRC(CRCCommand);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r
@@ -266,9 +301,9 @@ static void PDIProtocol_SetParam(void)
        uint8_t XPROGParam = Endpoint_Read_Byte();\r
        \r
        if (XPROGParam == XPRG_PARAM_NVMBASE)\r
-         XPROG_Param_NVMBase = Endpoint_Read_DWord_LE();\r
+         XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();\r
        else if (XPROGParam == XPRG_PARAM_EEPPAGESIZE)\r
-         XPROG_Param_EEPageSize = Endpoint_Read_Word_LE();\r
+         XPROG_Param_EEPageSize = Endpoint_Read_Word_BE();\r
        else\r
          ReturnStatus = XPRG_ERR_FAILED;\r
        \r