Speed up bit-banged USART code 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 39f33cf..1b3fc53 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -37,9 +37,10 @@
 #include "PDIProtocol.h"\r
 \r
 #if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\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
+/** Base absolute address for the target's NVM controller */\r

 uint32_t XPROG_Param_NVMBase;\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
 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 +115,7 @@ static void PDIProtocol_EnterXPROGMode(void)
          PDITarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);\r
 \r
        /* Wait until the NVM bus becomes active */\r
          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
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r


@@ -159,8 +160,9 @@ static void PDIProtocol_Erase(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       uint8_t EraseCommand;\r
+       uint8_t EraseCommand = NVM_CMD_NOOP;\r

        \r
        \r

+       /* Determine which NVM command to send to the device depending on the memory to erase */\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
        if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
          EraseCommand = NVM_CMD_CHIPERASE;\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r


@@ -178,7 +180,9 @@ static void PDIProtocol_Erase(void)
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
          EraseCommand = NVM_CMD_ERASEUSERSIG;\r
        \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
+       /* Erase the target memory, indicate timeout if ocurred */\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
        \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
        struct\r
        {\r
                uint8_t  MemoryType;\r

+               uint8_t  PageMode;\r

                uint32_t Address;\r
                uint16_t Length;\r
                uint8_t  ProgData[256];\r
                uint32_t Address;\r
                uint16_t Length;\r
                uint8_t  ProgData[256];\r


@@ -207,11 +212,56 @@ static void PDIProtocol_WriteMemory(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r

+\r
+       /* Assume FLASH page programming by default, as it is the common case */\r
+       uint8_t WriteCommand     = NVM_CMD_WRITEFLASHPAGE;\r
+       uint8_t WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF;\r
+       uint8_t EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF;\r
+       bool    PagedMemory      = true;\r
+       \r
+       if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITEAPPSECPAGE;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITEBOOTSECPAGE;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITEEEPROMPAGE;\r
+               WriteBuffCommand = NVM_CMD_LOADEEPROMPAGEBUFF;\r
+               EraseBuffCommand = NVM_CMD_ERASEEEPROMPAGEBUFF;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
+       {\r
+               /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */\r
+               WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);\r
+               WriteCommand     = NVM_CMD_WRITEUSERSIG;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITEFUSE;\r
+               PagedMemory      = false;\r
+       }\r
+       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
+       {\r
+               WriteCommand     = NVM_CMD_WRITELOCK;\r
+               PagedMemory      = false;\r
+       }\r

        \r
        \r

-       // TODO: Send program command here via PDI protocol\r
+       /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r
+       if ((PagedMemory && !NVMTarget_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r
+                                                          WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,\r
+                                                          WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) ||\r
+          (!PagedMemory && !NVMTarget_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,\r
+                                                      WriteMemory_XPROG_Params.ProgData)))\r
+       {\r
+               ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       }\r

        \r
        Endpoint_Write_Byte(CMD_XPROG);\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
        Endpoint_Write_Byte(ReturnStatus);      \r
        Endpoint_ClearIN();\r
 }\r


@@ -237,8 +287,11 @@ static void PDIProtocol_ReadMemory(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        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
+       uint8_t ReadBuffer[256];\r
+       \r
+       /* Read the target's memory, indicate timeout if occurred */\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
 \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r


@@ -266,9 +319,10 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

+       uint8_t  CRCCommand = NVM_CMD_NOOP;\r

        uint32_t MemoryCRC;\r
        uint32_t MemoryCRC;\r

-       uint8_t  CRCCommand;\r

 \r
 \r

+       /* Determine which NVM command to send to the device depending on the memory to CRC */\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
        if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
          CRCCommand = NVM_CMD_APPCRC;\r
        else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r


@@ -276,7 +330,9 @@ static void PDIProtocol_ReadCRC(void)
        else\r
          CRCCommand = NVM_CMD_FLASHCRC;\r
        \r
        else\r
          CRCCommand = NVM_CMD_FLASHCRC;\r
        \r

-       MemoryCRC = NVMTarget_GetMemoryCRC(CRCCommand);\r
+       /* Perform and retrieve the memory CRC, indicate timeout if occurred */\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
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r


@@ -300,6 +356,7 @@ static void PDIProtocol_SetParam(void)
 \r
        uint8_t XPROGParam = Endpoint_Read_Byte();\r
        \r
 \r
        uint8_t XPROGParam = Endpoint_Read_Byte();\r
        \r

+       /* Determine which parameter is being set, store the new parameter value */\r

        if (XPROGParam == XPRG_PARAM_NVMBASE)\r
          XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();\r
        else if (XPROGParam == XPRG_PARAM_EEPPAGESIZE)\r
        if (XPROGParam == XPRG_PARAM_NVMBASE)\r
          XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();\r
        else if (XPROGParam == XPRG_PARAM_EEPPAGESIZE)\r