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/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h

@@ -41,7 +41,7 @@
 		#include <avr/pgmspace.h>
 		#include <stdio.h>
 
-		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Peripheral/Serial.h>
 
 		#include "EthernetProtocols.h"
 		#include "Ethernet.h"

Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c

@@ -104,8 +104,11 @@ void SetupHardware(void)
 
 	/* Hardware Initialization */
 	LEDs_Init();
-	SerialStream_Init(9600, false);
+	Serial_Init(9600, false);
 	USB_Init();
+
+	/* Create a stdio stream for the serial port for stdin and stdout */
+	Serial_CreateStream(NULL);
 }
 
 /** Event handler for the library USB Connection event. */

Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h

@@ -52,7 +52,7 @@
 
 		#include <LUFA/Version.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
-		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Peripheral/Stream.h>
 		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */

Demos/Device/ClassDriver/RNDISEthernet/makefile

@@ -149,8 +149,7 @@ SRC = $(TARGET).c                                                 \
 	  Lib/Webserver.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.)