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

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

diff --git a/Projects/AVRISP/Lib/ISP/ISPProtocol.h b/Projects/AVRISP/Lib/ISP/ISPProtocol.h
index caadf41..43c25c4 100644 (file)
--- a/Projects/AVRISP/Lib/ISP/ISPProtocol.h
+++ b/Projects/AVRISP/Lib/ISP/ISPProtocol.h
@@ -46,10 +46,9 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
                        #endif\r
                #endif\r
 \r

diff --git a/Projects/AVRISP/Lib/ISP/ISPTarget.h b/Projects/AVRISP/Lib/ISP/ISPTarget.h
index a2641c0..96f1a64 100644 (file)
--- a/Projects/AVRISP/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP/Lib/ISP/ISPTarget.h
@@ -48,10 +48,9 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
                        #endif\r
                #endif\r
 \r

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index eae2e83..0c4664e 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -100,17 +100,14 @@ void V2Protocol_ProcessCommand(void)
                        ISPProtocol_SPIMulti();\r
                        break;\r
 #endif\r
                        ISPProtocol_SPIMulti();\r
                        break;\r
 #endif\r

-#if defined(ENABLE_PDI_PROTOCOL)\r
+#if defined(ENABLE_XPROG_PROTOCOL)\r

                case CMD_XPROG_SETMODE:\r
                case CMD_XPROG_SETMODE:\r

-                       PDIProtocol_XPROG_SetMode();\r
+                       XPROGProtocol_SetMode();\r

                        break;\r
                case CMD_XPROG:\r
                        break;\r
                case CMD_XPROG:\r

-                       PDIProtocol_XPROG_Command();\r
+                       XPROGProtocol_Command();\r

                        break;\r
 #endif\r
                        break;\r
 #endif\r

-#if defined(ENABLE_TPI_PROTOCOL)\r
-               // TODO\r
-#endif\r

                default:\r
                        V2Protocol_UnknownCommand(V2Command);\r
                        break;\r
                default:\r
                        V2Protocol_UnknownCommand(V2Command);\r
                        break;\r

diff --git a/Projects/AVRISP/Lib/XPROG/PDITarget.c b/Projects/AVRISP/Lib/XPROG/PDITarget.c
index 2c6ffd9..4070c09 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/PDITarget.c
+++ b/Projects/AVRISP/Lib/XPROG/PDITarget.c
@@ -36,12 +36,12 @@
 #define  INCLUDE_FROM_PDITARGET_C\r
 #include "PDITarget.h"\r
 \r
 #define  INCLUDE_FROM_PDITARGET_C\r
 #include "PDITarget.h"\r
 \r

-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
+#if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)\r

 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r
 volatile bool               IsSending;\r
 \r
 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r
 volatile bool               IsSending;\r
 \r

-#if !defined(PDI_VIA_HARDWARE_USART)\r
+#if !defined(XPROG_VIA_HARDWARE_USART)\r

 /** Software USART raw frame bits for transmission/reception. */\r
 volatile uint16_t           SoftUSART_Data;\r
 \r
 /** Software USART raw frame bits for transmission/reception. */\r
 volatile uint16_t           SoftUSART_Data;\r
 \r


