From be71f934a4434ebeab7e9c2263ffb1170499a169 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 23 Dec 2009 13:07:51 +0000 Subject: Seperate out XMEGA and TINY NVM routines into seperate files. --- Projects/AVRISP/Lib/PDIProtocol.c | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'Projects/AVRISP/Lib/PDIProtocol.c') diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c index 43370c7302..16ac209df2 100644 --- a/Projects/AVRISP/Lib/PDIProtocol.c +++ b/Projects/AVRISP/Lib/PDIProtocol.c @@ -160,28 +160,28 @@ static void PDIProtocol_Erase(void) Endpoint_ClearOUT(); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); - uint8_t EraseCommand = NVM_CMD_NOOP; + uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP; /* Determine which NVM command to send to the device depending on the memory to erase */ if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP) - EraseCommand = NVM_CMD_CHIPERASE; + EraseCommand = XMEGA_NVM_CMD_CHIPERASE; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP) - EraseCommand = NVM_CMD_ERASEAPPSEC; + EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT) - EraseCommand = NVM_CMD_ERASEBOOTSEC; + EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM) - EraseCommand = NVM_CMD_ERASEEEPROM; + EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE) - EraseCommand = NVM_CMD_ERASEAPPSECPAGE; + EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE) - EraseCommand = NVM_CMD_ERASEBOOTSECPAGE; + EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE) - EraseCommand = NVM_CMD_ERASEEEPROMPAGE; + EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE; else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG) - EraseCommand = NVM_CMD_ERASEUSERSIG; + EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG; /* Erase the target memory, indicate timeout if ocurred */ - if (!(NVMTarget_EraseMemory(EraseCommand, Erase_XPROG_Params.Address))) + if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address))) ReturnStatus = XPRG_ERR_TIMEOUT; Endpoint_Write_Byte(CMD_XPROG); @@ -214,47 +214,47 @@ static void PDIProtocol_WriteMemory(void) Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); /* Assume FLASH page programming by default, as it is the common case */ - uint8_t WriteCommand = NVM_CMD_WRITEFLASHPAGE; - uint8_t WriteBuffCommand = NVM_CMD_LOADFLASHPAGEBUFF; - uint8_t EraseBuffCommand = NVM_CMD_ERASEFLASHPAGEBUFF; + uint8_t WriteCommand = XMEGA_NVM_CMD_WRITEFLASHPAGE; + uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF; + uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF; bool PagedMemory = true; if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL) { - WriteCommand = NVM_CMD_WRITEAPPSECPAGE; + WriteCommand = XMEGA_NVM_CMD_WRITEAPPSECPAGE; } else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT) { - WriteCommand = NVM_CMD_WRITEBOOTSECPAGE; + WriteCommand = XMEGA_NVM_CMD_WRITEBOOTSECPAGE; } else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM) { - WriteCommand = NVM_CMD_WRITEEEPROMPAGE; - WriteBuffCommand = NVM_CMD_LOADEEPROMPAGEBUFF; - EraseBuffCommand = NVM_CMD_ERASEEEPROMPAGEBUFF; + WriteCommand = XMEGA_NVM_CMD_WRITEEEPROMPAGE; + WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF; + EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF; } else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG) { /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */ WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE); - WriteCommand = NVM_CMD_WRITEUSERSIG; + WriteCommand = XMEGA_NVM_CMD_WRITEUSERSIG; } else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE) { - WriteCommand = NVM_CMD_WRITEFUSE; + WriteCommand = XMEGA_NVM_CMD_WRITEFUSE; PagedMemory = false; } else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS) { - WriteCommand = NVM_CMD_WRITELOCK; + WriteCommand = XMEGA_NVM_CMD_WRITELOCK; PagedMemory = false; } /* Send the appropriate memory write commands to the device, indicate timeout if occurred */ - if ((PagedMemory && !NVMTarget_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, + if ((PagedMemory && !XMEGANVM_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) || - (!PagedMemory && !NVMTarget_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address, + (!PagedMemory && !XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData))) { ReturnStatus = XPRG_ERR_TIMEOUT; @@ -290,7 +290,7 @@ static void PDIProtocol_ReadMemory(void) uint8_t ReadBuffer[256]; /* Read the target's memory, indicate timeout if occurred */ - if (!(NVMTarget_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length))) + if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length))) ReturnStatus = XPRG_ERR_TIMEOUT; Endpoint_Write_Byte(CMD_XPROG); @@ -319,19 +319,19 @@ static void PDIProtocol_ReadCRC(void) Endpoint_ClearOUT(); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); - uint8_t CRCCommand = NVM_CMD_NOOP; + uint8_t CRCCommand = XMEGA_NVM_CMD_NOOP; uint32_t MemoryCRC; /* Determine which NVM command to send to the device depending on the memory to CRC */ if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP) - CRCCommand = NVM_CMD_APPCRC; + CRCCommand = XMEGA_NVM_CMD_APPCRC; else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT) - CRCCommand = NVM_CMD_BOOTCRC; + CRCCommand = XMEGA_NVM_CMD_BOOTCRC; else - CRCCommand = NVM_CMD_FLASHCRC; + CRCCommand = XMEGA_NVM_CMD_FLASHCRC; /* Perform and retrieve the memory CRC, indicate timeout if occurred */ - if (!(NVMTarget_GetMemoryCRC(CRCCommand, &MemoryCRC))) + if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC))) ReturnStatus = XPRG_ERR_TIMEOUT; Endpoint_Write_Byte(CMD_XPROG); -- cgit v1.2.3