Fix PDI code - must send NVM enable key least significant byte first, need to make...

[pub/USBasp.git] / Projects / AVRISP / Lib / PDITarget.h

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 55a1a95..2726555 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -38,20 +38,36 @@
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r

+               #include <avr/interrupt.h>\r

                #include <stdbool.h>\r
                \r
                #include <LUFA/Common/Common.h>\r
        \r
                #include <stdbool.h>\r
                \r
                #include <LUFA/Common/Common.h>\r
        \r

+       /* Preprocessor Checks: */\r
+               #if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
+               #endif\r
+\r

        /* Defines: */\r
        /* Defines: */\r

-               #define PDIDATA_LINE_PORT     PORTB\r
-               #define PDIDATA_LINE_DDR      DDRB\r
-               #define PDIDATA_LINE_PIN      PINB\r
-               #define PDIDATA_LINE_MASK     (1 << 2)\r
+               #if BOARD == BOARD_XPLAIN\r
+                       #define PDI_VIA_HARDWARE_USART\r
+               #else\r
+                       #define BITBANG_PDIDATA_PORT     PORTB\r
+                       #define BITBANG_PDIDATA_DDR      DDRB\r
+                       #define BITBANG_PDIDATA_PIN      PINB\r
+                       #define BITBANG_PDIDATA_MASK     (1 << 3)\r
+                       \r
+                       #define BITBANG_PDICLOCK_PORT    RESET_LINE_PORT\r
+                       #define BITBANG_PDICLOCK_DDR     RESET_LINE_DDR\r
+                       #define BITBANG_PDICLOCK_MASK    RESET_LINE_MASK\r
+               #endif\r
+               \r
+               #define BITS_IN_FRAME         12\r

                \r
                \r

-               #define PDICLOCK_LINE_PORT    RESET_LINE_PORT\r
-               #define PDICLOCK_LINE_DDR     RESET_LINE_DDR\r
-               #define PDICLOCK_LINE_MASK    RESET_LINE_MASK\r
-\r

                #define PDI_CMD_LDS           0x00\r
                #define PDI_CMD_LD            0x20\r
                #define PDI_CMD_STS           0x40\r
                #define PDI_CMD_LDS           0x00\r
                #define PDI_CMD_LD            0x20\r
                #define PDI_CMD_STS           0x40\r


@@ -69,12 +85,12 @@
 \r
                #define PDI_RESET_KEY         0x59\r
                #define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\r
 \r
                #define PDI_RESET_KEY         0x59\r
                #define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\r

-\r
-               #define TOGGLE_PDI_CLOCK      MACROS{ PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \\r
-                                                     PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; }MACROE\r

                \r
        /* Function Prototypes: */\r
                \r
        /* Function Prototypes: */\r

+               void    PDITarget_EnableTargetPDI(void);\r
+               void    PDITarget_DisableTargetPDI(void);\r

                void    PDITarget_SendByte(uint8_t Byte);\r
                uint8_t PDITarget_ReceiveByte(void);\r
                void    PDITarget_SendByte(uint8_t Byte);\r
                uint8_t PDITarget_ReceiveByte(void);\r

+               void    PDITarget_SendBreak(void);\r

 \r
 #endif\r
 \r
 #endif\r