Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Projects / XPLAINBridge / Lib / SoftUART.c

diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c
index 12fdf96..7667bfa 100644 (file)
--- a/Projects/XPLAINBridge/Lib/SoftUART.c
+++ b/Projects/XPLAINBridge/Lib/SoftUART.c
@@ -1,9 +1,9 @@
 /*
 /*

-                        LUFA Library
-        Copyright (C) Dean Camera, 2010.
-                         
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-         www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*


@@ -11,13 +11,13 @@
   Copyright 2010  Peter Danneger
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Copyright 2010  Peter Danneger
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -67,11 +67,11 @@ void SoftUART_Init(void)
        SoftUART_SetBaud(9600);
 
        /* Setup reception timer compare ISR */
        SoftUART_SetBaud(9600);
 
        /* Setup reception timer compare ISR */

-       TIMSK1 = (1 << ICIE1);
+       TIMSK1 = (1 << OCIE1A);

 
        /* Setup transmission timer compare ISR and start the timer */
 
        /* Setup transmission timer compare ISR and start the timer */

-       TIMSK3 = (1 << ICIE3);
-       TCCR3B = ((1 << CS30) | (1 << WGM33) | (1 << WGM32));
+       TIMSK3 = (1 << OCIE3A);
+       TCCR3B = ((1 << CS30) | (1 << WGM32));

 }
 
 /** ISR to detect the start of a bit being sent to the software UART. */
 }
 
 /** ISR to detect the start of a bit being sent to the software UART. */


@@ -79,7 +79,7 @@ ISR(INT0_vect, ISR_BLOCK)
 {
        /* Reset the number of reception bits remaining counter */
        RX_BitsRemaining = 8;
 {
        /* Reset the number of reception bits remaining counter */
        RX_BitsRemaining = 8;

-       
+

        /* Reset the bit reception timer */
        TCNT1 = 0;
 
        /* Reset the bit reception timer */
        TCNT1 = 0;
 


@@ -90,12 +90,12 @@ ISR(INT0_vect, ISR_BLOCK)
                EIMSK = 0;
 
                /* Start the reception timer */
                EIMSK = 0;
 
                /* Start the reception timer */

-               TCCR1B = ((1 << CS10) | (1 << WGM13) | (1 << WGM12));
+               TCCR1B = ((1 << CS10) | (1 << WGM12));

        }
 }
 
 /** ISR to manage the reception of bits to the software UART. */
        }
 }
 
 /** ISR to manage the reception of bits to the software UART. */

-ISR(TIMER1_CAPT_vect, ISR_BLOCK)
+ISR(TIMER1_COMPA_vect, ISR_BLOCK)

 {
        /* Cache the current RX pin value for later checking */
        uint8_t SRX_Cached = (SRXPIN & (1 << SRX));
 {
        /* Cache the current RX pin value for later checking */
        uint8_t SRX_Cached = (SRXPIN & (1 << SRX));


@@ -120,12 +120,12 @@ ISR(TIMER1_CAPT_vect, ISR_BLOCK)
 
                /* Reception complete, store the received byte if stop bit valid */
                if (SRX_Cached)
 
                /* Reception complete, store the received byte if stop bit valid */
                if (SRX_Cached)

-                 RingBuffer_Insert(&XMEGAtoUSB_Buffer, RX_Data);       
+                 RingBuffer_Insert(&UARTtoUSB_Buffer, RX_Data);

        }
 }
 
 /** ISR to manage the transmission of bits via the software UART. */
        }
 }
 
 /** ISR to manage the transmission of bits via the software UART. */

-ISR(TIMER3_CAPT_vect, ISR_BLOCK)
+ISR(TIMER3_COMPA_vect, ISR_BLOCK)

 {
        /* Check if transmission has finished */
        if (TX_BitsRemaining)
 {
        /* Check if transmission has finished */
        if (TX_BitsRemaining)


@@ -140,13 +140,14 @@ ISR(TIMER3_CAPT_vect, ISR_BLOCK)
                TX_Data >>= 1;
                TX_BitsRemaining--;
        }
                TX_Data >>= 1;
                TX_BitsRemaining--;
        }

-       else if (!(RX_BitsRemaining) && !(RingBuffer_IsEmpty(&USBtoXMEGA_Buffer)))
+       else if (!(RX_BitsRemaining) && !(RingBuffer_IsEmpty(&USBtoUART_Buffer)))

        {
                /* Start bit - TX line low */
                STXPORT &= ~(1 << STX);
 
                /* Transmission complete, get the next byte to send (if available) */
        {
                /* Start bit - TX line low */
                STXPORT &= ~(1 << STX);
 
                /* Transmission complete, get the next byte to send (if available) */

-               TX_Data          = ~RingBuffer_Remove(&USBtoXMEGA_Buffer);
+               TX_Data          = ~RingBuffer_Remove(&USBtoUART_Buffer);

                TX_BitsRemaining = 9;
        }
 }
                TX_BitsRemaining = 9;
        }
 }

+