Test with -Wextra, fix library warnings due to unused function parameters.

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 864d4e9..ecd2fe9 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -99,36 +99,27 @@ void PDIProtocol_XPROG_Command(void)
 /** Handler for the XPROG ENTER_PROGMODE command to establish a PDI connection with the attached device. */\r
 static void PDIProtocol_EnterXPROGMode(void)\r
 {\r
-       uint8_t ReturnStatus = XPRG_ERR_OK;\r
-\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       PDIDATA_LINE_DDR  |= PDIDATA_LINE_MASK;\r
-       PDICLOCK_LINE_DDR |= PDICLOCK_LINE_MASK;\r
-       \r
-       /* Must hold DATA line high for at least 90nS to enable PDI interface */\r
-       PDIDATA_LINE_PORT |= PDIDATA_LINE_MASK;\r
-       asm volatile ("NOP"::);\r
-       asm volatile ("NOP"::);\r
-       \r
-       /* Toggle CLOCK line 16 times within 100uS of the original 90nS timeout to keep PDI interface enabled */\r
-       for (uint8_t i = 0; i < 16; i++)\r
-         TOGGLE_PDI_CLOCK;\r
+       /* Enable PDI programming mode with the attached target */\r
+       PDITarget_EnableTargetPDI();\r
        \r
+       /* Store the RESET key into the RESET PDI register to keep the XMEGA in reset */\r
+       PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
+       PDITarget_SendByte(PDI_RESET_KEY);\r
+\r
        /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */\r
        PDITarget_SendByte(PDI_CMD_KEY);        \r
-       for (uint8_t i = 0; i < sizeof(PDI_NVMENABLE_KEY); i++)\r
-         PDITarget_SendByte(PDI_NVMENABLE_KEY[i]);\r
+       for (uint8_t i = sizeof(PDI_NVMENABLE_KEY); i > 0; i--)\r
+         PDITarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);\r
 \r
-       /* Read out the STATUS register to check that NVM access was successfully enabled */\r
-       PDITarget_SendByte(PDI_CMD_LDCS | PD_STATUS_REG);       \r
-       if (!(PDITarget_ReceiveByte() & PDI_STATUS_NVM))\r
-         ReturnStatus = XPRG_ERR_FAILED;\r
+       /* Wait until the NVM bus becomes active */\r
+       bool NVMBusEnabled = PDITarget_WaitWhileNVMBusBusy();\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
-       Endpoint_Write_Byte(ReturnStatus);\r
+       Endpoint_Write_Byte(NVMBusEnabled ? XPRG_ERR_OK : XPRG_ERR_FAILED);\r
        Endpoint_ClearIN();\r
 }\r
 \r
@@ -140,14 +131,12 @@ static void PDIProtocol_LeaveXPROGMode(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       /* Set DATA and CLOCK lines to inputs */\r
-       PDIDATA_LINE_DDR   &= ~PDIDATA_LINE_MASK;\r
-       PDICLOCK_LINE_DDR  &= ~PDICLOCK_LINE_MASK;\r
-       \r
-       /* Tristate DATA and CLOCK lines */\r
-       PDIDATA_LINE_PORT  &= ~PDIDATA_LINE_MASK;\r
-       PDICLOCK_LINE_PORT &= ~PDICLOCK_LINE_MASK;\r
-       \r
+       /* Clear the RESET key into the RESET PDI register to allow the XMEGA to run */\r
+       PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
+       PDITarget_SendByte(0x00);\r
+\r
+       PDITarget_DisableTargetPDI();\r
+\r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);\r
        Endpoint_Write_Byte(XPRG_ERR_OK);\r
@@ -229,7 +218,14 @@ static void PDIProtocol_ReadMemory(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
-       // TODO: Send read command here via PDI protocol\r
+       if (ReadMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
+       {\r
+               PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));\r
+               PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);\r
+               PDITarget_SendByte(NVM_CMD_READUSERSIG);\r
+\r
+               \r
+       }\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r
@@ -244,15 +240,46 @@ static void PDIProtocol_ReadMemory(void)
 static void PDIProtocol_ReadCRC(void)\r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
-\r
-       uint8_t CRCType = Endpoint_Read_Byte();\r
        \r
+       struct\r
+       {\r
+               uint8_t CRCType;\r
+       } ReadCRC_XPROG_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params));\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint32_t MemoryCRC = 0;\r
+       uint8_t  CRCReadCommand;\r
+\r
+       if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
+         CRCReadCommand = NVM_CMD_APPCRC;\r
+       else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
+         CRCReadCommand = NVM_CMD_BOOTCRC;\r
+       else\r
+         CRCReadCommand = NVM_CMD_FLASHCRC;\r
+       \r
+       /* Set the NVM command to the correct CRC read command */\r
+       PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));\r
+       PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);\r
+       PDITarget_SendByte(CRCReadCommand);\r
+\r
+       /* Set CMDEX bit in NVM CTRLA register to start the CRC generation */\r
+       PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));\r
+       PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CTRLA);\r
+       PDITarget_SendByte(1 << 0);\r
+\r
+       /* Wait until the NVM bus and controller is no longer busy */\r
+       PDITarget_WaitWhileNVMBusBusy();\r
+       PDITarget_WaitWhileNVMControllerBusy();\r
        \r
-       // TODO: Read device CRC for desired memory via PDI protocol\r
+       /* Read the three byte generated CRC value */\r
+       PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_3BYTES << 2));\r
+       PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_DAT0);\r
+       MemoryCRC  = PDITarget_ReceiveByte();\r
+       MemoryCRC |= ((uint16_t)PDITarget_ReceiveByte() << 8);\r
+       MemoryCRC |= ((uint32_t)PDITarget_ReceiveByte() << 16);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r