X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/11bb2f21720c2af4b29732ca128963869e5c512c..d11ed10c5314c44dc01c06954d1d73d4894cbff8:/LUFA/Drivers/Peripheral/SerialStream.c diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c index fec5f7314..fd5676aab 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.c +++ b/LUFA/Drivers/Peripheral/SerialStream.c @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, provided that the above copyright notice appear in all - copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + Copyright 2010 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 + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -28,18 +28,22 @@ this software. */ +#define INCLUDE_FROM_SERIALSTREAM_C #include "SerialStream.h" FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _FDEV_SETUP_RW); -int SerialStream_TxByte(char DataByte, FILE *Stream) +static int SerialStream_TxByte(char DataByte, FILE *Stream) { + (void)Stream; + Serial_TxByte(DataByte); - return 0; } -int SerialStream_RxByte(FILE *Stream) +static int SerialStream_RxByte(FILE *Stream) { + (void)Stream; + return Serial_RxByte(); }