gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -19,7 +19,7 @@
* exit automatically unless an external reset was the last reset cause (thanks to Alex Kazik) * exit automatically unless an external reset was the last reset cause (thanks to Alex Kazik)
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - None. * - Fixed broken XMEGA serial stream driver due to missing USART base pointer parameter (thanks to William Patterson)
* *
* \section Sec_ChangeLog140928 Version 140928 * \section Sec_ChangeLog140928 Version 140928
* <b>New:</b> * <b>New:</b>

3
LUFA/DoxygenPages/MigrationInformation.txt
View File

@ -12,7 +12,8 @@
* *
* \section Sec_MigrationXXXXXX Migrating from 140928 to XXXXXX * \section Sec_MigrationXXXXXX Migrating from 140928 to XXXXXX
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>
* - The ATPROGRAM LUFA build system module now defaults to the Atmel ICE debuger tool, instead of the Atmel JTAG ICE3. * - The ATPROGRAM LUFA build system module now defaults to the Atmel ICE debugger tool, instead of the Atmel JTAG ICE3.
* - The \x Serial_CreateStream() and \c Serial_CreateBlockingStream() functions now require a USART base pointer for XMEGA devices as the first parameter.
* *
* \section Sec_Migration140928 Migrating from 140302 to 140928 * \section Sec_Migration140928 Migrating from 140302 to 140928
* <b>Device Mode</b> * <b>Device Mode</b>

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++)); Serial_SendByte(USART, *((uint8_t*)Buffer++));
} }
void Serial_CreateStream(FILE* Stream) void Serial_CreateStream(USART_t* USART, FILE* Stream)
{ {
if (!(Stream)) if (!(Stream))
{ {
Stream = &USARTSerialStream; Stream = &USARTSerialStream;
stdin = Stream; stdin = Stream;
stdout = 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)) if (!(Stream))
{ {
@ -116,7 +117,8 @@ void Serial_CreateBlockingStream(FILE* Stream)
stdout = 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 #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 * 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. * 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 * \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. * 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. * \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. * 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 * \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. * 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. * \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: */ /* Inline Functions: */
/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to /** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to