X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/f1baf12fae61a13e6d8e88655d709d74977322b5..7aecda6fda5bcced68d72b0cf73d00174aa5c7cd:/Projects/AVRISP/Lib/PDITarget.h?ds=inline

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index f2281fe11..00ce68bb3 100644
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -43,9 +43,12 @@
 		#include <LUFA/Common/Common.h>
 	
 	/* Preprocessor Checks: */
-		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+		#if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Defines: */
@@ -62,7 +65,7 @@
 			#define PDIDATA_LINE_PORT     PORTB
 			#define PDIDATA_LINE_DDR      DDRB
 			#define PDIDATA_LINE_PIN      PINB
-			#define PDIDATA_LINE_MASK     (1 << 2)
+			#define PDIDATA_LINE_MASK     (1 << 3)
 			
 			#define PDICLOCK_LINE_PORT    RESET_LINE_PORT
 			#define PDICLOCK_LINE_DDR     RESET_LINE_DDR
@@ -88,7 +91,9 @@
 		#define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}
 
 		#define TOGGLE_PDI_CLOCK      MACROS{ PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \
-		                                      PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; }MACROE
+		                                      asm volatile ("NOP" ::);                  \
+		                                      PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \
+		                                      asm volatile ("NOP" ::);                  }MACROE
 		
 	/* Function Prototypes: */
 		void    PDITarget_SendByte(uint8_t Byte);