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/Incomplete | |
| 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/Incomplete')
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Sideshow.c | 5 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Sideshow.h | 2 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/makefile | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c index 4b6b26846..09076e153 100644 --- a/Demos/Device/Incomplete/Sideshow/Sideshow.c +++ b/Demos/Device/Incomplete/Sideshow/Sideshow.c @@ -80,7 +80,10 @@ void SetupHardware(void) /* Hardware Initialization */ LEDs_Init(); USB_Init(); - SerialStream_Init(9600, false); + Serial_Init(9600, false); + + /* Create a stdio stream for the serial port for stdin and stdout */ + Serial_CreateStream(NULL); } void EVENT_USB_Device_Connect(void) diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.h b/Demos/Device/Incomplete/Sideshow/Sideshow.h index 6bbf4b5a5..eaa2c1dd3 100644 --- a/Demos/Device/Incomplete/Sideshow/Sideshow.h +++ b/Demos/Device/Incomplete/Sideshow/Sideshow.h @@ -43,7 +43,7 @@ #include <LUFA/Version.h> #include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/Board/LEDs.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> /* Macros: */ /** Device control request for used in the Microsoft OS Descriptor for retrieving the OS Feature diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile index 81756c12b..206017549 100644 --- a/Demos/Device/Incomplete/Sideshow/makefile +++ b/Demos/Device/Incomplete/Sideshow/makefile @@ -135,8 +135,7 @@ SRC = $(TARGET).c \ Lib/SideshowCommon.c \ Lib/SideshowContent.c \ $(LUFA_SRC_USB) \ - $(LUFA_SRC_SERIAL) \ - $(LUFA_SRC_SERIALSTREAM) + $(LUFA_SRC_SERIAL) # List C++ source files here. (C dependencies are automatically generated.) |