Fix the tokens which enable and disable the different programming protocols in the...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4d89a29..f0d0478 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -17,8 +17,8 @@
   *  - Added new RNDIS Ethernet Host ClassDriver demo\r
   *  - Added CDC_Host_Flush() function to the CDC Host Class driver to flush sent data to the attached device\r
   *  - Added PDI programming support for XMEGA devices to the AVRISP programmer project\r
-  *  - Added support for the XPLAIN dataflash, with new XPLAIN_REV1 board target for the different dataflash used on the\r
-  *    first revision boards compared to the ones mounted on later revisions\r
+  *  - Added support for the XPLAIN board Dataflash, with new XPLAIN_REV1 board target for the different dataflash used\r
+  *    on the first revision boards compared to the one mounted on later revisions\r
   *\r
   *  <b>Changed:</b>\r
   *  - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes\r

diff --git a/Projects/AVRISP/AVRISP.txt b/Projects/AVRISP/AVRISP.txt
index bed0a7a..c15c27f 100644 (file)
--- a/Projects/AVRISP/AVRISP.txt
+++ b/Projects/AVRISP/AVRISP.txt
@@ -54,10 +54,10 @@
  *  drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio.\r
  *\r
  *  Note that this design currently has several limitations:\r
- *    - Minimum target clock speed of 500KHz due to hardware SPI used\r
+ *    - Minimum ISP target clock speed of 500KHz due to hardware SPI used\r
  *    - No reversed/shorted target connector detection and notification\r
  *\r
- *  On AVR models with an ADC converter, ACC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be\r
+ *  On AVR models with an ADC converter, AVCC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be\r
  *  set to an appropriate ADC channel number in the project makefile for VTARGET detection to operate correctly. On models\r
  *  without an ADC converter, VTARGET will report at a fixed 5V level.\r
  *\r
@@ -115,7 +115,7 @@
  *   <tr>\r
  *    <td><b>Programmer Pin:</b></td>\r
  *    <td><b>Target Device Pin:</b></td>\r
- *    <td><b>ISP 6 Pin Layout:</b></td>\r
+ *    <td><b>PDI 6 Pin Layout:</b></td>\r
  *   </tr>\r
  *   <tr>\r
  *    <td>MISO</td>\r
@@ -183,12 +183,12 @@
  *    <td>ADC channel number (on supported AVRs) to use for VTARGET level detection.</td> \r
  *   </tr>\r
  *   <tr>\r
- *    <td>ENABLE_SPI_PROTOCOL</td>\r
+ *    <td>ENABLE_ISP_PROTOCOL</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>Define to enable SPI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r
  *   <tr>\r
- *    <td>ENABLE_XPROG_PROTOCOL</td>\r
+ *    <td>ENABLE_PDI_PROTOCOL</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>Define to enable XMEGA PDI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r

diff --git a/Projects/AVRISP/Doxygen.conf b/Projects/AVRISP/Doxygen.conf
index dcaaecb..47d88ed 100644 (file)
--- a/Projects/AVRISP/Doxygen.conf
+++ b/Projects/AVRISP/Doxygen.conf
@@ -1221,7 +1221,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator \r
 # instead of the = operator.\r
 \r
-PREDEFINED             = __DOXYGEN__ ENABLE_SPI_PROTOCOL ENABLE_PDI_PROTOCOL\r
+PREDEFINED             = __DOXYGEN__ ENABLE_ISP_PROTOCOL ENABLE_PDI_PROTOCOL\r
 \r
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then \r
 # this tag can be used to specify a list of macro names that should be expanded. \r

diff --git a/Projects/AVRISP/Lib/ISPProtocol.c b/Projects/AVRISP/Lib/ISPProtocol.c
index 4847c35..1f336b3 100644 (file)
--- a/Projects/AVRISP/Lib/ISPProtocol.c
+++ b/Projects/AVRISP/Lib/ISPProtocol.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
-#if defined(ENABLE_SPI_PROTOCOL)\r
+#if defined(ENABLE_ISP_PROTOCOL)\r
 \r
 /** \file\r
  *\r

diff --git a/Projects/AVRISP/Lib/ISPProtocol.h b/Projects/AVRISP/Lib/ISPProtocol.h
index 5a144c4..247933e 100644 (file)
--- a/Projects/AVRISP/Lib/ISPProtocol.h
+++ b/Projects/AVRISP/Lib/ISPProtocol.h
@@ -43,8 +43,11 @@
                \r
        /* Preprocessor Checks: */\r
                #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_PROTOCOL\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
                #endif\r
 \r
        /* Macros: */\r

