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.

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)

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

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