Fix a bug in the Still Image Host Class driver where the returned block status code...

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 39f33cf..aa03fc4 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -37,9 +37,12 @@
 #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
+#warning PDI Programming Protocol support is incomplete and not currently suitable for general use.\r
 \r
+/** Base absolute address for the target's NVM controller */\r
 uint32_t XPROG_Param_NVMBase;\r
+\r
+/** Size in bytes of the target's EEPROM page */\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI\r
@@ -114,7 +117,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
@@ -159,7 +162,7 @@ static void PDIProtocol_Erase(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       uint8_t EraseCommand;\r
+       uint8_t EraseCommand = NVM_CMD_NOOP;\r
        \r
        if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
          EraseCommand = NVM_CMD_CHIPERASE;\r
@@ -178,7 +181,8 @@ static void PDIProtocol_Erase(void)
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
          EraseCommand = NVM_CMD_ERASEUSERSIG;\r
        \r
-       NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address);\r
+       if (!(NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r
+         ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ERASE);\r
@@ -194,6 +198,7 @@ static void PDIProtocol_WriteMemory(void)
        struct\r
        {\r
                uint8_t  MemoryType;\r
+               uint8_t  PageMode;\r
                uint32_t Address;\r
                uint16_t Length;\r
                uint8_t  ProgData[256];\r
@@ -207,11 +212,70 @@ static void PDIProtocol_WriteMemory(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+\r
+\r
+       uint8_t WriteCommand     = NVM_CMD_NOOP;\r
+       uint8_t WriteBuffCommand = NVM_CMD_NOOP;\r
+       uint8_t EraseBuffCommand = NVM_CMD_NOOP;\r
+       bool    PagedMemory      = false;\r
        \r
-       // TODO: Send program command here via PDI protocol\r
+       if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
+       {\r
+               WriteCommand     = NVM_CMD_ERASEWRITEFLASH;\r
+               WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF;\r
+               EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF;\r
+               PagedMemory      = true;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
+       {\r
+               WriteCommand     = NVM_CMD_ERASEWRITEFLASH;\r
+               WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF;\r
+               EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF;\r
+               PagedMemory      = true;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
+       {\r
+               WriteCommand     = NVM_CMD_ERASEWRITEEEPROMPAGE;\r
+               WriteBuffCommand = NVM_CMD_LOADEEPROMPAGEBUFF;\r
+               EraseBuffCommand = NVM_CMD_ERASEEEPROMPAGEBUFF;\r
+               PagedMemory      = true;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITEUSERSIG;\r
+               WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF;\r
+               EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF;\r
+               PagedMemory      = true;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
+       {\r
+               WriteCommand = NVM_CMD_WRITEFUSE;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
+       {\r
+               WriteCommand = NVM_CMD_WRITELOCK;\r
+       }\r
+       \r
+       if (PagedMemory)\r
+       {\r
+               if (!(NVMTarget_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r
+                                               WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,\r
+                                               WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)))\r
+               {\r
+                       ReturnStatus = XPRG_ERR_TIMEOUT;\r
+               }\r
+       }\r
+       else\r
+       {\r
+               if (!(NVMTarget_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData,\r
+                                                                               WriteMemory_XPROG_Params.Length)))\r
+               {\r
+                       ReturnStatus = XPRG_ERR_TIMEOUT;\r
+               }\r
+       }\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
-       Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r
+       Endpoint_Write_Byte(XPRG_CMD_WRITE_MEM);\r
        Endpoint_Write_Byte(ReturnStatus);      \r
        Endpoint_ClearIN();\r
 }\r
@@ -238,7 +302,9 @@ static void PDIProtocol_ReadMemory(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ReadBuffer[ReadMemory_XPROG_Params.Length];\r
-       NVMTarget_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length);\r
+       \r
+       if (!(NVMTarget_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))\r
+         ReturnStatus = XPRG_ERR_TIMEOUT;\r
 \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r
@@ -266,8 +332,8 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
+       uint8_t  CRCCommand = NVM_CMD_NOOP;\r
        uint32_t MemoryCRC;\r
-       uint8_t  CRCCommand;\r
 \r
        if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
          CRCCommand = NVM_CMD_APPCRC;\r
@@ -276,7 +342,8 @@ static void PDIProtocol_ReadCRC(void)
        else\r
          CRCCommand = NVM_CMD_FLASHCRC;\r
        \r
-       MemoryCRC = NVMTarget_GetMemoryCRC(CRCCommand);\r
+       if (!(NVMTarget_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r
+         ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r