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

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

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