Ooops - TeensyHID bootloader makefile should use a 16MHz FCPU, not 8MHz.

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 2726555..3758489 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -44,8 +44,8 @@
                #include <LUFA/Common/Common.h>\r
        \r
        /* Preprocessor Checks: */\r
-               #if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)\r
-                       #undef  ENABLE_ISP_PROTOCOL\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
@@ -53,7 +53,7 @@
                #endif\r
 \r
        /* Defines: */\r
-               #if BOARD == BOARD_XPLAIN\r
+               #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #define PDI_VIA_HARDWARE_USART\r
                #else\r
                        #define BITBANG_PDIDATA_PORT     PORTB\r
@@ -63,34 +63,47 @@
                        \r
                        #define BITBANG_PDICLOCK_PORT    RESET_LINE_PORT\r
                        #define BITBANG_PDICLOCK_DDR     RESET_LINE_DDR\r
+                       #define BITBANG_PDICLOCK_PIN     RESET_LINE_PIN\r
                        #define BITBANG_PDICLOCK_MASK    RESET_LINE_MASK\r
                #endif\r
                \r
-               #define BITS_IN_FRAME         12\r
+               #define BITS_IN_FRAME            12\r
                \r
-               #define PDI_CMD_LDS           0x00\r
-               #define PDI_CMD_LD            0x20\r
-               #define PDI_CMD_STS           0x40\r
-               #define PDI_CMD_ST            0x60\r
-               #define PDI_CMD_LDCS          0x80\r
-               #define PDI_CMD_REPEAT        0xA0\r
-               #define PDI_CMD_STCS          0xC0\r
-               #define PDI_CMD_KEY           0xE0\r
+               #define PDI_NVM_TIMEOUT_MS       200\r
                \r
-               #define PD_STATUS_REG         0\r
-               #define PD_RESET_REG          1\r
-               #define PD_CTRL_REG           2\r
+               #define PDI_CMD_LDS              0x00\r
+               #define PDI_CMD_LD               0x20\r
+               #define PDI_CMD_STS              0x40\r
+               #define PDI_CMD_ST               0x60\r
+               #define PDI_CMD_LDCS             0x80\r
+               #define PDI_CMD_REPEAT           0xA0\r
+               #define PDI_CMD_STCS             0xC0\r
+               #define PDI_CMD_KEY              0xE0\r
+               \r
+               #define PDI_STATUS_REG           0\r
+               #define PDI_RESET_REG            1\r
+               #define PDI_CTRL_REG             2\r
+               \r
+               #define PDI_STATUS_NVM           (1 << 1)\r
+               #define PDI_RESET_KEY            0x59\r
 \r
-               #define PDI_STATUS_NVM        (1 << 1)\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
+               #define PDI_DATSIZE_1BYTE        0\r
+               #define PDI_DATSIZE_2BYTES       1\r
+               #define PDI_DATSIZE_3BYTES       2\r
+               #define PDI_DATSIZE_4BYTES       3\r
                \r
+               #define PDI_POINTER_INDIRECT     0\r
+               #define PDI_POINTER_INDIRECT_PI  1\r
+               #define PDI_POINTER_DIRECT       2\r
+                               \r
        /* Function Prototypes: */\r
                void    PDITarget_EnableTargetPDI(void);\r
                void    PDITarget_DisableTargetPDI(void);\r
-               void    PDITarget_SendByte(uint8_t Byte);\r
+               void    PDITarget_SendByte(const uint8_t Byte);\r
                uint8_t PDITarget_ReceiveByte(void);\r
                void    PDITarget_SendBreak(void);\r
+               bool    PDITarget_WaitWhileNVMBusBusy(void);\r
 \r
 #endif\r