@@ -99,7 +99,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
 /** Enables the target's PDI interface, holding the target in reset until PDI mode is exited. */\r
 void PDITarget_EnableTargetPDI(void)\r
 {\r
 /** Enables the target's PDI interface, holding the target in reset until PDI mode is exited. */\r
 void PDITarget_EnableTargetPDI(void)\r
 {\r

-#if defined(PDI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Set Tx and XCK as outputs, Rx as input */\r
        DDRD |=  (1 << 5) | (1 << 3);\r
        DDRD &= ~(1 << 2);\r
        /* Set Tx and XCK as outputs, Rx as input */\r
        DDRD |=  (1 << 5) | (1 << 3);\r
        DDRD &= ~(1 << 2);\r


@@ -142,7 +142,7 @@ void PDITarget_EnableTargetPDI(void)
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */\r
 void PDITarget_DisableTargetPDI(void)\r
 {\r
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */\r
 void PDITarget_DisableTargetPDI(void)\r
 {\r

-#if defined(PDI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
        UCSR1B  = 0;\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
        UCSR1B  = 0;\r


@@ -168,7 +168,7 @@ void PDITarget_DisableTargetPDI(void)
  */\r
 void PDITarget_SendByte(const uint8_t Byte)\r
 {\r
  */\r
 void PDITarget_SendByte(const uint8_t Byte)\r
 {\r

-#if defined(PDI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r
        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r


@@ -221,7 +221,7 @@ void PDITarget_SendByte(const uint8_t Byte)
  */\r
 uint8_t PDITarget_ReceiveByte(void)\r
 {\r
  */\r
 uint8_t PDITarget_ReceiveByte(void)\r
 {\r

-#if defined(PDI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Rx mode if currently in Tx mode */\r
        if (IsSending)\r
        {\r
        /* Switch to Rx mode if currently in Tx mode */\r
        if (IsSending)\r
        {\r


@@ -264,7 +264,7 @@ uint8_t PDITarget_ReceiveByte(void)
 /** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */\r
 void PDITarget_SendBreak(void)\r
 {\r
 /** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */\r
 void PDITarget_SendBreak(void)\r
 {\r

-#if defined(PDI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r
        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r

diff --git a/Projects/AVRISP/Lib/XPROG/PDITarget.h b/Projects/AVRISP/Lib/XPROG/PDITarget.h
index cf7780c..11af7f1 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/PDITarget.h
+++ b/Projects/AVRISP/Lib/XPROG/PDITarget.h
@@ -46,16 +46,15 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
        /* Defines: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #endif\r
                #endif\r
 \r
        /* Defines: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r

-                       #define PDI_VIA_HARDWARE_USART\r
+                       #define XPROG_VIA_HARDWARE_USART\r

                #else\r
                        #define BITBANG_PDIDATA_PORT     PORTB\r
                        #define BITBANG_PDIDATA_DDR      DDRB\r
                #else\r
                        #define BITBANG_PDIDATA_PORT     PORTB\r
                        #define BITBANG_PDIDATA_DDR      DDRB\r

diff --git a/Projects/AVRISP/Lib/XPROG/TINYNVM.c b/Projects/AVRISP/Lib/XPROG/TINYNVM.c
index 206ea39..f3b1840 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP/Lib/XPROG/TINYNVM.c
@@ -36,7 +36,7 @@
 #define  INCLUDE_FROM_TINYNVM_C\r
 #include "TINYNVM.h"\r
 \r
 #define  INCLUDE_FROM_TINYNVM_C\r
 #include "TINYNVM.h"\r
 \r

-#if defined(ENABLE_TPI_PROTOCOL) || defined(__DOXYGEN__)\r
+#if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)\r

 \r
 // TODO\r
 \r
 \r
 // TODO\r
 \r

diff --git a/Projects/AVRISP/Lib/XPROG/TINYNVM.h b/Projects/AVRISP/Lib/XPROG/TINYNVM.h
index 1cff03d..89be3bb 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/TINYNVM.h
+++ b/Projects/AVRISP/Lib/XPROG/TINYNVM.h
@@ -49,10 +49,9 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
                        #endif\r
                #endif\r
 \r

diff --git a/Projects/AVRISP/Lib/XPROG/TPITarget.c b/Projects/AVRISP/Lib/XPROG/TPITarget.c
index f7943bf..441f552 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/TPITarget.c
+++ b/Projects/AVRISP/Lib/XPROG/TPITarget.c
@@ -36,12 +36,12 @@
 #define  INCLUDE_FROM_TPITARGET_C\r
 #include "TPITarget.h"\r
 \r
 #define  INCLUDE_FROM_TPITARGET_C\r
 #include "TPITarget.h"\r
 \r

-#if defined(ENABLE_TPI_PROTOCOL) || defined(__DOXYGEN__)\r
+#if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)\r

 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r
 volatile bool               IsSending;\r
 \r
 \r
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */\r
 volatile bool               IsSending;\r
 \r

-#if !defined(TPI_VIA_HARDWARE_USART)\r
+#if !defined(XPROG_VIA_HARDWARE_USART)\r

 /** Software USART raw frame bits for transmission/reception. */\r
 volatile uint16_t           SoftUSART_Data;\r
 \r
 /** Software USART raw frame bits for transmission/reception. */\r
 volatile uint16_t           SoftUSART_Data;\r
 \r


@@ -105,7 +105,7 @@ void TPITarget_EnableTargetTPI(void)
        asm volatile ("NOP"::);\r
        asm volatile ("NOP"::);\r
 \r
        asm volatile ("NOP"::);\r
        asm volatile ("NOP"::);\r
 \r

-#if defined(TPI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Set Tx and XCK as outputs, Rx as input */\r
        DDRD |=  (1 << 5) | (1 << 3);\r
        DDRD &= ~(1 << 2);\r
        /* Set Tx and XCK as outputs, Rx as input */\r
        DDRD |=  (1 << 5) | (1 << 3);\r
        DDRD &= ~(1 << 2);\r


@@ -141,7 +141,7 @@ void TPITarget_EnableTargetTPI(void)
 /** Disables the target's TPI interface, exits programming mode and starts the target's application. */\r
 void TPITarget_DisableTargetTPI(void)\r
 {\r
 /** Disables the target's TPI interface, exits programming mode and starts the target's application. */\r
 void TPITarget_DisableTargetTPI(void)\r
 {\r

-#if defined(TPI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
        UCSR1B  = 0;\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
        UCSR1B  = 0;\r


@@ -171,7 +171,7 @@ void TPITarget_DisableTargetTPI(void)
  */\r
 void TPITarget_SendByte(const uint8_t Byte)\r
 {\r
  */\r
 void TPITarget_SendByte(const uint8_t Byte)\r
 {\r

-#if defined(TPI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r
        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r


@@ -224,7 +224,7 @@ void TPITarget_SendByte(const uint8_t Byte)
  */\r
 uint8_t TPITarget_ReceiveByte(void)\r
 {\r
  */\r
 uint8_t TPITarget_ReceiveByte(void)\r
 {\r

-#if defined(TPI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Rx mode if currently in Tx mode */\r
        if (IsSending)\r
        {\r
        /* Switch to Rx mode if currently in Tx mode */\r
        if (IsSending)\r
        {\r


@@ -267,7 +267,7 @@ uint8_t TPITarget_ReceiveByte(void)
 /** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */\r
 void TPITarget_SendBreak(void)\r
 {\r
 /** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */\r
 void TPITarget_SendBreak(void)\r
 {\r

-#if defined(TPI_VIA_HARDWARE_USART)\r
+#if defined(XPROG_VIA_HARDWARE_USART)\r

        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r
        /* Switch to Tx mode if currently in Rx mode */\r
        if (!(IsSending))\r
        {\r

diff --git a/Projects/AVRISP/Lib/XPROG/TPITarget.h b/Projects/AVRISP/Lib/XPROG/TPITarget.h
index 596bdce..8dc176b 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/TPITarget.h
+++ b/Projects/AVRISP/Lib/XPROG/TPITarget.h
@@ -46,10 +46,9 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
                        #endif\r
                #endif\r
 \r

diff --git a/Projects/AVRISP/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP/Lib/XPROG/XMEGANVM.c
index ed8719c..dffa62d 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP/Lib/XPROG/XMEGANVM.c
@@ -36,7 +36,7 @@
 #define  INCLUDE_FROM_XMEGA_NVM_C\r
 #include "XMEGANVM.h"\r
 \r
 #define  INCLUDE_FROM_XMEGA_NVM_C\r
 #include "XMEGANVM.h"\r
 \r

-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
+#if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)\r

 \r
 /** Sends the given NVM register address to the target.\r
  *\r
 \r
 /** Sends the given NVM register address to the target.\r
  *\r

diff --git a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
index c91522d..4ae2ce4 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
+++ b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
@@ -49,10 +49,9 @@
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
 \r
                        #endif\r
                #endif\r
 \r

diff --git a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
index ed51460..d919413 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
@@ -30,23 +30,27 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  PDI Protocol handler, to process V2 Protocol wrapped PDI commands used in Atmel programmer devices.\r
+ *  XPROG Protocol handler, to process V2 Protocol wrapped XPROG commands used in Atmel programmer devices.\r

  */\r
 \r
  */\r
 \r

-#define  INCLUDE_FROM_PDIPROTOCOL_C\r
-#include "PDIProtocol.h"\r
+#define  INCLUDE_FROM_XPROGPROTOCOL_C\r
+#include "XPROGProtocol.h"\r

 \r
 \r

-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
+#if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)\r

 /** Base absolute address for the target's NVM controller */\r
 uint32_t XPROG_Param_NVMBase = 0x010001C0;\r
 \r
 /** Size in bytes of the target's EEPROM page */\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r
 /** Base absolute address for the target's NVM controller */\r
 uint32_t XPROG_Param_NVMBase = 0x010001C0;\r
 \r
 /** Size in bytes of the target's EEPROM page */\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r

-/** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI\r
- *  XMEGA programming (either PDI or JTAG). Only PDI programming is supported.\r
+/** Currently selected XPROG programming protocol */\r
+uint8_t  XPROG_SelectedProtocol;\r
+\r
+\r
+/** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI\r
+ *  programming.\r

  */\r
  */\r

-void PDIProtocol_XPROG_SetMode(void)\r
+void XPROGProtocol_SetMode(void)\r

 {\r
        struct\r
        {\r
 {\r
        struct\r
        {\r


@@ -58,66 +62,75 @@ void PDIProtocol_XPROG_SetMode(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       Serial_TxByte(SetMode_XPROG_Params.Protocol);\r
+       XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;\r

        \r
        Endpoint_Write_Byte(CMD_XPROG_SETMODE);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG_SETMODE);\r

-       Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol == XPRG_PROTOCOL_PDI) ? STATUS_CMD_OK : STATUS_CMD_FAILED);\r
+       Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol != XPRG_PROTOCOL_JTAG) ? STATUS_CMD_OK : STATUS_CMD_FAILED);\r

        Endpoint_ClearIN();     \r
 }\r
 \r
 /** Handler for the CMD_XPROG command, which wraps up XPROG commands in a V2 wrapper which need to be\r
  *  removed and processed so that the underlying XPROG command can be handled.\r
  */\r
        Endpoint_ClearIN();     \r
 }\r
 \r
 /** Handler for the CMD_XPROG command, which wraps up XPROG commands in a V2 wrapper which need to be\r
  *  removed and processed so that the underlying XPROG command can be handled.\r
  */\r

-void PDIProtocol_XPROG_Command(void)\r
+void XPROGProtocol_Command(void)\r

 {\r
        uint8_t XPROGCommand = Endpoint_Read_Byte();\r
 \r
        switch (XPROGCommand)\r
        {\r
                case XPRG_CMD_ENTER_PROGMODE:\r
 {\r
        uint8_t XPROGCommand = Endpoint_Read_Byte();\r
 \r
        switch (XPROGCommand)\r
        {\r
                case XPRG_CMD_ENTER_PROGMODE:\r

-                       PDIProtocol_EnterXPROGMode();\r
+                       XPROGProtocol_EnterXPROGMode();\r

                        break;\r
                case XPRG_CMD_LEAVE_PROGMODE:\r
                        break;\r
                case XPRG_CMD_LEAVE_PROGMODE:\r

-                       PDIProtocol_LeaveXPROGMode();\r
+                       XPROGProtocol_LeaveXPROGMode();\r

                        break;\r
                case XPRG_CMD_ERASE:\r
                        break;\r
                case XPRG_CMD_ERASE:\r

-                       PDIProtocol_Erase();\r
+                       XPROGProtocol_Erase();\r

                        break;\r
                case XPRG_CMD_WRITE_MEM:\r
                        break;\r
                case XPRG_CMD_WRITE_MEM:\r

-                       PDIProtocol_WriteMemory();\r
+                       XPROGProtocol_WriteMemory();\r

                        break;\r
                case XPRG_CMD_READ_MEM:\r
                        break;\r
                case XPRG_CMD_READ_MEM:\r

-                       PDIProtocol_ReadMemory();\r
+                       XPROGProtocol_ReadMemory();\r

                        break;\r
                case XPRG_CMD_CRC:\r
                        break;\r
                case XPRG_CMD_CRC:\r

-                       PDIProtocol_ReadCRC();\r
+                       XPROGProtocol_ReadCRC();\r

                        break;\r
                case XPRG_CMD_SET_PARAM:\r
                        break;\r
                case XPRG_CMD_SET_PARAM:\r

-                       PDIProtocol_SetParam();\r
+                       XPROGProtocol_SetParam();\r

                        break;\r
        }\r
 }\r
 \r
                        break;\r
        }\r
 }\r
 \r

-/** Handler for the XPROG ENTER_PROGMODE command to establish a PDI connection with the attached device. */\r
-static void PDIProtocol_EnterXPROGMode(void)\r
+/** Handler for the XPROG ENTER_PROGMODE command to establish a connection with the attached device. */\r
+static void XPROGProtocol_EnterXPROGMode(void)\r

 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       /* Enable PDI programming mode with the attached target */\r
-       PDITarget_EnableTargetPDI();\r
-       \r
-       /* Store the RESET key into the RESET PDI register to keep the XMEGA in reset */\r
-       PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
-       PDITarget_SendByte(PDI_RESET_KEY);\r
+       bool NVMBusEnabled;\r

 \r
 \r

-       /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */\r
-       PDITarget_SendByte(PDI_CMD_KEY);        \r
-       for (uint8_t i = sizeof(PDI_NVMENABLE_KEY); i > 0; i--)\r
-         PDITarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);\r
-\r
-       /* Wait until the NVM bus becomes active */\r
-       bool NVMBusEnabled = PDITarget_WaitWhileNVMBusBusy();\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
+       {\r
+               /* Enable PDI programming mode with the attached target */\r
+               PDITarget_EnableTargetPDI();\r
+               \r
+               /* Store the RESET key into the RESET PDI register to keep the XMEGA in reset */\r
+               PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
+               PDITarget_SendByte(PDI_RESET_KEY);\r
+\r
+               /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */\r
+               PDITarget_SendByte(PDI_CMD_KEY);        \r
+               for (uint8_t i = sizeof(PDI_NVMENABLE_KEY); i > 0; i--)\r
+                 PDITarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);\r
+\r
+               /* Wait until the NVM bus becomes active */\r
+               NVMBusEnabled = PDITarget_WaitWhileNVMBusBusy();\r
+       }\r
+       else\r
+       {\r
+               // TODO\r
+       }\r

        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);\r


@@ -128,17 +141,24 @@ static void PDIProtocol_EnterXPROGMode(void)
 /** Handler for the XPROG LEAVE_PROGMODE command to terminate the PDI programming connection with\r
  *  the attached device.\r
  */\r
 /** Handler for the XPROG LEAVE_PROGMODE command to terminate the PDI programming connection with\r
  *  the attached device.\r
  */\r

-static void PDIProtocol_LeaveXPROGMode(void)\r
+static void XPROGProtocol_LeaveXPROGMode(void)\r

 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       /* Clear the RESET key in the RESET PDI register to allow the XMEGA to run */\r
-       PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
-       PDITarget_SendByte(0x00);\r
-\r
-       PDITarget_DisableTargetPDI();\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
+       {\r
+               /* Clear the RESET key in the RESET PDI register to allow the XMEGA to run */\r
+               PDITarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);       \r
+               PDITarget_SendByte(0x00);\r

 \r
 \r

+               PDITarget_DisableTargetPDI();\r
+       }\r
+       else\r
+       {\r
+               // TODO\r
+       }\r
+       \r

        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);\r
        Endpoint_Write_Byte(XPRG_ERR_OK);\r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);\r
        Endpoint_Write_Byte(XPRG_ERR_OK);\r


@@ -146,7 +166,7 @@ static void PDIProtocol_LeaveXPROGMode(void)
 }\r
 \r
 /** Handler for the XPRG ERASE command to erase a specific memory address space in the attached device. */\r
 }\r
 \r
 /** Handler for the XPRG ERASE command to erase a specific memory address space in the attached device. */\r

-static void PDIProtocol_Erase(void)\r
+static void XPROGProtocol_Erase(void)\r

 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r


@@ -164,27 +184,34 @@ static void PDIProtocol_Erase(void)
        \r
        uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP;\r
        \r
        \r
        uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP;\r
        \r

-       /* Determine which NVM command to send to the device depending on the memory to erase */\r
-       if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
-         EraseCommand = XMEGA_NVM_CMD_CHIPERASE;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;\r
-       else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
-         EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;\r
-       \r
-       /* Erase the target memory, indicate timeout if ocurred */\r
-       if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r
-         ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
+       {\r
+               /* Determine which NVM command to send to the device depending on the memory to erase */\r
+               if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
+                 EraseCommand = XMEGA_NVM_CMD_CHIPERASE;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;\r
+               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
+                 EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;\r
+               \r
+               /* Erase the target memory, indicate timeout if ocurred */\r
+               if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r
+                 ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       }\r
+       else\r
+       {\r
+               // TODO\r
+       }\r

        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ERASE);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_ERASE);\r


@@ -193,7 +220,7 @@ static void PDIProtocol_Erase(void)
 }\r
 \r
 /** Handler for the XPROG WRITE_MEMORY command to write to a specific memory space within the attached device. */\r
 }\r
 \r
 /** Handler for the XPROG WRITE_MEMORY command to write to a specific memory space within the attached device. */\r

-static void PDIProtocol_WriteMemory(void)\r
+static void XPROGProtocol_WriteMemory(void)\r

 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r


@@ -220,46 +247,53 @@ static void PDIProtocol_WriteMemory(void)
        uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF;\r
        uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF;\r
        bool    PagedMemory      = true;\r
        uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF;\r
        uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF;\r
        bool    PagedMemory      = true;\r

-       \r
-       if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
-       {\r
-               WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;\r
-       }\r
-       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
-       {\r
-               WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;\r
-       }\r
-       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
-       {\r
-               WriteCommand     = XMEGA_NVM_CMD_WRITEEEPROMPAGE;\r
-               WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;\r
-               EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;\r
-       }\r
-       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
-       {\r
-               /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */\r
-               WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);\r
-               WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;\r
-       }\r
-       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
-       {\r
-               WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;\r
-               PagedMemory      = false;\r
-       }\r
-       else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
+\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r

        {\r
        {\r

-               WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;\r
-               PagedMemory      = false;\r
+               if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
+               {\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;\r
+               }\r
+               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
+               {\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;\r
+               }\r
+               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
+               {\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITEEEPROMPAGE;\r
+                       WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;\r
+                       EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;\r
+               }\r
+               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
+               {\r
+                       /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */\r
+                       WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;\r
+               }\r
+               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
+               {\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;\r
+                       PagedMemory      = false;\r
+               }\r
+               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
+               {\r
+                       WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;\r
+                       PagedMemory      = false;\r
+               }\r
+               \r
+               /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r
+               if ((PagedMemory && !XMEGANVM_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r
+                                                                                                          WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,\r
+                                                                                                          WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) ||\r
+                  (!PagedMemory && !XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,\r
+                                                                                                          WriteMemory_XPROG_Params.ProgData)))\r
+               {\r
+                       ReturnStatus = XPRG_ERR_TIMEOUT;\r
+               }\r

        }\r
        }\r

-       \r
-       /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r
-       if ((PagedMemory && !XMEGANVM_WritePageMemory(WriteBuffCommand, EraseBuffCommand, WriteCommand, \r
-                                                          WriteMemory_XPROG_Params.PageMode, WriteMemory_XPROG_Params.Address,\r
-                                                          WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length)) ||\r
-          (!PagedMemory && !XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,\r
-                                                      WriteMemory_XPROG_Params.ProgData)))\r
+       else\r

        {\r
        {\r

-               ReturnStatus = XPRG_ERR_TIMEOUT;\r
+               // TODO\r

        }\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        }\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r


@@ -271,7 +305,7 @@ static void PDIProtocol_WriteMemory(void)
 /** Handler for the XPROG READ_MEMORY command to read data from a specific address space within the\r
  *  attached device.\r
  */\r
 /** Handler for the XPROG READ_MEMORY command to read data from a specific address space within the\r
  *  attached device.\r
  */\r

-static void PDIProtocol_ReadMemory(void)\r
+static void XPROGProtocol_ReadMemory(void)\r

 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r


@@ -291,9 +325,16 @@ static void PDIProtocol_ReadMemory(void)
 \r
        uint8_t ReadBuffer[256];\r
        \r
 \r
        uint8_t ReadBuffer[256];\r
        \r

-       /* Read the target's memory, indicate timeout if occurred */\r
-       if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))\r
-         ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
+       {\r
+               /* Read the target's memory, indicate timeout if occurred */\r
+               if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))\r
+                 ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       }\r
+       else\r
+       {\r
+               // TODO\r
+       }\r

 \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r
 \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_READ_MEM);\r


@@ -308,7 +349,7 @@ static void PDIProtocol_ReadMemory(void)
 /** Handler for the XPROG CRC command to read a specific memory space's CRC value for comparison between the\r
  *  attached device's memory and a data set on the host.\r
  */\r
 /** Handler for the XPROG CRC command to read a specific memory space's CRC value for comparison between the\r
  *  attached device's memory and a data set on the host.\r
  */\r

-static void PDIProtocol_ReadCRC(void)\r
+static void XPROGProtocol_ReadCRC(void)\r

 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
        \r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
        \r


@@ -324,17 +365,24 @@ static void PDIProtocol_ReadCRC(void)
        uint8_t  CRCCommand = XMEGA_NVM_CMD_NOOP;\r
        uint32_t MemoryCRC;\r
 \r
        uint8_t  CRCCommand = XMEGA_NVM_CMD_NOOP;\r
        uint32_t MemoryCRC;\r
 \r

-       /* Determine which NVM command to send to the device depending on the memory to CRC */\r
-       if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
-         CRCCommand = XMEGA_NVM_CMD_APPCRC;\r
-       else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
-         CRCCommand = XMEGA_NVM_CMD_BOOTCRC;\r
+       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
+       {\r
+               /* Determine which NVM command to send to the device depending on the memory to CRC */\r
+               if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
+                 CRCCommand = XMEGA_NVM_CMD_APPCRC;\r
+               else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
+                 CRCCommand = XMEGA_NVM_CMD_BOOTCRC;\r
+               else\r
+                 CRCCommand = XMEGA_NVM_CMD_FLASHCRC;\r
+               \r
+               /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r
+               if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r
+                 ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       }\r

        else\r
        else\r

-         CRCCommand = XMEGA_NVM_CMD_FLASHCRC;\r
-       \r
-       /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r
-       if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r
-         ReturnStatus = XPRG_ERR_TIMEOUT;\r
+       {\r
+               // TODO\r
+       }\r

        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r
        \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_Write_Byte(XPRG_CMD_CRC);\r


@@ -349,10 +397,10 @@ static void PDIProtocol_ReadCRC(void)
        Endpoint_ClearIN();     \r
 }\r
 \r
        Endpoint_ClearIN();     \r
 }\r
 \r

