Split out endpoint and pipe stream functions into new EndpointStream.c/.h and PipeStream.c/.h files.

9 files changed, 40 insertions, 1403 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index f1ed2f9a2..742e61860 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -33,7 +33,6 @@
 
 #if defined(USB_CAN_BE_DEVICE)
 
-#define  __INCLUDE_FROM_ENDPOINT_C
 #include "Endpoint.h"
 
 #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
@@ -161,205 +160,6 @@ uint8_t Endpoint_WaitUntilReady(void)
 		}
 	}
 }
-
-uint8_t Endpoint_Discard_Stream(uint16_t Length
-#if !defined(NO_STREAM_CALLBACKS)
-                                , StreamCallbackPtr_t Callback
 #endif
-                                )
-{
-	uint8_t  ErrorCode;
-	
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Endpoint_BytesInEndpoint() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Endpoint_IsReadWriteAllowed()))
-					{
-						Endpoint_ClearOUT();
-
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return ENDPOINT_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Endpoint_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-					
-					Endpoint_Discard_Byte();
-			case 7: Endpoint_Discard_Byte();
-			case 6: Endpoint_Discard_Byte();
-			case 5: Endpoint_Discard_Byte();
-			case 4: Endpoint_Discard_Byte();
-			case 3: Endpoint_Discard_Byte();
-			case 2: Endpoint_Discard_Byte();
-			case 1:	Endpoint_Discard_Byte();
-				} while (Length >= 8);	
-		}
-	}
-	#endif
-
-	while (Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearOUT();
-
-			#if !defined(NO_STREAM_CALLBACKS)
-			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return ENDPOINT_RWSTREAM_CallbackAborted;
-			#endif
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Discard_Byte();
-			Length--;
-		}
-	}
-	
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-past common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Endpoint_Read_Byte()
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr++, Endpoint_Read_Byte())
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Endpoint_Read_Byte()
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr--, Endpoint_Read_Byte())
-#include "Template/Template_Endpoint_RW.c"
-
-#endif
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Endpoint_Read_Byte()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr++, Endpoint_Read_Byte())
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Endpoint_Read_Byte()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr--, Endpoint_Read_Byte())
-#include "Template/Template_Endpoint_Control_R.c"
 
 #endif
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 48e660584..0b0a4721e 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -38,38 +38,33 @@
  *        dispatch header located in LUFA/Drivers/USB/USB.h.
  */
 
-/** \ingroup Group_USB
- *  @defgroup Group_EndpointManagement Endpoint Management
- *
- *  Functions, macros and enums related to endpoint management when in USB Device mode. This
- *  module contains the endpoint management macros, as well as endpoint interrupt and data
- *  send/receive functions for various data types.
- *
- *  @{
- */
-
-/** @defgroup Group_EndpointRW Endpoint Data Reading and Writing
+/** \ingroup Group_EndpointManagement
+ *  @defgroup Group_EndpointRW Endpoint Data Reading and Writing
  *
  *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.
  */
  
-/** \ingroup Group_EndpointRW  
+/** \ingroup Group_EndpointRW
  *  @defgroup Group_EndpointPrimitiveRW Read/Write of Primitive Data Types
  *
  *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
  *  from and to endpoints.
  */ 
 
-/** \ingroup Group_EndpointRW  
- *  @defgroup Group_EndpointStreamRW Read/Write of Multi-Byte Streams
+/** \ingroup Group_EndpointManagement
+ *  @defgroup Group_EndpointPacketManagement Endpoint Packet Management
  *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to endpoints.
- */ 
+ *  Functions, macros, variables, enums and types related to packet management of endpoints.
+ */
 
-/** @defgroup Group_EndpointPacketManagement Endpoint Packet Management
+/** \ingroup Group_USB
+ *  @defgroup Group_EndpointManagement Endpoint Management
  *
- *  Functions, macros, variables, enums and types related to packet management of endpoints.
+ *  Functions, macros and enums related to endpoint management when in USB Device mode. This
+ *  module contains the endpoint management macros, as well as endpoint interrupt and data
+ *  send/receive functions for various data types.
+ *
+ *  @{
  */
 
 #ifndef __ENDPOINT_H__
@@ -77,17 +72,11 @@
 
 	/* Includes: */
 		#include <avr/io.h>
-		#include <avr/pgmspace.h>
-		#include <avr/eeprom.h>
 		#include <stdbool.h>
 
 		#include "../../../Common/Common.h"
 		#include "../HighLevel/USBTask.h"
 		#include "USBInterrupt.h"
