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.

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 */

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. */

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.)