Started implementing the low level PDI protocol in the AVRISP project, for XMEGA...

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

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index b095a49..c919561 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -35,7 +35,7 @@
  *  PDI Protocol handler, to process V2 Protocol wrapped PDI commands used in Atmel programmer devices.\r
  */\r
 \r
-#define  INCLUDE_FROM_XPROG_C\r
+#define  INCLUDE_FROM_PDIPROTOCOL_C\r
 #include "PDIProtocol.h"\r
 \r
 uint32_t XPROG_Param_NVMBase;\r
@@ -91,6 +91,59 @@ void PDIProtocol_XPROG_Command(void)
        }\r
 }\r
 \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
+       PDIDATA_LINE_PORT |= PDIDATA_LINE_MASK;\r
+\r
+       _delay_us(1);\r
+       \r
+       for (uint8_t i = 0; i < 16; i++)\r
+       {\r
+               PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK;\r
+               PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK;\r
+       }\r
+               \r
+       static const uint8_t NVMKey[8] = {0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF};\r
+       \r
+       PDITarget_SendByte(PDI_CMD_KEY);        \r
+       for (uint8_t i = 0; i < 8; i++)\r
+         PDITarget_SendByte(NVMKey[i]);\r
+\r
+       PDITarget_SendByte(PDI_CMD_LDCS | PD_STATUS_REG);       \r
+       if (!(PDITarget_ReceiveByte() & PDI_STATUS_NVM))\r
+         ReturnStatus = XPRG_ERR_FAILED;\r
+       \r
+       Endpoint_Write_Byte(CMD_XPROG);\r
+       Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
+       Endpoint_Write_Byte(ReturnStatus);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void PDIProtocol_LeaveXPROGMode(void)\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
+       PDIDATA_LINE_PORT  &= ~PDIDATA_LINE_MASK;\r
+       PDICLOCK_LINE_PORT &= ~PDICLOCK_LINE_MASK;\r
+       \r
+       Endpoint_Write_Byte(CMD_XPROG);\r
+       Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);\r
+       Endpoint_Write_Byte(XPRG_ERR_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
 static void PDIProtocol_EraseChip(void)\r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
@@ -209,34 +262,6 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_ClearIN();     \r
 }\r
 \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
-       // TODO: Enter device programming mode here via PDI protocol\r
-       \r
-       Endpoint_Write_Byte(CMD_XPROG);\r
-       Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
-       Endpoint_Write_Byte(ReturnStatus);\r
-       Endpoint_ClearIN();\r
-}\r
-\r
-static void PDIProtocol_LeaveXPROGMode(void)\r
-{\r
-       Endpoint_ClearOUT();\r
-       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       \r
-       // TODO: Exit device programming mode here via PDI protocol\r
-\r
-       Endpoint_Write_Byte(CMD_XPROG);\r
-       Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);\r
-       Endpoint_Write_Byte(XPRG_ERR_OK);\r
-       Endpoint_ClearIN();\r
-}\r
-\r
 static void PDIProtocol_SetParam(void)\r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r