Test with -Wextra, fix library warnings due to unused function parameters.

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 0ecc70a..41cc1fb 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -38,12 +38,13 @@
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r

+               #include <avr/interrupt.h>\r

                #include <stdbool.h>\r
                \r
                #include <LUFA/Common/Common.h>\r
        \r
        /* Preprocessor Checks: */\r
                #include <stdbool.h>\r
                \r
                #include <LUFA/Common/Common.h>\r
        \r
        /* Preprocessor Checks: */\r

-               #if BOARD == BOARD_XPLAIN\r
+               #if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)\r

                        #undef  ENABLE_ISP_PROTOCOL\r
                        \r
                        #if !defined(ENABLE_PDI_PROTOCOL)\r
                        #undef  ENABLE_ISP_PROTOCOL\r
                        \r
                        #if !defined(ENABLE_PDI_PROTOCOL)\r


@@ -53,48 +54,83 @@
 \r
        /* Defines: */\r
                #if BOARD == BOARD_XPLAIN\r
 \r
        /* Defines: */\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
+                       #define PDI_VIA_HARDWARE_USART\r

                #else\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
+                       #define BITBANG_PDIDATA_PORT     PORTB\r
+                       #define BITBANG_PDIDATA_DDR      DDRB\r
+                       #define BITBANG_PDIDATA_PIN      PINB\r
+                       #define BITBANG_PDIDATA_MASK     (1 << 3)\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
+                       #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
                #endif\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 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
+               \r
+               #define PDI_STATUS_REG           0\r
+               #define PDI_RESET_REG            1\r
+               #define PDI_CTRL_REG             2\r

                \r
                \r

-               #define PD_STATUS_REG         0\r
-               #define PD_RESET_REG          1\r
-               #define PD_CTRL_REG           2\r
+               #define PDI_STATUS_NVM           (1 << 1)\r
+               #define PDI_RESET_KEY            0x59\r

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

-               #define TOGGLE_PDI_CLOCK      MACROS{ PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \\r
-                                                     PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; }MACROE\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
                \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
        /* 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_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