10 files changed, 31 insertions, 16 deletions
diff --git a/Projects/AVRISP/Lib/ISPProtocol.c b/Projects/AVRISP/Lib/ISPProtocol.c
index 4847c35fc..1f336b3b7 100644
--- a/Projects/AVRISP/Lib/ISPProtocol.c
+++ b/Projects/AVRISP/Lib/ISPProtocol.c
@@ -28,7 +28,7 @@
   this software.
 */
 
-#if defined(ENABLE_SPI_PROTOCOL)
+#if defined(ENABLE_ISP_PROTOCOL)
 
 /** \file
  *
diff --git a/Projects/AVRISP/Lib/ISPProtocol.h b/Projects/AVRISP/Lib/ISPProtocol.h
index 5a144c4f7..247933e39 100644
--- a/Projects/AVRISP/Lib/ISPProtocol.h
+++ b/Projects/AVRISP/Lib/ISPProtocol.h
@@ -43,8 +43,11 @@
 		
 	/* Preprocessor Checks: */
 		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Macros: */
diff --git a/Projects/AVRISP/Lib/ISPTarget.c b/Projects/AVRISP/Lib/ISPTarget.c
index aab64a939..f2b57343f 100644
--- a/Projects/AVRISP/Lib/ISPTarget.c
+++ b/Projects/AVRISP/Lib/ISPTarget.c
@@ -28,7 +28,7 @@
   this software.
 */
 
-#if defined(ENABLE_SPI_PROTOCOL)
+#if defined(ENABLE_ISP_PROTOCOL)
 
 /** \file
  *
diff --git a/Projects/AVRISP/Lib/ISPTarget.h b/Projects/AVRISP/Lib/ISPTarget.h
index 4c4b891d1..da5bd30d1 100644
--- a/Projects/AVRISP/Lib/ISPTarget.h
+++ b/Projects/AVRISP/Lib/ISPTarget.h
@@ -49,8 +49,11 @@
 
 	/* Preprocessor Checks: */
 		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Macros: */
diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 2ed3ff293..3e16407ce 100644
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -28,7 +28,7 @@
   this software.
 */
 
-#if defined(ENABLE_XPROG_PROTOCOL)
+#if defined(ENABLE_PDI_PROTOCOL)
 
 #warning PDI Programming Protocol support is incomplete and not currently suitable for use.
 
diff --git a/Projects/AVRISP/Lib/PDIProtocol.h b/Projects/AVRISP/Lib/PDIProtocol.h
index 6ac3eb209..bbbfda50a 100644
--- a/Projects/AVRISP/Lib/PDIProtocol.h
+++ b/Projects/AVRISP/Lib/PDIProtocol.h
@@ -45,8 +45,11 @@
 
 	/* Preprocessor Checks: */
 		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Macros: */
diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c
index d1042068f..672619968 100644
--- a/Projects/AVRISP/Lib/PDITarget.c
+++ b/Projects/AVRISP/Lib/PDITarget.c
@@ -28,7 +28,7 @@
   this software.
 */
 
-#if defined(ENABLE_XPROG_PROTOCOL)
+#if defined(ENABLE_PDI_PROTOCOL)
 
 /** \file
  *
diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index f2281fe11..0ecc70a26 100644
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -44,8 +44,11 @@
 	
 	/* Preprocessor Checks: */
 		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Defines: */
diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 24f208046..dfb04c674 100644
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -66,7 +66,7 @@ void V2Protocol_ProcessCommand(void)
 		case CMD_RESET_PROTECTION:
 			V2Protocol_ResetProtection();
 			break;
-#if defined(ENABLE_SPI_PROTOCOL)
+#if defined(ENABLE_ISP_PROTOCOL)
 		case CMD_ENTER_PROGMODE_ISP:
 			ISPProtocol_EnterISPMode();
 			break;
@@ -98,7 +98,7 @@ void V2Protocol_ProcessCommand(void)
 			ISPProtocol_SPIMulti();
 			break;
 #endif
-#if defined(ENABLE_XPROG_PROTOCOL)
+#if defined(ENABLE_PDI_PROTOCOL)
 		case CMD_XPROG_SETMODE:
 			PDIProtocol_XPROG_SetMode();
 			break;
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index f65a57c06..8a0ac2f7d 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -48,8 +48,11 @@
 
 	/* Preprocessor Checks: */
 		#if BOARD == BOARD_XPLAIN
-			#undef  ENABLE_SPI_PROTOCOL
-			#define ENABLE_PDI_PROTOCOL
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
 		#endif
 
 	/* Macros: */