-
-		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-			#include "../HighLevel/StreamCallbacks.h"
-		#endif
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
@@ -99,12 +88,6 @@
 			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
 		#endif
 
-		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-			#define __CALLBACK_PARAM     , StreamCallbackPtr_t Callback
-		#else
-			#define __CALLBACK_PARAM
-		#endif
-
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
@@ -259,49 +242,6 @@
 				                                                 *   \ref USB_STREAM_TIMEOUT_MS macro.
 				                                                 */
 			};
-		
-			/** Enum for the possible error return codes of the Endpoint_*_Stream_* functions.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 */
-			enum Endpoint_Stream_RW_ErrorCodes_t
-			{
-				ENDPOINT_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				ENDPOINT_RWSTREAM_EndpointStalled    = 1, /**< The endpoint was stalled during the stream
-				                                           *   transfer by the host or device.
-				                                           */
-				ENDPOINT_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-				                                           *   the transfer.
-				                                           */
-				ENDPOINT_RWSTREAM_BusSuspended       = 3, /**< The USB bus has been suspended by the host and
-				                                           *   no USB endpoint traffic can occur until the bus
-				                                           *   has resumed.
-				                                           */
-				ENDPOINT_RWSTREAM_Timeout            = 4, /**< The host failed to accept or send the next packet
-				                                           *   within the software timeout period set by the
-				                                           *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                           */
-				ENDPOINT_RWSTREAM_CallbackAborted    = 5, /**< Indicates that the stream's callback function
-			                                               *   aborted the transfer early.
-				                                           */
-			};
-			
-			/** Enum for the possible error return codes of the Endpoint_*_Control_Stream_* functions..
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 */
-			enum Endpoint_ControlStream_RW_ErrorCodes_t
-			{
-				ENDPOINT_RWCSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				ENDPOINT_RWCSTREAM_HostAborted        = 1, /**< The aborted the transfer prematurely. */
-				ENDPOINT_RWCSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-				                                            *   the transfer.
-				                                            */
-				ENDPOINT_RWCSTREAM_BusSuspended       = 3, /**< The USB bus has been suspended by the host and
-				                                            *   no USB endpoint traffic can occur until the bus
-				                                            *   has resumed.
-				                                            */
-			};
 
 		/* Inline Functions: */			
 			/** Configures the specified endpoint number with the given endpoint type, direction, bank size
@@ -873,459 +813,22 @@
 			#endif
 
 		/* Function Prototypes: */
-			/** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data
-			 *  to be read or written to it.
-			 *
-			 *  \note This routine should not be called on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointRW
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_WaitUntilReady(void);
-			
 			/** Completes the status stage of a control transfer on a CONTROL type endpoint automatically,
 			 *  with respect to the data direction. This is a convenience function which can be used to
 			 *  simplify user control request handling.
 			 */
 			void Endpoint_ClearStatusStage(void);
 
-			/** Reads and discards the given number of bytes from the endpoint from the given buffer,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro. Between
-			 *  each USB packet, the given stream callback function is executed repeatedly until the next
-			 *  packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Length    Number of bytes to send via the currently selected endpoint.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Discard_Stream(uint16_t Length
-			                                __CALLBACK_PARAM);
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro. Between each USB packet, the given stream callback function
-			 *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early
-			 *  aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_LE(const void* Buffer,
-			                                 uint16_t Length
-			                                 __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_LE(const void* Buffer,
-			                                  uint16_t Length
-			                                  __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_LE(const void* Buffer,
-			                                  uint16_t Length
-			                                  __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro. Between each USB packet, the given stream callback function
-			 *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early
-			 *  aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_BE(const void* Buffer,
-			                                 uint16_t Length
-			                                 __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_BE(const void* Buffer,
-			                                  uint16_t Length
-			                                  __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_BE(const void* Buffer,
-			                                  uint16_t Length
-			                                  __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro. Between
-			 *  each USB packet, the given stream callback function is executed repeatedly until the endpoint
-			 *  is ready to accept the next packet, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_LE(void* Buffer,
-			                                uint16_t Length
-			                                __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Stream_LE().
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length    Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_LE(void* Buffer,
-			                                 uint16_t Length
-			                                 __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** Reads the given number of bytes from the endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro. Between
-			 *  each USB packet, the given stream callback function is executed repeatedly until the endpoint
-			 *  is ready to accept the next packet, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_BE(void* Buffer,
-			                                uint16_t Length
-			                                __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Stream_BE().
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length    Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_BE(void* Buffer,
-			                                 uint16_t Length
-			                                 __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the setup OUT to
-			 *  finalize the transfer via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_LE(const void* Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_LE(const void* Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the setup OUT to
-			 *  finalize the transfer via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_BE(const void* Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_BE(const void* Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  setup IN to finalize the transfer via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_LE().
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_EStream_LE(void* Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  setup IN to finalize the transfer via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \ingroup Group_EndpointStreamRW
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_BE().
-			 *
-			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
-			 *        to clear the status stage when using this routine in a control transaction.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
+			/** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data
+			 *  to be read or written to it.
 			 *
-			 *  \ingroup Group_EndpointStreamRW
+			 *  \note This routine should not be called on CONTROL type endpoints.
 			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
+			 *  \ingroup Group_EndpointRW
 			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
+			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
 			 */
