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

[pub/USBasp.git] / Projects / AVRISP / Lib / XPROG / PDITarget.c

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