Split out NVM access code in the AVRISP project into a seperate NVMTarget.c source...

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 41cc1fb..2a2af6e 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


@@ -95,32 +95,6 @@
                #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
-               #define DATAMEM_NVM_ADDR0        (DATAMEM_NVM_BASE | 0x00)\r
-               #define DATAMEM_NVM_ADDR1        (DATAMEM_NVM_BASE | 0x01)\r
-               #define DATAMEM_NVM_ADDR2        (DATAMEM_NVM_BASE | 0x02)\r
-               #define DATAMEM_NVM_DAT0         (DATAMEM_NVM_BASE | 0x04)\r
-               #define DATAMEM_NVM_DAT1         (DATAMEM_NVM_BASE | 0x05)\r
-               #define DATAMEM_NVM_DAT2         (DATAMEM_NVM_BASE | 0x06)\r
-               #define DATAMEM_NVM_CMD          (DATAMEM_NVM_BASE | 0x0A)\r
-               #define DATAMEM_NVM_CTRLA        (DATAMEM_NVM_BASE | 0x0B)\r
-               #define DATAMEM_NVM_CTRLB        (DATAMEM_NVM_BASE | 0x0C)\r
-               #define DATAMEM_NVM_INTCTRL      (DATAMEM_NVM_BASE | 0x0D)\r
-               #define DATAMEM_NVM_STATUS       (DATAMEM_NVM_BASE | 0x0F)\r
-               #define DATAMEM_NVM_LOCKBITS     (DATAMEM_NVM_BASE | 0x10)\r
-               \r
-               #define NVM_CMD_APPCRC           0x38\r
-               #define NVM_CMD_BOOTCRC          0x39\r
-               #define NVM_CMD_FLASHCRC         0x78\r
-               #define NVM_CMD_READUSERSIG      0x03\r

                                \r
        /* Function Prototypes: */\r
                void    PDITarget_EnableTargetPDI(void);\r
                                \r
        /* Function Prototypes: */\r
                void    PDITarget_EnableTargetPDI(void);\r


@@ -128,9 +102,5 @@
                void    PDITarget_SendByte(uint8_t Byte);\r
                uint8_t PDITarget_ReceiveByte(void);\r
                void    PDITarget_SendBreak(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