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 /Projects/Incomplete/StandaloneProgrammer | |
| 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 'Projects/Incomplete/StandaloneProgrammer')
3 files changed, 6 insertions, 4 deletions
diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c index 09c04f64f..86007daa5 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c @@ -152,7 +152,10 @@ void SetupHardware(void) SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER); Dataflash_Init(); Buttons_Init(); - SerialStream_Init(9600, true); + Serial_Init(9600, true); + + /* Create a stdio stream for the serial port for stdin and stdout */ + Serial_CreateStream(NULL); #if defined(USB_CAN_BE_DEVICE) /* Clear Dataflash sector protections, if enabled */ diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h index c26d9c530..f562cc18a 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h @@ -53,7 +53,7 @@ #include <LUFA/Version.h> #include <LUFA/Drivers/Board/Buttons.h> - #include <LUFA/Drivers/Peripheral/SerialStream.h> + #include <LUFA/Drivers/Peripheral/Serial.h> /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ diff --git a/Projects/Incomplete/StandaloneProgrammer/makefile b/Projects/Incomplete/StandaloneProgrammer/makefile index e90586e36..6656d9270 100644 --- a/Projects/Incomplete/StandaloneProgrammer/makefile +++ b/Projects/Incomplete/StandaloneProgrammer/makefile @@ -142,8 +142,7 @@ SRC = $(TARGET).c \ Lib/PetiteFATFs/pff.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.) |