-			uint8_t Endpoint_Read_Control_EStream_BE(void* Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			uint8_t Endpoint_WaitUntilReady(void);
 
 	/* Disable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index f8cf4f9ba..a8eb50f63 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -33,7 +33,6 @@
 
 #if defined(USB_CAN_BE_HOST)
 
-#define  __INCLUDE_FROM_PIPE_C
 #include "Pipe.h"
 
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
@@ -163,164 +162,4 @@ uint8_t Pipe_WaitUntilReady(void)
 	}
 }
 
-uint8_t Pipe_Discard_Stream(uint16_t Length
-#if !defined(NO_STREAM_CALLBACKS)
-                            , StreamCallbackPtr_t Callback
-#endif
-                            )
-{
-	uint8_t  ErrorCode;
-	
-	Pipe_SetPipeToken(PIPE_TOKEN_IN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Pipe_IsReadWriteAllowed()))
-					{
-						Pipe_ClearIN();
-							
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return PIPE_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Pipe_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-					
-					Pipe_Discard_Byte();
-			case 7: Pipe_Discard_Byte();
-			case 6: Pipe_Discard_Byte();
-			case 5: Pipe_Discard_Byte();
-			case 4: Pipe_Discard_Byte();
-			case 3: Pipe_Discard_Byte();
-			case 2: Pipe_Discard_Byte();
-			case 1:	Pipe_Discard_Byte();
-				} while (Length >= 8);	
-		}
-	}
-	#endif
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			Pipe_ClearIN();
-				
-			#if !defined(NO_STREAM_CALLBACKS)
-			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_CallbackAborted;
-			#endif
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Pipe_Discard_Byte();
-			Length--;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-past common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*((uint8_t*)BufferPtr++))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*((uint8_t*)BufferPtr--))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Pipe_Read_Byte()
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr++, Pipe_Read_Byte())
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Pipe_Read_Byte()
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte((uint8_t*)BufferPtr--, Pipe_Read_Byte())
-#include "Template/Template_Pipe_RW.c"
-
 #endif
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 868a93ade..d288ae2bb 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -38,17 +38,8 @@
  *        dispatch header located in LUFA/Drivers/USB/USB.h.
  */ 
 
-/** \ingroup Group_USB
- *  @defgroup Group_PipeManagement Pipe Management
- *
- *  This module contains functions, macros and enums related to pipe management when in USB Host mode. This
- *  module contains the pipe management macros, as well as pipe interrupt and data send/receive functions
- *  for various data types.
- *
- *  @{
- */
-
-/** @defgroup Group_PipeRW Pipe Data Reading and Writing
+/** \ingroup Group_PipeManagement
+ *  @defgroup Group_PipeRW Pipe Data Reading and Writing
  *
  *  Functions, macros, variables, enums and types related to data reading and writing from and to pipes.
  */
@@ -58,21 +49,16 @@
  *
  *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
  *  from and to pipes.
- */ 
-
-/** \ingroup Group_PipeRW  
- *  @defgroup Group_PipeStreamRW Read/Write of Multi-Byte Streams
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to pipes.
- */ 
+ */
  
-/** @defgroup Group_PipePacketManagement Pipe Packet Management
+/** \ingroup Group_PipeManagement
+ *  @defgroup Group_PipePacketManagement Pipe Packet Management
  *
  *  Functions, macros, variables, enums and types related to packet management of pipes.
  */
  
-/** @defgroup Group_PipeControlReq Pipe Control Request Management
+/** \ingroup Group_PipeManagement
+ *  @defgroup Group_PipeControlReq Pipe Control Request Management
  *
  *  Module for host mode request processing. This module allows for the transmission of standard, class and
  *  vendor control requests to the default control endpoint of an attached device while in host mode.
@@ -80,21 +66,25 @@
  *  \see Chapter 9 of the USB 2.0 specification.
  */ 
 
+/** \ingroup Group_USB
+ *  @defgroup Group_PipeManagement Pipe Management
+ *
+ *  This module contains functions, macros and enums related to pipe management when in USB Host mode. This
+ *  module contains the pipe management macros, as well as pipe interrupt and data send/receive functions
+ *  for various data types.
+ *
+ *  @{
+ */
+
 #ifndef __PIPE_H__
 #define __PIPE_H__
 
 	/* Includes: */
 		#include <avr/io.h>
-		#include <avr/pgmspace.h>
-		#include <avr/eeprom.h>
 		#include <stdbool.h>
 
 		#include "../../../Common/Common.h"
 		#include "../HighLevel/USBTask.h"
-
-		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-			#include "../HighLevel/StreamCallbacks.h"
-		#endif
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
@@ -105,12 +95,6 @@
 		#if !defined(__INCLUDE_FROM_USB_DRIVER)
 			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
 		#endif
-
-		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-			#define __CALLBACK_PARAM     , StreamCallbackPtr_t Callback
-		#else
-			#define __CALLBACK_PARAM
-		#endif
 		
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
@@ -217,26 +201,6 @@
 				                                             */
 			};
 
