Fix NVM commands so that memory reads and CRC generations now work correctly using...

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index a7b1155..e3255a0 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -216,20 +216,17 @@ static void PDIProtocol_ReadMemory(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \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
 \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
        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
        Endpoint_ClearIN();\r
 }\r
 \r


@@ -250,13 +247,16 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint32_t MemoryCRC;\r
        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
 \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
        else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r

-         MemoryCRC = NVMTarget_GetMemoryCRC(NVM_CMD_BOOTCRC);\r
+         CRCCommand = NVM_CMD_BOOTCRC;\r

        else\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
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r