From: Dean Camera Date: Sun, 24 Aug 2014 08:57:20 +0000 (+1000) Subject: Merge branch 'master' of github.com:abcminiuser/lufa X-Git-Tag: LUFA-140928~23 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/0fd7b2cf09c9088646080a911f0840348e566577?hp=0ae0b1995f4acc48d11de4eb2662e92875acb789 Merge branch 'master' of github.com:abcminiuser/lufa --- diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h index e7f9fee24..ad34c8535 100644 --- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h +++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h @@ -226,7 +226,7 @@ static inline bool Serial_IsSendReady(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1); static inline bool Serial_IsSendReady(USART_t* const USART) { - return (USART->STATUS & USART_DREIF_bm) ? true : false); + return (USART->STATUS & USART_DREIF_bm) ? true : false; } /** Indicates whether the hardware USART transmit buffer is completely empty, indicating all @@ -239,7 +239,7 @@ static inline bool Serial_IsSendComplete(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1); static inline bool Serial_IsSendComplete(USART_t* const USART) { - return (USART->STATUS & USART_TCXIF_bm) ? true : false); + return (USART->STATUS & USART_TXCIF_bm) ? true : false; } /** Transmits a given byte through the USART. @@ -255,7 +255,7 @@ static inline void Serial_SendByte(USART_t* const USART, const char DataByte) { - while (!(Serial_IsSendReady(USART)); + while (!(Serial_IsSendReady(USART))); USART->DATA = DataByte; }