Use the PDI REPEAT instruction in the PDI programmer code to reduce protocol overhead...

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index a7b1155..af6fbea 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -114,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 = NVMTarget_WaitWhileNVMBusBusy();\r
+       bool NVMBusEnabled = PDITarget_WaitWhileNVMBusBusy();\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
@@ -154,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
@@ -216,20 +236,17 @@ static void PDIProtocol_ReadMemory(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       \r
-       if (ReadMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
-       {\r
-               PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));\r
-               NVMTarget_SendNVMRegAddress(NVM_REG_CMD);\r
-               PDITarget_SendByte(NVM_CMD_READUSERSIG);\r
 \r
-               // TODO\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
@@ -250,13 +267,16 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint32_t MemoryCRC;\r
+       uint8_t  CRCCommand;\r
 \r
        if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
-         MemoryCRC = NVMTarget_GetMemoryCRC(NVM_CMD_APPCRC);\r
+         CRCCommand = NVM_CMD_APPCRC;\r
        else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
-         MemoryCRC = NVMTarget_GetMemoryCRC(NVM_CMD_BOOTCRC);\r
+         CRCCommand = NVM_CMD_BOOTCRC;\r
        else\r
-         MemoryCRC = NVMTarget_GetMemoryCRC(NVM_CMD_FLASHCRC);\r
+         CRCCommand = NVM_CMD_FLASHCRC;\r
+       \r
+       MemoryCRC = NVMTarget_GetMemoryCRC(CRCCommand);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r