diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-30 19:47:31 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-30 19:47:31 +0000 |
| commit | afd828c095f38753e989391eab670b8736e4bd6e (patch) | |
| tree | bb0a474d996a6ea9232c7a3e342b5672a3ee2efc /Demos/Device/ClassDriver | |
| parent | 30f6d2bfd82995e0fa346b3b4eb33861f6a0fde3 (diff) | |
| download | lufa-afd828c095f38753e989391eab670b8736e4bd6e.tar.gz lufa-afd828c095f38753e989391eab670b8736e4bd6e.tar.bz2 lufa-afd828c095f38753e989391eab670b8736e4bd6e.zip | |
Removed SerialStream module, rolled functionality into the base USART Serial peripheral driver instead through the new Serial_CreateStream() and Serial_CreateBlockingStream() methods.
Renamed the Serial byte send/receive functions to remain consistent with the CDC driver's byte functions.
Altered the serial byte receive function to make it non-blocking.
Diffstat (limited to 'Demos/Device/ClassDriver')
4 files changed, 7 insertions, 5 deletions
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h index 108b90cae..d798c2251 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h @@ -41,7 +41,7 @@ #include <avr/pgmspace.h> #include <stdio.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "EthernetProtocols.h" #include "Ethernet.h" diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c index c9b5ad9ce..585604672 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c @@ -104,8 +104,11 @@ void SetupHardware(void) /* Hardware Initialization */ LEDs_Init(); - SerialStream_Init(9600, false); + Serial_Init(9600, false); USB_Init(); + + /* Create a stdio stream for the serial port for stdin and stdout */ + Serial_CreateStream(NULL); } /** Event handler for the library USB Connection event. */ diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h index fa242ecf6..8509a8d28 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h @@ -52,7 +52,7 @@ #include <LUFA/Version.h> #include <LUFA/Drivers/Board/LEDs.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Stream.h> #include <LUFA/Drivers/USB/USB.h> /* Macros: */ diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile index 2d3e5d541..e4e227453 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/makefile +++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile @@ -149,8 +149,7 @@ SRC = $(TARGET).c \ Lib/Webserver.c \ $(LUFA_SRC_USB) \ $(LUFA_SRC_USBCLASS) \ - $(LUFA_SRC_SERIAL) \ - $(LUFA_SRC_SERIALSTREAM) + $(LUFA_SRC_SERIAL) # List C++ source files here. (C dependencies are automatically generated.) |