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/Host/LowLevel/MassStorageHost | |
| 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/Host/LowLevel/MassStorageHost')
| -rw-r--r-- | Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c | 5 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h | 2 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/MassStorageHost/makefile | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c index a595d1144..5030b85c4 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c @@ -70,10 +70,13 @@ void SetupHardware(void) clock_prescale_set(clock_div_1); /* Hardware Initialization */ - SerialStream_Init(9600, false); + Serial_Init(9600, false); LEDs_Init(); Buttons_Init(); USB_Init(); + + /* Create a stdio stream for the serial port for stdin and stdout */ + Serial_CreateStream(NULL); } /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h index c148dfc82..92bfb65b5 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h @@ -53,7 +53,7 @@ #include <LUFA/Version.h> #include <LUFA/Drivers/Misc/TerminalCodes.h> #include <LUFA/Drivers/USB/USB.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/Buttons.h> diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile index ec2e35b6f..ce38971dd 100644 --- a/Demos/Host/LowLevel/MassStorageHost/makefile +++ b/Demos/Host/LowLevel/MassStorageHost/makefile @@ -130,8 +130,7 @@ SRC = $(TARGET).c \ ConfigDescriptor.c \ Lib/MassStoreCommands.c \ $(LUFA_SRC_USB) \ - $(LUFA_SRC_SERIAL) \ - $(LUFA_SRC_SERIALSTREAM) + $(LUFA_SRC_SERIAL) # List C++ source files here. (C dependencies are automatically generated.) |