-/** Handler for the XPROG SET_PARAM command to set a PDI parameter for use when communicating with the\r
+/** Handler for the XPROG SET_PARAM command to set a XPROG parameter for use when communicating with the\r

  *  attached device.\r
  */\r
  *  attached device.\r
  */\r

-static void PDIProtocol_SetParam(void)\r
+static void XPROGProtocol_SetParam(void)\r

 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r
 {\r
        uint8_t ReturnStatus = XPRG_ERR_OK;\r
 \r

diff --git a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
index 9a10abb..847652e 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
@@ -30,11 +30,11 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  Header file for PDIProtocol.c.\r
+ *  Header file for XPROGProtocol.c.\r

  */\r
 \r
  */\r
 \r

-#ifndef _PDI_PROTOCOL_\r
-#define _PDI_PROTOCOL_\r
+#ifndef _XPROG_PROTOCOL_\r
+#define _XPROG_PROTOCOL_\r

 \r
        /* Includes: */\r
                #include <avr/io.h>\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r


@@ -46,14 +46,15 @@
                #include "../V2Protocol.h"\r
                #include "PDITarget.h"\r
                #include "XMEGANVM.h"\r
                #include "../V2Protocol.h"\r
                #include "PDITarget.h"\r
                #include "XMEGANVM.h"\r

+               #include "TPITarget.h"\r
+               #include "TINYNVM.h"\r

 \r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r
 \r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #undef ENABLE_ISP_PROTOCOL\r

-                       #undef ENABLE_TPI_PROTOCOL\r

                        \r
                        \r

-                       #if !defined(ENABLE_PDI_PROTOCOL)\r
-                               #define ENABLE_PDI_PROTOCOL\r
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r

                        #endif\r
                #endif\r
        \r
                        #endif\r
                #endif\r
        \r


@@ -109,17 +110,17 @@
                extern uint32_t XPROG_Param_NVMBase;\r
                \r
        /* Function Prototypes: */\r
                extern uint32_t XPROG_Param_NVMBase;\r
                \r
        /* Function Prototypes: */\r

-               void PDIProtocol_XPROG_SetMode(void);\r
-               void PDIProtocol_XPROG_Command(void);\r
+               void XPROGProtocol_SetMode(void);\r
+               void XPROGProtocol_Command(void);\r

                \r
                \r

-               #if defined(INCLUDE_FROM_PDIPROTOCOL_C)\r
-                       static void PDIProtocol_EnterXPROGMode(void);\r
-                       static void PDIProtocol_LeaveXPROGMode(void);\r
-                       static void PDIProtocol_SetParam(void);\r
-                       static void PDIProtocol_Erase(void);\r
-                       static void PDIProtocol_WriteMemory(void);\r
-                       static void PDIProtocol_ReadMemory(void);\r
-                       static void PDIProtocol_ReadCRC(void);\r
+               #if defined(INCLUDE_FROM_XPROGPROTOCOL_C)\r
+                       static void XPROGProtocol_EnterXPROGMode(void);\r
+                       static void XPROGProtocol_LeaveXPROGMode(void);\r
+                       static void XPROGProtocol_SetParam(void);\r
+                       static void XPROGProtocol_Erase(void);\r
+                       static void XPROGProtocol_WriteMemory(void);\r
+                       static void XPROGProtocol_ReadMemory(void);\r
+                       static void XPROGProtocol_ReadCRC(void);\r

                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 196eb79..8db6ac9 100644 (file)
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -199,8 +199,7 @@ CDEFS += -DRESET_LINE_DDR=DDRB
 CDEFS += -DRESET_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DRESET_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 CDEFS += -DENABLE_ISP_PROTOCOL\r

-CDEFS += -DENABLE_PDI_PROTOCOL\r
-CDEFS += -DENABLE_TPI_PROTOCOL\r
+CDEFS += -DENABLE_XPROG_PROTOCOL\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r