The AVRISP project can now enter PDI mode under both bit-bang and hardware USART...

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 2726555..85f627a 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -63,34 +63,57 @@
                        \r
                        #define BITBANG_PDICLOCK_PORT    RESET_LINE_PORT\r
                        #define BITBANG_PDICLOCK_DDR     RESET_LINE_DDR\r
                        \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 BITBANG_PDICLOCK_MASK    RESET_LINE_MASK\r
                #endif\r
                \r

-               #define BITS_IN_FRAME         12\r
+               #define BITS_IN_FRAME            12\r

                \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_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
                \r

-               #define PD_STATUS_REG         0\r
-               #define PD_RESET_REG          1\r
-               #define PD_CTRL_REG           2\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_NVMENABLE_KEY        (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\r

 \r
 \r

-               #define PDI_STATUS_NVM        (1 << 1)\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
 \r

-               #define PDI_RESET_KEY         0x59\r
-               #define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\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
                \r

+               #define DATAMEM_NVM_BASE         0x01C0\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_SendBreak(void);\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_SendBreak(void);\r

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

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