Fix PDITarget_ReceiveByte() not discarding the start bit properly, and reading in...

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

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index f2281fe..00ce68b 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -43,9 +43,12 @@
                #include <LUFA/Common/Common.h>\r
        \r
        /* Preprocessor Checks: */\r
-               #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_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
+                       #endif\r
                #endif\r
 \r
        /* Defines: */\r
@@ -62,7 +65,7 @@
                        #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 PDIDATA_LINE_MASK     (1 << 3)\r
                        \r
                        #define PDICLOCK_LINE_PORT    RESET_LINE_PORT\r
                        #define PDICLOCK_LINE_DDR     RESET_LINE_DDR\r
@@ -88,7 +91,9 @@
                #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
-                                                     PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; }MACROE\r
+                                                     asm volatile ("NOP" ::);                  \\r
+                                                     PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \\r
+                                                     asm volatile ("NOP" ::);                  }MACROE\r
                \r
        /* Function Prototypes: */\r
                void    PDITarget_SendByte(uint8_t Byte);\r