Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

[pub/USBasp.git] / LUFA / Drivers / Peripheral / SerialStream.h

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 2b73628..938d8f0 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -74,20 +74,22 @@
 
                /* Function Prototypes: */
                #if defined(__INCLUDE_FROM_SERIALSTREAM_C)
 
                /* Function Prototypes: */
                #if defined(__INCLUDE_FROM_SERIALSTREAM_C)

-                       static int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);
+                       static int SerialStream_TxByte(char DataByte,
+                                                      FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);

                        static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);
                #endif
        #endif
 
        /* Public Interface - May be used in end-application: */
                /* Inline Functions: */
                        static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);
                #endif
        #endif
 
        /* Public Interface - May be used in end-application: */
                /* Inline Functions: */

-                       /** Initializes the serial stream (and regular USART driver) so that both the stream and regular
+                       /** Initialises the serial stream (and regular USART driver) so that both the stream and regular

                         *  USART driver functions can be used. Must be called before any stream or regular USART functions.
                         *
                         *  \param[in] BaudRate     Baud rate to configure the USART to.
                         *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate.
                         */
                         *  USART driver functions can be used. Must be called before any stream or regular USART functions.
                         *
                         *  \param[in] BaudRate     Baud rate to configure the USART to.
                         *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate.
                         */

-                       static inline void SerialStream_Init(const uint32_t BaudRate, const bool DoubleSpeed)
+                       static inline void SerialStream_Init(const uint32_t BaudRate,
+                                                            const bool DoubleSpeed)

                        {
                                Serial_Init(BaudRate, DoubleSpeed);
                                
                        {
                                Serial_Init(BaudRate, DoubleSpeed);