From 31daf04c6a4d6ff9813b04abd131cde57ed7cdde Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 13 Oct 2010 14:23:23 +0000 Subject: Fix SoftUART.c not compiling due to accidental check in of changes not yet complete in the rest of the XPLAINBridge project code. --- LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h | 12 ++++++++---- Projects/XPLAINBridge/Lib/SoftUART.c | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h index 0aaaa9306..9b6f87a9a 100644 --- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h +++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h @@ -81,19 +81,23 @@ #define ADC_REFERENCE_INT2560MV ((1 << REFS1) | (1 << REFS0)) /** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the - * ADC_GetResult() macro contain the 8 most significant bits of the result. */ + * ADC_GetResult() macro contain the 8 most significant bits of the result. + */ #define ADC_LEFT_ADJUSTED (1 << ADLAR) /** Right-adjusts the 10-bit ADC result, so that the lower 8 bits of the value returned by the - * ADC_GetResult() macro contain the 8 least significant bits of the result. */ + * ADC_GetResult() macro contain the 8 least significant bits of the result. + */ #define ADC_RIGHT_ADJUSTED (0 << ADLAR) /** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC - * is capable of at the given input clock speed. */ + * is capable of at the given input clock speed. + */ #define ADC_FREE_RUNNING (1 << ADATE) /** Sets the ADC mode to single conversion, so that only a single conversion will take place before - * the ADC returns to idle. */ + * the ADC returns to idle. + */ #define ADC_SINGLE_CONVERSION (0 << ADATE) /** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */ diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c index 00bb38320..20f56e7f2 100644 --- a/Projects/XPLAINBridge/Lib/SoftUART.c +++ b/Projects/XPLAINBridge/Lib/SoftUART.c @@ -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,13 @@ 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; } } -- cgit v1.2.3