aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2014-08-24 18:57:20 +1000
committerDean Camera <dean@fourwalledcubicle.com>2014-08-24 18:57:20 +1000
commit0fd7b2cf09c9088646080a911f0840348e566577 (patch)
tree5ac04c989bf21cfce127bf4f39b5fef1b42886bc
parent0ae0b1995f4acc48d11de4eb2662e92875acb789 (diff)
parent4cc04eec01037720e00e01424a9a94efa2fff846 (diff)
downloadlufa-0fd7b2cf09c9088646080a911f0840348e566577.tar.gz
lufa-0fd7b2cf09c9088646080a911f0840348e566577.tar.bz2
lufa-0fd7b2cf09c9088646080a911f0840348e566577.zip
Merge branch 'master' of github.com:abcminiuser/lufa
-rw-r--r--LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h6
1 files changed, 3 insertions, 3 deletions
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;
}