X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/eee252603be67c539f9986cde76454f756e55d95..7b5b8f199f0290d2befcde56fb99fe68c61d15ff:/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h index 7816b5d9d..c4864ab7e 100644 --- a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2012. + Copyright (C) Dean Camera, 2013. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -53,13 +53,13 @@ * \code * // Initialize the serial USART driver before first use, with 9600 baud (and no double-speed mode) * Serial_Init(9600, false); - * + * * // Send a string through the USART * Serial_SendString("Test String\r\n"); * * // Send a raw byte through the USART * Serial_SendByte(0xDC); - * + * * // Receive a byte through the USART (or -1 if no data received) * int16_t DataByte = Serial_ReceiveByte(); * \endcode @@ -136,7 +136,7 @@ * \param[in] Buffer Pointer to a buffer containing the data to send. * \param[in] Length Length of the data to send, in bytes. */ - void Serial_SendData(const uint8_t* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1); + void Serial_SendData(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1); /** Creates a standard character stream from the USART so that it can be used with all the regular functions * in the avr-libc \c library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created @@ -153,7 +153,7 @@ * \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used. */ void Serial_CreateStream(FILE* Stream); - + /** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates * the transfer. * @@ -172,6 +172,8 @@ * \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) { UBRR1 = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate)); @@ -185,6 +187,7 @@ } /** Turns off the USART driver, disabling and returning used hardware to their default configuration. */ + static inline void Serial_Disable(void); static inline void Serial_Disable(void) { UCSR1B = 0;