Combine PDIProtocol and TPIProtocol into a single XPROGProtocol set of files.

[pub/lufa.git] / Projects / AVRISP / AVRISP.txt

diff --git a/Projects/AVRISP/AVRISP.txt b/Projects/AVRISP/AVRISP.txt
index 10361ac..8649464 100644 (file)
--- a/Projects/AVRISP/AVRISP.txt
+++ b/Projects/AVRISP/AVRISP.txt
@@ -243,29 +243,16 @@
  *    <td>Define to enable SPI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r
  *   <tr>\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_PDI_PROTOCOL</td>\r
+ *    <td>ENABLE_XPROG_PROTOCOL</td>\r

  *    <td>Makefile CDEFS</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
+ *    <td>Define to enable PDI and TPI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>  \r

  *   </tr>\r
  *   <tr>\r
  *   </tr>\r
  *   <tr>\r

- *    <td>ENABLE_TPI_PROTOCOL</td>\r
+ *    <td>XPROG_VIA_HARDWARE_USART</td>\r

  *    <td>Makefile CDEFS</td>\r
  *    <td>Makefile CDEFS</td>\r

- *    <td>Define to enable 6-PIN ATTINY TPI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
- *   </tr>\r
- *   <tr>\r
- *    <td>PDI_VIA_HARDWARE_USART</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>Define to force the PDI protocol (when enabled) to use the much faster hardware USART instead of bit-banging to\r
- *        match the official AVRISP pinout. This breaks pinout compatibility with the official AVRISP MKII (and requires \r
- *        seperate ISP and PDI programming headers) but increases programming speed dramatically.\r
- *        <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
- *   </tr>\r
- *   <tr>\r
- *    <td>TPI_VIA_HARDWARE_USART</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>Define to force the TPI protocol (when enabled) to use the much faster hardware USART instead of bit-banging to\r
+ *    <td>Define to force the PDI and TPI protocols (when enabled) to use the much faster hardware USART instead of bit-banging to\r

  *        match the official AVRISP pinout. This breaks pinout compatibility with the official AVRISP MKII (and requires \r
  *        match the official AVRISP pinout. This breaks pinout compatibility with the official AVRISP MKII (and requires \r

- *        seperate ISP and TPI programming headers) but increases programming speed dramatically.\r
+ *        seperate ISP and PDI/TPI programming headers) but increases programming speed dramatically.\r

  *        <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r
  *  </table>\r
  *        <i>Ignored when compiled for the XPLAIN board.</i></td>  \r
  *   </tr>\r
  *  </table>\r