diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-01-30 19:47:31 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-01-30 19:47:31 +0000 |
| commit | 7ddd744fcae1d66f975b01ba9333d4a3e3862db6 (patch) | |
| tree | bb0a474d996a6ea9232c7a3e342b5672a3ee2efc /Demos/Host/ClassDriver/MassStorageHost | |
| parent | ea9c2018d7920a35f318b57d138b722c53765421 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1646 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Host/ClassDriver/MassStorageHost')
| -rw-r--r-- | Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c | 5 | ||||
| -rw-r--r-- | Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h | 2 | ||||
| -rw-r--r-- | Demos/Host/ClassDriver/MassStorageHost/makefile | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c index d6201747..33928788 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c @@ -243,9 +243,12 @@ void SetupHardware(void) clock_prescale_set(clock_div_1); /* Hardware Initialization */ - SerialStream_Init(9600, false); + Serial_Init(9600, false); LEDs_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/ClassDriver/MassStorageHost/MassStorageHost.h b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h index a07668db..dfc6a8f9 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h @@ -47,7 +47,7 @@ #include <LUFA/Version.h> #include <LUFA/Drivers/Misc/TerminalCodes.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/USB/USB.h> diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile index a3b7ff17..8124af81 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/makefile +++ b/Demos/Host/ClassDriver/MassStorageHost/makefile @@ -129,8 +129,7 @@ include $(LUFA_PATH)/LUFA/makefile SRC = $(TARGET).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.) |