X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3a03da970558de9211fc1a43b12bf69e38854d09..ee495ca5002da26bae51a95d1922474708a2e818:/Projects/XPLAINBridge/Lib/SoftUART.c?ds=sidebyside diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c index 12fdf96bc..4b38a0bd2 100644 --- 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 - www.fourwalledcubicle.com + www.lufa-lib.org */ /* @@ -11,13 +11,13 @@ 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 - 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 - 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 @@ -79,7 +79,7 @@ ISR(INT0_vect, ISR_BLOCK) { /* Reset the number of reception bits remaining counter */ RX_BitsRemaining = 8; - + /* Reset the bit reception timer */ TCNT1 = 0; @@ -120,7 +120,7 @@ ISR(TIMER1_CAPT_vect, ISR_BLOCK) /* 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); } } @@ -140,13 +140,14 @@ ISR(TIMER3_CAPT_vect, ISR_BLOCK) 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) */ - TX_Data = ~RingBuffer_Remove(&USBtoXMEGA_Buffer); + TX_Data = ~RingBuffer_Remove(&USBtoUART_Buffer); TX_BitsRemaining = 9; } } +