X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6b5e684c77e5fa855b609d01e9a07fec296e9257..059307d89cbdd7a45170566f469eb9e02c20b3e1:/LUFA/Drivers/Peripheral/Serial.h diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h index 103c7dbbc..4eb74b9d2 100644 --- a/LUFA/Drivers/Peripheral/Serial.h +++ b/LUFA/Drivers/Peripheral/Serial.h @@ -76,29 +76,18 @@ */ #define SERIAL_2X_UBBRVAL(baud) ((((F_CPU / 8) + (baud / 2)) / (baud)) - 1) - /* Pseudo-Function Macros: */ - #if defined(__DOXYGEN__) - /** Indicates whether a character has been received through the USART. - * - * \return Boolean true if a character has been received, false otherwise. - */ - static inline bool Serial_IsCharReceived(void); - #else - #define Serial_IsCharReceived() ((UCSR1A & (1 << RXC1)) ? true : false) - #endif - /* Function Prototypes: */ /** Transmits a given string located in program space (FLASH) through the USART. * * \param[in] FlashStringPtr Pointer to a string located in program space. */ - void Serial_TxString_P(const char *FlashStringPtr) ATTR_NON_NULL_PTR_ARG(1); + void Serial_TxString_P(const char* FlashStringPtr) ATTR_NON_NULL_PTR_ARG(1); /** Transmits a given string located in SRAM memory through the USART. * * \param[in] StringPtr Pointer to a string located in SRAM space. */ - void Serial_TxString(const char *StringPtr) ATTR_NON_NULL_PTR_ARG(1); + void Serial_TxString(const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1); /* Inline Functions: */ /** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to @@ -107,7 +96,8 @@ * \param[in] BaudRate Serial baud rate, in bits per second. * \param[in] DoubleSpeed Enables double speed mode when set, halving the sample time to double the baud rate. */ - static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed) + static inline void Serial_Init(const uint32_t BaudRate, + const bool DoubleSpeed) { UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0); UCSR1B = ((1 << TXEN1) | (1 << RXEN1)); @@ -131,11 +121,22 @@ UBRR1 = 0; } + + /** Indicates whether a character has been received through the USART. + * + * \return Boolean true if a character has been received, false otherwise. + */ + static inline bool Serial_IsCharReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; + static inline bool Serial_IsCharReceived(void) + { + return ((UCSR1A & (1 << RXC1)) ? true : false); + } /** Transmits a given byte through the USART. * * \param[in] DataByte Byte to transmit through the USART. */ + static inline void Serial_TxByte(const char DataByte) ATTR_ALWAYS_INLINE; static inline void Serial_TxByte(const char DataByte) { while (!(UCSR1A & (1 << UDRE1))); @@ -146,6 +147,7 @@ * * \return Byte received from the USART. */ + static inline char Serial_RxByte(void) ATTR_ALWAYS_INLINE; static inline char Serial_RxByte(void) { while (!(UCSR1A & (1 << RXC1)));