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/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/Host/Incomplete')
9 files changed, 12 insertions, 10 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothEvents.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothEvents.h index 0c6e030be..1dab3b7b6 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothEvents.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothEvents.h @@ -45,7 +45,7 @@ #include "Lib/SDP.h"
#include "Lib/RFCOMM.h"
- #include <LUFA/Drivers/Peripheral/SerialStream.h>
+ #include <LUFA/Drivers/Peripheral/Serial.h>
#include <LUFA/Drivers/Board/LEDs.h>
/* Macros: */
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c index c4f091c98..9d18b83b8 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c @@ -77,9 +77,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/Incomplete/BluetoothHost/BluetoothHost.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h index cdb9ba39e..aecdf965c 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h @@ -52,7 +52,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> /* Macros: */ diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h index d45c57784..c32b52e25 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h @@ -43,7 +43,7 @@ #include <stdio.h> #include <LUFA/Drivers/USB/USB.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "BluetoothStack.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h index 49db8781f..ae5da6730 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h @@ -43,7 +43,7 @@ #include <stdio.h> #include <LUFA/Drivers/USB/USB.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "BluetoothStack.h" #include "BluetoothClassCodes.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h index 723948693..88b0c7fc4 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h @@ -44,7 +44,7 @@ #include <stdio.h> #include <LUFA/Common/Common.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "BluetoothStack.h" #include "RFCOMMControl.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h index 4888e3fba..8ff633404 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h @@ -44,7 +44,7 @@ #include <stdio.h> #include <LUFA/Common/Common.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "BluetoothStack.h" #include "RFCOMM.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h index 842bc58ad..695aac733 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h @@ -44,7 +44,7 @@ #include <stdio.h> #include <LUFA/Common/Common.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> #include "BluetoothStack.h" #include "SDPServices.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile index d8f4b9eee..de80a0e5b 100644 --- a/Demos/Host/Incomplete/BluetoothHost/makefile +++ b/Demos/Host/Incomplete/BluetoothHost/makefile @@ -137,8 +137,7 @@ SRC = $(TARGET).c \ Lib/RFCOMM.c \ Lib/RFCOMMControl.c \ $(LUFA_SRC_USB) \ - $(LUFA_SRC_SERIAL) \ - $(LUFA_SRC_SERIALSTREAM) + $(LUFA_SRC_SERIAL) # List C++ source files here. (C dependencies are automatically generated.) |