diff --git a/Projects/AVRISP/Lib/ISPTarget.c b/Projects/AVRISP/Lib/ISPTarget.c
index aab64a9..f2b5734 100644 (file)
--- a/Projects/AVRISP/Lib/ISPTarget.c
+++ b/Projects/AVRISP/Lib/ISPTarget.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
-#if defined(ENABLE_SPI_PROTOCOL)\r
+#if defined(ENABLE_ISP_PROTOCOL)\r
 \r
 /** \file\r
  *\r

diff --git a/Projects/AVRISP/Lib/ISPTarget.h b/Projects/AVRISP/Lib/ISPTarget.h
index 4c4b891..da5bd30 100644 (file)
--- a/Projects/AVRISP/Lib/ISPTarget.h
+++ b/Projects/AVRISP/Lib/ISPTarget.h
@@ -49,8 +49,11 @@
 \r
        /* Preprocessor Checks: */\r
                #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_PROTOCOL\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
                #endif\r
 \r
        /* Macros: */\r

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 2ed3ff2..3e16407 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
-#if defined(ENABLE_XPROG_PROTOCOL)\r
+#if defined(ENABLE_PDI_PROTOCOL)\r
 \r
 #warning PDI Programming Protocol support is incomplete and not currently suitable for use.\r
 \r

diff --git a/Projects/AVRISP/Lib/PDIProtocol.h b/Projects/AVRISP/Lib/PDIProtocol.h
index 6ac3eb2..bbbfda5 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.h
+++ b/Projects/AVRISP/Lib/PDIProtocol.h
@@ -45,8 +45,11 @@
 \r
        /* Preprocessor Checks: */\r
                #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_PROTOCOL\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
                #endif\r
 \r
        /* Macros: */\r

diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c
index d104206..6726199 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.c
+++ b/Projects/AVRISP/Lib/PDITarget.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
-#if defined(ENABLE_XPROG_PROTOCOL)\r
+#if defined(ENABLE_PDI_PROTOCOL)\r
 \r
 /** \file\r
  *\r

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index f2281fe..0ecc70a 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -44,8 +44,11 @@
        \r
        /* Preprocessor Checks: */\r
                #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_PROTOCOL\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

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 24f2080..dfb04c6 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -66,7 +66,7 @@ void V2Protocol_ProcessCommand(void)
                case CMD_RESET_PROTECTION:\r
                        V2Protocol_ResetProtection();\r
                        break;\r
-#if defined(ENABLE_SPI_PROTOCOL)\r
+#if defined(ENABLE_ISP_PROTOCOL)\r
                case CMD_ENTER_PROGMODE_ISP:\r
                        ISPProtocol_EnterISPMode();\r
                        break;\r
@@ -98,7 +98,7 @@ void V2Protocol_ProcessCommand(void)
                        ISPProtocol_SPIMulti();\r
                        break;\r
 #endif\r
-#if defined(ENABLE_XPROG_PROTOCOL)\r
+#if defined(ENABLE_PDI_PROTOCOL)\r
                case CMD_XPROG_SETMODE:\r
                        PDIProtocol_XPROG_SetMode();\r
                        break;\r

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index f65a57c..8a0ac2f 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -48,8 +48,11 @@
 \r
        /* Preprocessor Checks: */\r
                #if BOARD == BOARD_XPLAIN\r
-                       #undef  ENABLE_SPI_PROTOCOL\r
-                       #define ENABLE_PDI_PROTOCOL\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
                #endif\r
 
        /* Macros: */\r

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index d7fe4ac..6eebb2b 100644 (file)
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -193,8 +193,8 @@ CDEFS += -DRESET_LINE_PORT=PORTB
 CDEFS += -DRESET_LINE_DDR=DDRB\r
 CDEFS += -DRESET_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
-CDEFS += -DENABLE_SPI_PROTOCOL\r
-CDEFS += -DENABLE_XPROG_PROTOCOL\r
+CDEFS += -DENABLE_ISP_PROTOCOL\r
+CDEFS += -DENABLE_PDI_PROTOCOL\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r