aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-04-29 18:35:19 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-04-29 18:35:19 +0000
commit16e8fe9878944f7bcd69cb6e6636ba8b9c574ab9 (patch)
treecfa5993b63d0189273a76f60348141b9da71648b
parent5e55be1004da26523aa7b85b24e262e5423a102c (diff)
downloadlufa-16e8fe9878944f7bcd69cb6e6636ba8b9c574ab9.tar.gz
lufa-16e8fe9878944f7bcd69cb6e6636ba8b9c574ab9.tar.bz2
lufa-16e8fe9878944f7bcd69cb6e6636ba8b9c574ab9.zip
Fix Serial peripheral driver compile error for XMEGA devices.
-rw-r--r--LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c4
-rw-r--r--LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h4
-rw-r--r--Maintenance/makefile1
3 files changed, 5 insertions, 4 deletions
diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
index 3d6195268..c7dcd619b 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
+++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
@@ -95,7 +95,7 @@ void Serial_SendData(USART_t* const USART,
Serial_SendByte(USART, *((uint8_t*)Buffer++));
}
-void Serial_CreateStream(FILE* const Stream)
+void Serial_CreateStream(FILE* Stream)
{
if (!(Stream))
{
@@ -107,7 +107,7 @@ void Serial_CreateStream(FILE* const Stream)
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
}
-void Serial_CreateBlockingStream(FILE* const Stream)
+void Serial_CreateBlockingStream(FILE* Stream)
{
if (!(Stream))
{
diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
index 6d8e6ee6e..b5af9c6e2 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
@@ -156,7 +156,7 @@
*
* \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
*/
- void Serial_CreateStream(FILE* const Stream);
+ void Serial_CreateStream(FILE* Stream);
/** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
* the transfer.
@@ -166,7 +166,7 @@
*
* \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
*/
- void Serial_CreateBlockingStream(FILE* const Stream);
+ void Serial_CreateBlockingStream(FILE* Stream);
/* Inline Functions: */
/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to
diff --git a/Maintenance/makefile b/Maintenance/makefile
index df0403775..a0a19bcd5 100644
--- a/Maintenance/makefile
+++ b/Maintenance/makefile
@@ -19,6 +19,7 @@ function-list:
$(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT))/LUFA doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_HTML=no GENERATE_XML=yes"
@xsltproc $(patsubst %/,%,$(LUFA_ROOT))/LUFA/Documentation/xml/combine.xslt $(patsubst %/,%,$(LUFA_ROOT))/LUFA/Documentation/xml/index.xml > temp.xml
@xsltproc lufa_functionlist_transform.xslt temp.xml > function_list.h
+ @cat function_list.h | sort | uniq > function_list_unique.h
@rm temp.xml
# Update all Doxygen configuration files to the latest Doxygen version - force Markdown support to be disabled