-			/** Enum for the possible error return codes of the Pipe_*_Stream_* functions.
-			 *
-			 *  \ingroup Group_PipeRW
-			 */
-			enum Pipe_Stream_RW_ErrorCodes_t
-			{
-				PIPE_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				PIPE_RWSTREAM_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */		
-				PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-			                                           *   the transfer.
-			                                           */		
-				PIPE_RWSTREAM_Timeout            = 3, /**< The device failed to accept or send the next packet
-				                                       *   within the software timeout period set by the
-				                                       *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                       */
-				PIPE_RWSTREAM_CallbackAborted    = 4, /**< Indicates that the stream's callback function aborted
-			                                           *   the transfer early.
-				                                       */
-			};
-
 		/* Inline Functions: */
 			/** Indicates the number of bytes currently stored in the current pipes's selected bank.
 			 *
@@ -900,217 +864,6 @@
 			 *          otherwise.
 			 */
 			bool Pipe_IsEndpointBound(const uint8_t EndpointAddress);
-		
-			/** Reads and discards the given number of bytes from the pipe, discarding fully read packets from the host
-			 *  as needed. The last packet is not automatically discarded once the remaining bytes has been read; the
-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearIN() macro.
-			 *  Between each USB packet, the given stream callback function is executed repeatedly until the next packet is ready,
-			 *  allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *  having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Length    Number of bytes to send via the currently selected pipe.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Discard_Stream(uint16_t Length
-			                            __CALLBACK_PARAM);
-
-			/** Writes the given number of bytes to the pipe from the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *  having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_LE(const void* Buffer,
-			                             uint16_t Length
-			                             __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_EStream_LE(const void* Buffer,
-			                              uint16_t Length
-			                              __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** FLASH buffer source version of \ref Pipe_Write_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_PStream_LE(const void* Buffer,
-			                              uint16_t Length
-			                              __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** Writes the given number of bytes to the pipe from the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *  having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_BE(const void* Buffer,
-			                             uint16_t Length
-			                             __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_EStream_BE(const void* Buffer,
-			                              uint16_t Length
-			                              __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** FLASH buffer source version of \ref Pipe_Write_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[in] Buffer    Pointer to the source data buffer to read from.
-			 *  \param[in] Length    Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_PStream_BE(const void* Buffer,
-			                              uint16_t Length
-			                              __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *  having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the source data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_LE(void* Buffer,
-			                            uint16_t Length
-			                            __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the source data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_EStream_LE(void* Buffer,
-			                             uint16_t Length
-			                             __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *	The callback routine should be created according to the information in \ref Group_StreamCallbacks.
-			 *  If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are
-			 *  disabled and this function has the Callback parameter omitted.
-			 *
-			 *  The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *  having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the source data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_BE(void* Buffer,
-			                            uint16_t Length
-			                            __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
-			
-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().
-			 *
-			 *  \ingroup Group_PipeStreamRW
-			 *
-			 *  \param[out] Buffer    Pointer to the source data buffer to write to.
-			 *  \param[in]  Length    Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_EStream_BE(void* Buffer,
-			                             uint16_t Length
-			                             __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
 
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c
deleted file mode 100644
index 43abe6e1e..000000000
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c
+++ /dev/null
@@ -1,45 +0,0 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	
-	if (!(Length))
-	  Endpoint_ClearOUT();
-	
-	while (Length)
-	{
-		if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		  
-		if (Endpoint_IsOUTReceived())
-		{
-			while (Length && Endpoint_BytesInEndpoint())
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				Length--;
-			}
-			
-			Endpoint_ClearOUT();
-		}		  
-	}
-	
-	while (!(Endpoint_IsINReady()))
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-	}
-	
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
deleted file mode 100644
index dc2c37dfc..000000000
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
+++ /dev/null
@@ -1,54 +0,0 @@
-uint8_t TEMPLATE_FUNC_NAME (const void* Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream     = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	bool     LastPacketFull = false;
-	
-	if (Length > USB_ControlRequest.wLength)
-	  Length = USB_ControlRequest.wLength;
-	else if (!(Length))
-	  Endpoint_ClearIN();
-
-	while (Length || LastPacketFull)
-	{
-		if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-
-		if (Endpoint_IsOUTReceived())
-		  break;
-		
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		  
-		if (Endpoint_IsINReady())
-		{
-			uint8_t BytesInEndpoint = Endpoint_BytesInEndpoint();
-		
-			while (Length && (BytesInEndpoint < USB_ControlEndpointSize))
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				Length--;
-				BytesInEndpoint++;
-			}
-			
-			LastPacketFull = (BytesInEndpoint == USB_ControlEndpointSize);
-			Endpoint_ClearIN();
-		}
-	}
-	
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
deleted file mode 100644
index fc9df951d..000000000
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
+++ /dev/null
@@ -1,79 +0,0 @@
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer,
-                            uint16_t Length
-                            __CALLBACK_PARAM)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint8_t  ErrorCode;
-	
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Endpoint_BytesInEndpoint() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Endpoint_IsReadWriteAllowed()))
-					{
-						TEMPLATE_CLEAR_ENDPOINT();
-
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return ENDPOINT_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Endpoint_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-					
-					TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 7: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 6: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 5: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 4: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 3: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 2: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 1:	TEMPLATE_TRANSFER_BYTE(DataStream);
-				} while (Length >= 8);	
-		}
-	}
-	#endif
-
-	while (Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_ENDPOINT();
-
-			#if !defined(NO_STREAM_CALLBACKS)
-			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return ENDPOINT_RWSTREAM_CallbackAborted;
-			#endif
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			Length--;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_ENDPOINT
-#undef TEMPLATE_BUFFER_OFFSET
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
deleted file mode 100644
index fb64dd837..000000000
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
+++ /dev/null
@@ -1,82 +0,0 @@
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer,
-                            uint16_t Length
-                            __CALLBACK_PARAM)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint8_t  ErrorCode;
-	
-	Pipe_SetPipeToken(TEMPLATE_TOKEN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Pipe_IsReadWriteAllowed()))
-					{
-						TEMPLATE_CLEAR_PIPE();
-
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return PIPE_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Pipe_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-					
-					TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 7: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 6: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 5: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 4: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 3: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 2: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 1:	TEMPLATE_TRANSFER_BYTE(DataStream);
-				} while (Length >= 8);	
-		}
-	}
-	#endif
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_PIPE();
-
-			#if !defined(NO_STREAM_CALLBACKS)
-			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_CallbackAborted;
-			#endif
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			Length--;
-		}
-	}
-	
-	return PIPE_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TOKEN
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_PIPE
-#undef TEMPLATE_BUFFER_OFFSET
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.h b/LUFA/Drivers/USB/LowLevel/USBController.h
index f0db7faf4..980f818d4 100644
--- a/LUFA/Drivers/USB/LowLevel/USBController.h
+++ b/LUFA/Drivers/USB/LowLevel/USBController.h
@@ -64,15 +64,17 @@
 		
 		#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
 			#include "Host.h"
-			#include "Pipe.h"
 			#include "OTG.h"
+			#include "Pipe.h"
 			#include "../HighLevel/HostStandardReq.h"
+			#include "../HighLevel/PipeStream.h"
 		#endif
 		
 		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
 			#include "Device.h"
 			#include "Endpoint.h"
 			#include "../HighLevel/DeviceStandardReq.h"
+			#include "../HighLevel/EndpointStream.h"
 		#endif
 
 	/* Enable C linkage for C++ Compilers: */