Change over AVRISP project to have both hardware USART and software USART modes for...

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 00ce68b..2726555 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -38,6 +38,7 @@
 \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
                #include <stdbool.h>\r
                \r
                #include <LUFA/Common/Common.h>\r


@@ -53,25 +54,20 @@
 \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 << 3)\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_MASK    RESET_LINE_MASK\r

                #endif\r
                \r
                #endif\r
                \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_LDS           0x00\r
                #define PDI_CMD_LD            0x20\r
                #define PDI_CMD_STS           0x40\r


@@ -89,14 +85,12 @@
 \r
                #define PDI_RESET_KEY         0x59\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

-\r
-               #define TOGGLE_PDI_CLOCK      MACROS{ PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \\r
-                                                     asm volatile ("NOP" ::);                  \\r
-                                                     PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \\r
-                                                     asm volatile ("NOP" ::);                  }MACROE\r

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

+               void    PDITarget_SendBreak(void);\r

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