Seperate out XMEGA and TINY NVM routines into seperate files.

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 43370c7..16ac209 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -160,28 +160,28 @@ 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 = NVM_CMD_NOOP;\r
+       uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP;\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
        \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
+         EraseCommand = XMEGA_NVM_CMD_CHIPERASE;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r

-         EraseCommand = NVM_CMD_ERASEAPPSEC;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r

-         EraseCommand = NVM_CMD_ERASEBOOTSEC;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r

-         EraseCommand = NVM_CMD_ERASEEEPROM;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r

-         EraseCommand = NVM_CMD_ERASEAPPSECPAGE;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r

-         EraseCommand = NVM_CMD_ERASEBOOTSECPAGE;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r

-         EraseCommand = NVM_CMD_ERASEEEPROMPAGE;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;\r

        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
        else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r

-         EraseCommand = NVM_CMD_ERASEUSERSIG;\r
+         EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;\r

        \r
        /* Erase the target memory, indicate timeout if ocurred */\r
        \r
        /* Erase the target memory, indicate timeout if ocurred */\r

-       if (!(NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r
+       if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r

          ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
          ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r


@@ -214,47 +214,47 @@ static void PDIProtocol_WriteMemory(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        /* Assume FLASH page programming by default, as it is the common case */\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
+       uint8_t WriteCommand     = XMEGA_NVM_CMD_WRITEFLASHPAGE;\r
+       uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF;\r
+       uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF;\r

        bool    PagedMemory      = true;\r
        \r
        if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
        {\r
        bool    PagedMemory      = true;\r
        \r
        if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
        {\r

-               WriteCommand     = NVM_CMD_WRITEAPPSECPAGE;\r
+               WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;\r

        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
        {\r
        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
        {\r

-               WriteCommand     = NVM_CMD_WRITEBOOTSECPAGE;\r
+               WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;\r

        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
        {\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
+               WriteCommand     = XMEGA_NVM_CMD_WRITEEEPROMPAGE;\r
+               WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;\r
+               EraseBuffCommand = XMEGA_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
        }\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
+               WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;\r

        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
        {\r
        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
        {\r

-               WriteCommand     = NVM_CMD_WRITEFUSE;\r
+               WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;\r

                PagedMemory      = false;\r
        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
        {\r
                PagedMemory      = false;\r
        }\r
        else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
        {\r

-               WriteCommand     = NVM_CMD_WRITELOCK;\r
+               WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;\r

                PagedMemory      = false;\r
        }\r
        \r
        /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r
                PagedMemory      = false;\r
        }\r
        \r
        /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r

-       if ((PagedMemory && !NVMTarget_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r
+       if ((PagedMemory && !XMEGANVM_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r

                                                           WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,\r
                                                           WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) ||\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
+          (!PagedMemory && !XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,\r

                                                       WriteMemory_XPROG_Params.ProgData)))\r
        {\r
                ReturnStatus = XPRG_ERR_TIMEOUT;\r
                                                       WriteMemory_XPROG_Params.ProgData)))\r
        {\r
                ReturnStatus = XPRG_ERR_TIMEOUT;\r


@@ -290,7 +290,7 @@ static void PDIProtocol_ReadMemory(void)
        uint8_t ReadBuffer[256];\r
        \r
        /* Read the target's memory, indicate timeout if occurred */\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
+       if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))\r

          ReturnStatus = XPRG_ERR_TIMEOUT;\r
 \r
        Endpoint_Write_Byte(CMD_XPROG);\r
          ReturnStatus = XPRG_ERR_TIMEOUT;\r
 \r
        Endpoint_Write_Byte(CMD_XPROG);\r


@@ -319,19 +319,19 @@ 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
+       uint8_t  CRCCommand = XMEGA_NVM_CMD_NOOP;\r

        uint32_t MemoryCRC;\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
        uint32_t MemoryCRC;\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
+         CRCCommand = XMEGA_NVM_CMD_APPCRC;\r

        else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
        else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r

-         CRCCommand = NVM_CMD_BOOTCRC;\r
+         CRCCommand = XMEGA_NVM_CMD_BOOTCRC;\r

        else\r
        else\r

-         CRCCommand = NVM_CMD_FLASHCRC;\r
+         CRCCommand = XMEGA_NVM_CMD_FLASHCRC;\r

        \r
        /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r
        \r
        /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r

-       if (!(NVMTarget_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r
+       if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r

          ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
          ReturnStatus = XPRG_ERR_TIMEOUT;\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r