me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

Fix incorrect XMEGA serial driver stream functions (thanks to William Patterson).

Browse Source
This commit is contained in:
Dean Camera
2015-05-17 13:01:13 +10:00
parent a9364a866f
commit 366a846156
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
View File

@@ -95,19 +95,20 @@ void Serial_SendData(USART_t* const USART,
Serial_SendByte(USART, *((uint8_t*)Buffer++));
}
void Serial_CreateStream(FILE* Stream)
void Serial_CreateStream(USART_t* USART, FILE* Stream)
{
if (!(Stream))
{
Stream = &USARTSerialStream;
stdin = Stream;
stdout = Stream;
}
}
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
fdev_set_udata(Stream, USART);
}
void Serial_CreateBlockingStream(FILE* Stream)
void Serial_CreateBlockingStream(USART_t* USART, FILE* Stream)
{
if (!(Stream))
{
@@ -116,7 +117,8 @@ void Serial_CreateBlockingStream(FILE* Stream)
stdout = Stream;
}
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
fdev_set_udata(Stream, USART);
}
#endif

8
LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
View File

@@ -151,22 +151,24 @@
* be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
* line buffering.
*
* \param[in,out] USART Pointer to the base of the USART peripheral within the device.
* \param[in,out] Stream Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
* and \c stdin will be configured to use the USART.
*
* \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
*/
void Serial_CreateStream(FILE* Stream);
void Serial_CreateStream(USART_t* USART, FILE* Stream);
/** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
/** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
* the transfer.
*
* \param[in,out] USART Pointer to the base of the USART peripheral within the device.
* \param[in,out] Stream Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
* and \c stdin will be configured to use the USART.
*
* \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
*/
void Serial_CreateBlockingStream(FILE* Stream);
void Serial_CreateBlockingStream(USART_t* USART, FILE* Stream);
/* Inline Functions: */
/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to