Oops - fix Host mode pre-enumeration settle delay being ignored leading to failure...

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index cc8c7db..294d1a9 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -39,17 +39,39 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <stdbool.h>\r
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <stdbool.h>\r

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

        \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 PDIDATA_LINE_PORT     PORTD\r
+                       #define PDIDATA_LINE_DDR      DDRD\r
+                       #define PDIDATA_LINE_PIN      PIND\r
+                       #define PDIDATA_LINE_MASK     (1 << 2)\r
+                       \r
+                       #define PDICLOCK_LINE_PORT    PORTD\r
+                       #define PDICLOCK_LINE_DDR     DDRD\r
+                       #define PDICLOCK_LINE_MASK    (1 << 5)\r
+               #else\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
+                       \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
+               #endif\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


@@ -64,8 +86,12 @@
                #define PD_CTRL_REG           2\r
 \r
                #define PDI_STATUS_NVM        (1 << 1)\r
                #define PD_CTRL_REG           2\r
 \r
                #define PDI_STATUS_NVM        (1 << 1)\r

+\r

                #define PDI_RESET_KEY         0x59\r
                #define PDI_RESET_KEY         0x59\r

+               #define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\r

 \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
                void    PDITarget_SendByte(uint8_t Byte);\r
                \r
        /* Function Prototypes: */\r
                void    PDITarget_SendByte(uint8_t Byte);\r