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 85f627a..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
                #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
                        \r
                        #if !defined(ENABLE_PDI_PROTOCOL)\r
                                #define ENABLE_PDI_PROTOCOL\r


@@ -53,7 +53,7 @@
                #endif\r
 \r
        /* Defines: */\r
                #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
                        #define PDI_VIA_HARDWARE_USART\r
                #else\r
                        #define BITBANG_PDIDATA_PORT     PORTB\r


@@ -69,6 +69,8 @@
                \r
                #define BITS_IN_FRAME            12\r
                \r
                \r
                #define BITS_IN_FRAME            12\r
                \r

+               #define PDI_NVM_TIMEOUT_MS       200\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


@@ -95,25 +97,13 @@
                #define PDI_POINTER_INDIRECT     0\r
                #define PDI_POINTER_INDIRECT_PI  1\r
                #define PDI_POINTER_DIRECT       2\r
                #define PDI_POINTER_INDIRECT     0\r
                #define PDI_POINTER_INDIRECT_PI  1\r
                #define PDI_POINTER_DIRECT       2\r

-\r
-               #define FLASH_BASE               0x00800000\r
-               #define EPPROM_BASE              0x008C0000\r
-               #define FUSE_BASE                0x008F0020\r
-               #define DATAMEM_BASE             0x01000000\r
-               #define PROD_SIGNATURE_BASE      0x008E0200\r
-               #define USER_SIGNATURE_BASE      0x008E0400\r
-               \r
-               #define DATAMEM_NVM_BASE         0x01C0\r

                                \r
        /* Function Prototypes: */\r
                void    PDITarget_EnableTargetPDI(void);\r
                void    PDITarget_DisableTargetPDI(void);\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
                uint8_t PDITarget_ReceiveByte(void);\r
                void    PDITarget_SendBreak(void);\r

-               \r
-               void PDITarget_SendAddress(uint32_t Address);\r
-               bool PDITarget_WaitWhileNVMBusBusy(void);\r
-               void PDITarget_WaitWhileNVMControllerBusy(void);\r
+               bool    PDITarget_WaitWhileNVMBusBusy(void);\r

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