Tag the LUFA 120730 release.LUFA-120730

git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120730@2428 d5102386-fcda-11dd-9fdb-3debd5008f28

28 files changed, 3747 insertions, 3708 deletions

diff --git a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c
index 0117a1d6..a267be1e 100644
--- a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c
+++ b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c
@@ -1,275 +1,275 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#include "../../../../Common/Common.h"

-#if (ARCH == ARCH_AVR8)

-

-#define  __INCLUDE_FROM_USB_DRIVER

-#include "../USBMode.h"

-

-#if defined(USB_CAN_BE_DEVICE)

-

-#include "EndpointStream_AVR8.h"

-

-#if !defined(CONTROL_ONLY_DEVICE)

-uint8_t Endpoint_Discard_Stream(uint16_t Length,

-                                uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearOUT();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Discard_8();

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-uint8_t Endpoint_Null_Stream(uint16_t Length,

-                             uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearIN();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Write_8(0);

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_RW.c"

-

-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#endif

-

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_Control_R.c"

-

-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_Control_W.c"

-#endif

-

-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_Control_W.c"

-

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#include "Template/Template_Endpoint_Control_R.c"

-#endif

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "../../../../Common/Common.h"
+#if (ARCH == ARCH_AVR8)
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../USBMode.h"
+
+#if defined(USB_CAN_BE_DEVICE)
+
+#include "EndpointStream_AVR8.h"
+
+#if !defined(CONTROL_ONLY_DEVICE)
+uint8_t Endpoint_Discard_Stream(uint16_t Length,
+                                uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearOUT();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Discard_8();
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+uint8_t Endpoint_Null_Stream(uint16_t Length,
+                             uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearIN();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Write_8(0);
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_RW.c"
+
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_RW.c"
+#endif
+
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#include "Template/Template_Endpoint_RW.c"
 #endif
 
-#endif

+#endif
+
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_Control_R.c"
+
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_Control_W.c"
+#endif
+
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_Control_W.c"
+
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#include "Template/Template_Endpoint_Control_R.c"
+#endif
+
+#endif
+
+#endif
diff --git a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h
index 072d8593..eb1f928f 100644
--- a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h
@@ -1,648 +1,648 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Endpoint data stream transmission and reception management for the AVR8 microcontrollers.

- *  \copydetails Group_EndpointStreamRW_AVR8

- *

- *  \note This file should not be included directly. It is automatically included as needed by the USB driver

- *        dispatch header located in LUFA/Drivers/USB/USB.h.

- */

-

-/** \ingroup Group_EndpointStreamRW

- *  \defgroup Group_EndpointStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)

- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR8 architecture.

- *

- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from

- *  and to endpoints.

- *

- *  @{

- */ 

-

-#ifndef __ENDPOINT_STREAM_AVR8_H__

-#define __ENDPOINT_STREAM_AVR8_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../USBMode.h"		

-		#include "../USBTask.h"

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_USB_DRIVER)

-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Function Prototypes: */

-			/** \name Stream functions for null data */

-			//@{

-

-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Discard_Stream(uint16_t Length,

-			                                uint16_t* const BytesProcessed);

-

-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending

-			 *  full packets to the host as needed. The last packet is not automatically sent once the 

-			 *  remaining bytes have been written; the user is responsible for manually sending the last

-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Null_Stream(uint16_t Length,

-			                             uint16_t* const BytesProcessed);

-

-			//@}

-

-			/** \name Stream functions for RAM source/destination data */

-			//@{

-		

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const Buffer,

-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for EEPROM source/destination data */

-			//@{

-

-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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_BE(void* const Buffer,

-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for PROGMEM source/destination data */

-			//@{

-

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

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const Buffer,

-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-		

-#endif

-

-/** @} */

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Endpoint data stream transmission and reception management for the AVR8 microcontrollers.
+ *  \copydetails Group_EndpointStreamRW_AVR8
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
+/** \ingroup Group_EndpointStreamRW
+ *  \defgroup Group_EndpointStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)
+ *  \brief Endpoint data stream transmission and reception management for the Atmel AVR8 architecture.
+ *
+ *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
+ *  and to endpoints.
+ *
+ *  @{
+ */ 
+
+#ifndef __ENDPOINT_STREAM_AVR8_H__
+#define __ENDPOINT_STREAM_AVR8_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../USBMode.h"		
+		#include "../USBTask.h"
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Function Prototypes: */
+			/** \name Stream functions for null data */
+			//@{
+
+			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
+			 *  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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Discard_Stream(uint16_t Length,
+			                                uint16_t* const BytesProcessed);
+
+			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
+			 *  full packets to the host as needed. The last packet is not automatically sent once the 
+			 *  remaining bytes have been written; the user is responsible for manually sending the last
+			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Null_Stream(uint16_t Length,
+			                             uint16_t* const BytesProcessed);
+
+			//@}
+
+			/** \name Stream functions for RAM source/destination data */
+			//@{
+		
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const Buffer,
+			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for EEPROM source/destination data */
+			//@{
+
+			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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_BE(void* const Buffer,
+			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for PROGMEM source/destination data */
+			//@{
+
+			/** 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const Buffer,
+			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+		
+#endif
+
+/** @} */
 
diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
index 056981a2..57d9b0d4 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
@@ -202,7 +202,12 @@
 			                                              const uint16_t Size,
 			                                              const uint8_t Banks)
 			{
-				return Endpoint_ConfigureEndpoint_Prv((Address & ENDPOINT_EPNUM_MASK),
+				uint8_t Number = (Address & ENDPOINT_EPNUM_MASK);
+			
+				if (Number >= ENDPOINT_TOTAL_ENDPOINTS)
+				  return false;
+			
+				return Endpoint_ConfigureEndpoint_Prv(Number,
 				                                      ((Type << EPTYPE0) | ((Address & ENDPOINT_DIR_IN) ? (1 << EPDIR) : 0)),
 				                                      ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Endpoint_BytesToEPSizeMask(Size)));
 			}
diff --git a/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c
index e71a7bd3..3d80a33f 100644
--- a/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c
+++ b/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c
@@ -1,221 +1,221 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#include "../../../../Common/Common.h"

-#if (ARCH == ARCH_AVR8)

-

-#define  __INCLUDE_FROM_USB_DRIVER

-#include "../USBMode.h"

-

-#if defined(USB_CAN_BE_HOST)

-

-#include "PipeStream_AVR8.h"

-

-uint8_t Pipe_Discard_Stream(uint16_t Length,

-                            uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	Pipe_SetPipeToken(PIPE_TOKEN_IN);

-

-	if ((ErrorCode = Pipe_WaitUntilReady()))

-	  return ErrorCode;

-

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Pipe_IsReadWriteAllowed()))

-		{

-			Pipe_ClearIN();

-				

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return PIPE_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Pipe_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Pipe_Discard_8();

-			

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-

-	return PIPE_RWSTREAM_NoError;

-}

-

-uint8_t Pipe_Null_Stream(uint16_t Length,

-                         uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	Pipe_SetPipeToken(PIPE_TOKEN_OUT);

-

-	if ((ErrorCode = Pipe_WaitUntilReady()))

-	  return ErrorCode;

-

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Pipe_IsReadWriteAllowed()))

-		{

-			Pipe_ClearOUT();

-				

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return PIPE_RWSTREAM_IncompleteTransfer;

-			}

-			

-			USB_USBTask();

-

-			if ((ErrorCode = Pipe_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Pipe_Write_8(0);

-			

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-

-	return PIPE_RWSTREAM_NoError;

-}

-

-/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))

-#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())

-#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())

-#include "Template/Template_Pipe_RW.c"

-

-#endif

-

-#endif

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "../../../../Common/Common.h"
+#if (ARCH == ARCH_AVR8)
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../USBMode.h"
+
+#if defined(USB_CAN_BE_HOST)
+
+#include "PipeStream_AVR8.h"
+
+uint8_t Pipe_Discard_Stream(uint16_t Length,
+                            uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	Pipe_SetPipeToken(PIPE_TOKEN_IN);
+
+	if ((ErrorCode = Pipe_WaitUntilReady()))
+	  return ErrorCode;
+
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Pipe_IsReadWriteAllowed()))
+		{
+			Pipe_ClearIN();
+				
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return PIPE_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Pipe_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Pipe_Discard_8();
+			
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+
+	return PIPE_RWSTREAM_NoError;
+}
+
+uint8_t Pipe_Null_Stream(uint16_t Length,
+                         uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	Pipe_SetPipeToken(PIPE_TOKEN_OUT);
+
+	if ((ErrorCode = Pipe_WaitUntilReady()))
+	  return ErrorCode;
+
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Pipe_IsReadWriteAllowed()))
+		{
+			Pipe_ClearOUT();
+				
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return PIPE_RWSTREAM_IncompleteTransfer;
+			}
+			
+			USB_USBTask();
+
+			if ((ErrorCode = Pipe_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Pipe_Write_8(0);
+			
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+
+	return PIPE_RWSTREAM_NoError;
+}
+
+/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))
+#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())
+#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())
+#include "Template/Template_Pipe_RW.c"
+
+#endif
+
+#endif
+
diff --git a/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h
index 53316f2f..f69469f2 100644
--- a/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h
@@ -1,442 +1,442 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

- 

-/** \file

- *  \brief Pipe data stream transmission and reception management for the AVR8 microcontrollers

- *  \copydetails Group_PipeStreamRW_AVR8

- *

- *  \note This file should not be included directly. It is automatically included as needed by the USB driver

- *        dispatch header located in LUFA/Drivers/USB/USB.h.

- */

-

-/** \ingroup Group_PipeStreamRW

- *  \defgroup Group_PipeStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)

- *  \brief Pipe data stream transmission and reception management for the Atmel AVR8 architecture.

- *

- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from

- *  and to pipes.

- *

- *  @{

- */

-

-#ifndef __PIPE_STREAM_AVR8_H__

-#define __PIPE_STREAM_AVR8_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../USBMode.h"		

-		#include "../USBTask.h"

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_USB_DRIVER)

-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

-		#endif

-		

-	/* Public Interface - May be used in end-application: */

-		/* Function Prototypes: */

-			/** \name Stream functions for null data */

-			//@{

-

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or

-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer

-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data

-			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with

-			 *  the total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to

-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed

-			 *  value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be processed at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Discard_Stream(uint16_t Length,

-			                            uint16_t* const BytesProcessed);

-

-			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device

-			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the

-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or

-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer

-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data

-			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be

-			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to

-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed

-			 *  value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be processed at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Null_Stream(uint16_t Length,

-			                         uint16_t* const BytesProcessed);

-

-			//@}

-

-			/** \name Stream functions for RAM source/destination data */

-			//@{

-			

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the pipe bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                        NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note 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().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) 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.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the pipe bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                       NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_Stream_LE(void* const Buffer,

-			                            uint16_t Length,

-			                            uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note 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().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_Stream_BE(void* const Buffer,

-			                            uint16_t Length,

-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for EEPROM source/destination data */

-			//@{

-			

-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_EStream_LE(const void* const Buffer,

-			                              uint16_t Length,

-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			

-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_EStream_BE(const void* const Buffer,

-			                              uint16_t Length,

-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_EStream_LE(void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			

-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_EStream_BE(void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for PROGMEM source/destination data */

-			//@{

-			

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

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_PStream_LE(const void* const Buffer,

-			                              uint16_t Length,

-			                              uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_PStream_BE(const void* const Buffer,

-			                              uint16_t Length,

-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-	

-#endif

-

-/** @} */

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+ 
+/** \file
+ *  \brief Pipe data stream transmission and reception management for the AVR8 microcontrollers
+ *  \copydetails Group_PipeStreamRW_AVR8
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
+/** \ingroup Group_PipeStreamRW
+ *  \defgroup Group_PipeStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)
+ *  \brief Pipe data stream transmission and reception management for the Atmel AVR8 architecture.
+ *
+ *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
+ *  and to pipes.
+ *
+ *  @{
+ */
+
+#ifndef __PIPE_STREAM_AVR8_H__
+#define __PIPE_STREAM_AVR8_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../USBMode.h"		
+		#include "../USBTask.h"
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+		
+	/* Public Interface - May be used in end-application: */
+		/* Function Prototypes: */
+			/** \name Stream functions for null data */
+			//@{
+
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
+			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
+			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data
+			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with
+			 *  the total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
+			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
+			 *  value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be processed at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Discard_Stream(uint16_t Length,
+			                            uint16_t* const BytesProcessed);
+
+			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device
+			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the
+			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
+			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
+			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data
+			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be
+			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
+			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
+			 *  value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be processed at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Null_Stream(uint16_t Length,
+			                         uint16_t* const BytesProcessed);
+
+			//@}
+
+			/** \name Stream functions for RAM source/destination data */
+			//@{
+			
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the pipe bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                        NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note 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().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the pipe bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                       NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_Stream_LE(void* const Buffer,
+			                            uint16_t Length,
+			                            uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note 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().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_Stream_BE(void* const Buffer,
+			                            uint16_t Length,
+			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for EEPROM source/destination data */
+			//@{
+			
+			/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_EStream_LE(const void* const Buffer,
+			                              uint16_t Length,
+			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			
+			/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_EStream_BE(const void* const Buffer,
+			                              uint16_t Length,
+			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_EStream_LE(void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			
+			/** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_EStream_BE(void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for PROGMEM source/destination data */
+			//@{
+			
+			/** 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_PStream_LE(const void* const Buffer,
+			                              uint16_t Length,
+			                              uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_PStream_BE(const void* const Buffer,
+			                              uint16_t Length,
+			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+	
+#endif
+
+/** @} */
 
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
index 1ddffb51..b6437083 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
@@ -66,6 +66,9 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
 	uint8_t Number = (Address & PIPE_EPNUM_MASK);
 	uint8_t Token  = (Address & PIPE_DIR_IN) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT;
 	
+	if (Number >= PIPE_TOTAL_PIPES)
+	  return false;
+
 	if (Type == EP_TYPE_CONTROL)
 	  Token = PIPE_TOKEN_SETUP;
 
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
index 330dd981..8106988d 100644
--- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
@@ -215,7 +215,7 @@
 			 *                      from the \ref USB_Modes_t enum.
 			 *
 			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behaviour. This should be comprised of
+			 *                      interface to control the USB interface's behavior. This should be comprised of
 			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
 			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
 			 *                      mode speed.
diff --git a/LUFA/Drivers/USB/Core/ConfigDescriptor.c b/LUFA/Drivers/USB/Core/ConfigDescriptors.c
index 5bdcdc66..47332d85 100644
--- a/LUFA/Drivers/USB/Core/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/Core/ConfigDescriptors.c
@@ -29,7 +29,7 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
-#include "ConfigDescriptor.h"
+#include "ConfigDescriptors.h"
 
 #if defined(USB_CAN_BE_HOST)
 uint8_t USB_Host_GetDeviceConfigDescriptor(const uint8_t ConfigNumber,
diff --git a/LUFA/Drivers/USB/Core/ConfigDescriptor.h b/LUFA/Drivers/USB/Core/ConfigDescriptors.h
index 22e76cba..97fb39b5 100644
--- a/LUFA/Drivers/USB/Core/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/Core/ConfigDescriptors.h
@@ -213,7 +213,7 @@
 			 *  function. The routine updates the position and remaining configuration descriptor bytes values
 			 *  automatically. If a comparator routine fails a search, the descriptor pointer is retreated back
 			 *  so that the next descriptor search invocation will start from the descriptor which first caused the
-			 *  original search to fail. This behaviour allows for one comparator to be used immediately after another
+			 *  original search to fail. This behavior allows for one comparator to be used immediately after another
 			 *  has failed, starting the second search from the descriptor which failed the first.
 			 *
 			 *  Comparator functions should be standard functions which accept a pointer to the header of the current
diff --git a/LUFA/Drivers/USB/Core/Events.h b/LUFA/Drivers/USB/Core/Events.h
index 8d627d4f..f468b7e6 100644
--- a/LUFA/Drivers/USB/Core/Events.h
+++ b/LUFA/Drivers/USB/Core/Events.h
@@ -189,7 +189,7 @@
 			 *  \note For the microcontrollers with limited USB controller functionality, VBUS sensing is not available.
 			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,
 			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state
-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by
+			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behavior turned off by
 			 *        passing the \c NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection
 			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.
 			 *        \n\n
@@ -207,7 +207,7 @@
 			 *  \note For the microcontrollers with limited USB controllers, VBUS sense is not available to the USB controller.
 			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,
 			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state
-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by
+			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behavior turned off by
 			 *        passing the \c NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection
 			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.
 			 *        \n\n
diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.h b/LUFA/Drivers/USB/Core/HostStandardReq.h
index 5bdfe45e..6ad0d2e5 100644
--- a/LUFA/Drivers/USB/Core/HostStandardReq.h
+++ b/LUFA/Drivers/USB/Core/HostStandardReq.h
@@ -91,7 +91,7 @@
 
 		/* Global Variables: */
 			/** Indicates the currently set configuration number of the attached device. This indicates the currently
-			 *  selected configuration value if one has been set sucessfully, or 0 if no configuration has been selected.
+			 *  selected configuration value if one has been set successfully, or 0 if no configuration has been selected.
 			 *
 			 *  To set a device configuration, call the \ref USB_Host_SetDeviceConfiguration() function.
 			 *
diff --git a/LUFA/Drivers/USB/Core/StdDescriptors.h b/LUFA/Drivers/USB/Core/StdDescriptors.h
index c46129c4..031e01d2 100644
--- a/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ b/LUFA/Drivers/USB/Core/StdDescriptors.h
@@ -105,7 +105,7 @@
 			/** \name USB Configuration Descriptor Attribute Masks */
 			//@{
 			/** Mask for the reserved bit in the Configuration Descriptor's \c ConfigAttributes field, which must be set on all
-			 *  devices for historial purposes.
+			 *  devices for historical purposes.
 			 */
 			#define USB_CONFIG_ATTR_RESERVED          0x80
 
diff --git a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c
index b4e130e7..51546106 100644
--- a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c
@@ -1,235 +1,235 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#include "../../../../Common/Common.h"

-#if (ARCH == ARCH_UC3)

-

-#define  __INCLUDE_FROM_USB_DRIVER

-#include "../USBMode.h"

-

-#if defined(USB_CAN_BE_DEVICE)

-

-#include "EndpointStream_UC3.h"

-

-#if !defined(CONTROL_ONLY_DEVICE)

-uint8_t Endpoint_Discard_Stream(uint16_t Length,

-                                uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearOUT();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Discard_8();

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-uint8_t Endpoint_Null_Stream(uint16_t Length,

-                             uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearIN();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Write_8(0);

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_RW.c"

-

-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#endif

-

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_Control_R.c"

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "../../../../Common/Common.h"
+#if (ARCH == ARCH_UC3)
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../USBMode.h"
+
+#if defined(USB_CAN_BE_DEVICE)
+
+#include "EndpointStream_UC3.h"
+
+#if !defined(CONTROL_ONLY_DEVICE)
+uint8_t Endpoint_Discard_Stream(uint16_t Length,
+                                uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearOUT();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Discard_8();
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+uint8_t Endpoint_Null_Stream(uint16_t Length,
+                             uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearIN();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Write_8(0);
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_RW.c"
+
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_RW.c"
+#endif
+
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#include "Template/Template_Endpoint_RW.c"
 #endif
 
-#endif

+#endif
+
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_Control_R.c"
+
+#endif
+
+#endif
diff --git a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h
index 40a54ee1..551cf4b1 100644
--- a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h
@@ -1,434 +1,434 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Endpoint data stream transmission and reception management for the AVR32 UC3 microcontrollers.

- *  \copydetails Group_EndpointStreamRW_UC3

- *

- *  \note This file should not be included directly. It is automatically included as needed by the USB driver

- *        dispatch header located in LUFA/Drivers/USB/USB.h.

- */

-

-/** \ingroup Group_EndpointStreamRW

- *  \defgroup Group_EndpointStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)

- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR32 UC3 architecture.

- *

- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from

- *  and to endpoints.

- *

- *  @{

- */ 

-

-#ifndef __ENDPOINT_STREAM_UC3_H__

-#define __ENDPOINT_STREAM_UC3_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../USBMode.h"

-		#include "../USBTask.h"

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_USB_DRIVER)

-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Function Prototypes: */

-			/** \name Stream functions for null data */

-			//@{

-

-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Discard_Stream(uint16_t Length,

-			                                uint16_t* const BytesProcessed);

-

-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending

-			 *  full packets to the host as needed. The last packet is not automatically sent once the 

-			 *  remaining bytes have been written; the user is responsible for manually sending the last

-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Null_Stream(uint16_t Length,

-			                             uint16_t* const BytesProcessed);

-

-			//@}

-

-			/** \name Stream functions for RAM source/destination data */

-			//@{

-		

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const Buffer,

-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-		

-#endif

-

-/** @} */

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Endpoint data stream transmission and reception management for the AVR32 UC3 microcontrollers.
+ *  \copydetails Group_EndpointStreamRW_UC3
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
+/** \ingroup Group_EndpointStreamRW
+ *  \defgroup Group_EndpointStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)
+ *  \brief Endpoint data stream transmission and reception management for the Atmel AVR32 UC3 architecture.
+ *
+ *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
+ *  and to endpoints.
+ *
+ *  @{
+ */ 
+
+#ifndef __ENDPOINT_STREAM_UC3_H__
+#define __ENDPOINT_STREAM_UC3_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../USBMode.h"
+		#include "../USBTask.h"
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Function Prototypes: */
+			/** \name Stream functions for null data */
+			//@{
+
+			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
+			 *  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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Discard_Stream(uint16_t Length,
+			                                uint16_t* const BytesProcessed);
+
+			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
+			 *  full packets to the host as needed. The last packet is not automatically sent once the 
+			 *  remaining bytes have been written; the user is responsible for manually sending the last
+			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Null_Stream(uint16_t Length,
+			                             uint16_t* const BytesProcessed);
+
+			//@}
+
+			/** \name Stream functions for RAM source/destination data */
+			//@{
+		
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const Buffer,
+			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+		
+#endif
+
+/** @} */
 
diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
index c027585a..f0f319db 100644
--- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
@@ -65,7 +65,7 @@ bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
 bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
                                     const uint32_t UECFG0Data)
 {
-	USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * 0x10000];
+	USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
 
 #if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG)
 	Endpoint_SelectEndpoint(Number);
diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
index a1b2a16f..1356952b 100644
--- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
@@ -208,11 +208,16 @@
 			                                              const uint16_t Size,
 			                                              const uint8_t Banks)
 			{
-				return Endpoint_ConfigureEndpoint_Prv((Address & ENDPOINT_EPNUM_MASK),
+				uint8_t Number = (Address & ENDPOINT_EPNUM_MASK);
+			
+				if (Number >= ENDPOINT_TOTAL_ENDPOINTS)
+				  return false;
+
+				return Endpoint_ConfigureEndpoint_Prv(Number,
 				                                      (AVR32_USBB_ALLOC_MASK |
-				                                       ((uint32_t)Type      << AVR32_USBB_EPTYPE_OFFSET) |
-				                                       ((uint32_t)(Address & ENDPOINT_DIR_IN) ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
-				                                       ((uint32_t)Banks     << AVR32_USBB_EPBK_OFFSET)   |
+				                                       ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) |
+				                                       ((Address & ENDPOINT_DIR_IN) ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
+				                                       ((Banks > 1) ? AVR32_USBB_UECFG0_EPBK_SINGLE : AVR32_USBB_UECFG0_EPBK_DOUBLE) |
 				                                       Endpoint_BytesToEPSizeMask(Size)));
 			}
 
diff --git a/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c b/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c
index bb4cbc65..76fbfd8f 100644
--- a/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c
@@ -1,166 +1,166 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#include "../../../../Common/Common.h"

-#if (ARCH == ARCH_UC3)

-

-#define  __INCLUDE_FROM_USB_DRIVER

-#include "../USBMode.h"

-

-#if defined(USB_CAN_BE_HOST)

-

-#include "PipeStream_UC3.h"

-

-uint8_t Pipe_Discard_Stream(uint16_t Length,

-                            uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	Pipe_SetPipeToken(PIPE_TOKEN_IN);

-

-	if ((ErrorCode = Pipe_WaitUntilReady()))

-	  return ErrorCode;

-

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Pipe_IsReadWriteAllowed()))

-		{

-			Pipe_ClearIN();

-				

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return PIPE_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Pipe_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Pipe_Discard_8();

-			

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-

-	return PIPE_RWSTREAM_NoError;

-}

-

-uint8_t Pipe_Null_Stream(uint16_t Length,

-                         uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	Pipe_SetPipeToken(PIPE_TOKEN_OUT);

-

-	if ((ErrorCode = Pipe_WaitUntilReady()))

-	  return ErrorCode;

-

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Pipe_IsReadWriteAllowed()))

-		{

-			Pipe_ClearOUT();

-				

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return PIPE_RWSTREAM_IncompleteTransfer;

-			}

-			

-			USB_USBTask();

-

-			if ((ErrorCode = Pipe_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Pipe_Write_8(0);

-			

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-

-	return PIPE_RWSTREAM_NoError;

-}

-

-/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()

-#include "Template/Template_Pipe_RW.c"

-

-#endif

-
-#endif

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "../../../../Common/Common.h"
+#if (ARCH == ARCH_UC3)
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../USBMode.h"
+
+#if defined(USB_CAN_BE_HOST)
+
+#include "PipeStream_UC3.h"
+
+uint8_t Pipe_Discard_Stream(uint16_t Length,
+                            uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	Pipe_SetPipeToken(PIPE_TOKEN_IN);
+
+	if ((ErrorCode = Pipe_WaitUntilReady()))
+	  return ErrorCode;
+
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Pipe_IsReadWriteAllowed()))
+		{
+			Pipe_ClearIN();
+				
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return PIPE_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Pipe_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Pipe_Discard_8();
+			
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+
+	return PIPE_RWSTREAM_NoError;
+}
+
+uint8_t Pipe_Null_Stream(uint16_t Length,
+                         uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	Pipe_SetPipeToken(PIPE_TOKEN_OUT);
+
+	if ((ErrorCode = Pipe_WaitUntilReady()))
+	  return ErrorCode;
+
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Pipe_IsReadWriteAllowed()))
+		{
+			Pipe_ClearOUT();
+				
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return PIPE_RWSTREAM_IncompleteTransfer;
+			}
+			
+			USB_USBTask();
+
+			if ((ErrorCode = Pipe_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Pipe_Write_8(0);
+			
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+
+	return PIPE_RWSTREAM_NoError;
+}
+
+/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
+#include "Template/Template_Pipe_RW.c"
+
+#endif
+
+#endif
diff --git a/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h b/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h
index cb8a28c8..72bf83c6 100644
--- a/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h
@@ -1,352 +1,352 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

- 

-/** \file

- *  \brief Pipe data stream transmission and reception management for the AVR32 UC3 microcontrollers.

- *  \copydetails Group_PipeStreamRW_UC3

- *

- *  \note This file should not be included directly. It is automatically included as needed by the USB driver

- *        dispatch header located in LUFA/Drivers/USB/USB.h.

- */

-

-/** \ingroup Group_PipeStreamRW

- *  \defgroup Group_PipeStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)

- *  \brief Pipe data stream transmission and reception management for the Atmel AVR32 UC3 architecture.

- *

- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from

- *  and to pipes.

- *

- *  @{

- */

-

-#ifndef __PIPE_STREAM_UC3_H__

-#define __PIPE_STREAM_UC3_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../USBMode.h"

-		#include "../USBTask.h"

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_USB_DRIVER)

-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

-		#endif

-		

-	/* Public Interface - May be used in end-application: */

-		/* Function Prototypes: */

-			/** \name Stream functions for null data */

-			//@{

-

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or

-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer

-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data

-			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with

-			 *  the total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to

-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed

-			 *  value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *  

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be processed at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Discard_Stream(uint16_t Length,

-			                            uint16_t* const BytesProcessed);

-

-			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device

-			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the

-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or

-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer

-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data

-			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be

-			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to

-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed

-			 *  value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be processed at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Null_Stream(uint16_t Length,

-			                         uint16_t* const BytesProcessed);

-

-			//@}

-

-			/** \name Stream functions for RAM source/destination data */

-			//@{

-			

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the pipe bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                        NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note 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().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                             updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,

-			                             uint16_t Length,

-			                             uint16_t* const BytesProcessed) 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.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the pipe bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                       NULL)) != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note 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().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_Stream_LE(void* const Buffer,

-			                            uint16_t Length,

-			                            uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note 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().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should

-			 *                              updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Pipe_Read_Stream_BE(void* const Buffer,

-			                            uint16_t Length,

-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-	

-#endif

-

-/** @} */

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+ 
+/** \file
+ *  \brief Pipe data stream transmission and reception management for the AVR32 UC3 microcontrollers.
+ *  \copydetails Group_PipeStreamRW_UC3
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
+/** \ingroup Group_PipeStreamRW
+ *  \defgroup Group_PipeStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)
+ *  \brief Pipe data stream transmission and reception management for the Atmel AVR32 UC3 architecture.
+ *
+ *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
+ *  and to pipes.
+ *
+ *  @{
+ */
+
+#ifndef __PIPE_STREAM_UC3_H__
+#define __PIPE_STREAM_UC3_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../USBMode.h"
+		#include "../USBTask.h"
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+		
+	/* Public Interface - May be used in end-application: */
+		/* Function Prototypes: */
+			/** \name Stream functions for null data */
+			//@{
+
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
+			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
+			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data
+			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with
+			 *  the total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
+			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
+			 *  value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *  
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be processed at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Discard_Stream(uint16_t Length,
+			                            uint16_t* const BytesProcessed);
+
+			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device
+			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the
+			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
+			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
+			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data
+			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be
+			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
+			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
+			 *  value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be processed at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Null_Stream(uint16_t Length,
+			                         uint16_t* const BytesProcessed);
+
+			//@}
+
+			/** \name Stream functions for RAM source/destination data */
+			//@{
+			
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the pipe bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                        NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note 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().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                             updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,
+			                             uint16_t Length,
+			                             uint16_t* const BytesProcessed) 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the pipe bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                       NULL)) != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note 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().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_Stream_LE(void* const Buffer,
+			                            uint16_t Length,
+			                            uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note 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().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
+			 *                              updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Pipe_Read_Stream_BE(void* const Buffer,
+			                            uint16_t Length,
+			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+	
+#endif
+
+/** @} */
 
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
index 787244b9..5b17455a 100644
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
@@ -69,10 +69,13 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
 	uint8_t Number = (Address & PIPE_EPNUM_MASK);
 	uint8_t Token  = (Address & PIPE_DIR_IN) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT;
 	
+	if (Number >= PIPE_TOTAL_PIPES)
+	  return false;
+
 	if (Type == EP_TYPE_CONTROL)
 	  Token = PIPE_TOKEN_SETUP;
 
-	USB_Pipe_FIFOPos[Number]     = &AVR32_USBB_SLAVE[Number * 0x10000];
+	USB_Pipe_FIFOPos[Number]     = &AVR32_USBB_SLAVE[Number * PIPE_HSB_ADDRESS_SPACE_SIZE];
 
 #if defined(ORDERED_EP_CONFIG)
 	Pipe_SelectPipe(Number);
@@ -84,7 +87,7 @@ bool Pipe_ConfigurePipe(const uint8_t Address,
 	                                ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
 	                                ((Banks > 1) ? AVR32_USBB_PBK_MASK : 0)       |
 	                                Pipe_BytesToEPSizeMask(Size) |
-	                                ((EndpointNumber & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET));
+	                                ((uint32_t)Number << AVR32_USBB_PEPNUM_OFFSET));
 
 	Pipe_SetInfiniteINRequests();
 
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
index 0c3136e1..0d313fed 100644
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
@@ -204,7 +204,7 @@
 			static inline uint8_t Pipe_GetPipeDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
 			static inline uint8_t Pipe_GetPipeDirection(void)
 			{
-				return (((&AVR32_USBB.UPCFG0)[USB_Endpoint_SelectedEndpoint].ptoken == PIPE_TOKEN_OUT) ? PIPE_DIR_OUT : PIPE_DIR_IN);
+				return (((&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].ptoken == PIPE_TOKEN_OUT) ? PIPE_DIR_OUT : PIPE_DIR_IN);
 			}
 			
 			/** Returns the pipe address of the currently selected pipe. This is typically used to save the
diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
index 9e4e4a21..6a3df6e7 100644
--- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
@@ -112,7 +112,7 @@ void USB_ResetInterface(void)
 	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].pllsel = !(USB_Options & USB_OPT_GCLK_SRC_OSC);
 	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].oscsel = !(USB_Options & USB_OPT_GCLK_CHANNEL_0);
 	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].diven  = (F_USB != USB_CLOCK_REQUIRED_FREQ);
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].div    = (F_USB == USB_CLOCK_REQUIRED_FREQ) ? 0 : (uint32_t)(((F_USB / USB_CLOCK_REQUIRED_FREQ) - 1) / 2);
+	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].div    = (F_USB == USB_CLOCK_REQUIRED_FREQ) ? 0 : (uint32_t)((F_USB / USB_CLOCK_REQUIRED_FREQ / 2) - 1);
 	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].cen    = true;
 
 	USB_INT_DisableAllInterrupts();
diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
index 92e245ca..006e0897 100644
--- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
@@ -84,6 +84,16 @@
 			#error F_USB is not defined. You must define F_USB to the frequency of the clock input to the USB module.
 		#endif
 
+		#if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR))
+			#if ((F_USB < 12000000) || (F_USB % 12000000))
+				#error Invalid F_USB specified. F_USB must be a multiple of 12MHz for UC3A3 and UC3A4 devices.
+			#endif		
+		#else
+			#if ((F_USB < 48000000) || (F_USB % 48000000))
+				#error Invalid F_USB specified. F_USB must be a multiple of 48MHz for UC3A and UC3B devices.
+			#endif		
+		#endif
+		
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name USB Controller Option Masks */
@@ -172,7 +182,7 @@
 			 *                      from the \ref USB_Modes_t enum.
 			 *
 			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behaviour. This should be comprised of
+			 *                      interface to control the USB interface's behavior. This should be comprised of
 			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
 			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
 			 *                      mode speed.
diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index f62c8c15..7ae30bbc 100644
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -102,6 +102,11 @@
 		 */
 		#define USB_SERIES_UC3A3_AVR
 
+		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A4 Series USB controller
+		 *  (i.e. AT32UC3A4*) when defined.
+		 */
+		#define USB_SERIES_UC3A4_AVR
+		
 		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3B0 Series USB controller
 		 *  (i.e. AT32UC3B0*) when defined.
 		 */
diff --git a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
index 774a574f..db804506 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
+++ b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
@@ -1,275 +1,275 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-#include "../../../../Common/Common.h"

-#if (ARCH == ARCH_XMEGA)

-

-#define  __INCLUDE_FROM_USB_DRIVER

-#include "../USBMode.h"

-

-#if defined(USB_CAN_BE_DEVICE)

-

-#include "EndpointStream_XMEGA.h"

-

-#if !defined(CONTROL_ONLY_DEVICE)

-uint8_t Endpoint_Discard_Stream(uint16_t Length,

-                                uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearOUT();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Discard_8();

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-uint8_t Endpoint_Null_Stream(uint16_t Length,

-                             uint16_t* const BytesProcessed)

-{

-	uint8_t  ErrorCode;

-	uint16_t BytesInTransfer = 0;

-	

-	if ((ErrorCode = Endpoint_WaitUntilReady()))

-	  return ErrorCode;

-	  

-	if (BytesProcessed != NULL)

-	  Length -= *BytesProcessed;

-

-	while (Length)

-	{

-		if (!(Endpoint_IsReadWriteAllowed()))

-		{

-			Endpoint_ClearIN();

-

-			if (BytesProcessed != NULL)

-			{

-				*BytesProcessed += BytesInTransfer;

-				return ENDPOINT_RWSTREAM_IncompleteTransfer;

-			}

-

-			if ((ErrorCode = Endpoint_WaitUntilReady()))

-			  return ErrorCode;

-		}

-		else

-		{

-			Endpoint_Write_8(0);

-

-			Length--;

-			BytesInTransfer++;

-		}

-	}

-	

-	return ENDPOINT_RWSTREAM_NoError;

-}

-

-/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_RW.c"

-

-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#include "Template/Template_Endpoint_RW.c"

-#endif

-

-#endif

-

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()

-#include "Template/Template_Endpoint_Control_R.c"

-

-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_Control_W.c"

-#endif

-

-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))

-	#include "Template/Template_Endpoint_Control_W.c"

-

-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE

-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0

-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount

-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())

-	#include "Template/Template_Endpoint_Control_R.c"

-#endif

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "../../../../Common/Common.h"
+#if (ARCH == ARCH_XMEGA)
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../USBMode.h"
+
+#if defined(USB_CAN_BE_DEVICE)
+
+#include "EndpointStream_XMEGA.h"
+
+#if !defined(CONTROL_ONLY_DEVICE)
+uint8_t Endpoint_Discard_Stream(uint16_t Length,
+                                uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearOUT();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Discard_8();
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+uint8_t Endpoint_Null_Stream(uint16_t Length,
+                             uint16_t* const BytesProcessed)
+{
+	uint8_t  ErrorCode;
+	uint16_t BytesInTransfer = 0;
+	
+	if ((ErrorCode = Endpoint_WaitUntilReady()))
+	  return ErrorCode;
+	  
+	if (BytesProcessed != NULL)
+	  Length -= *BytesProcessed;
+
+	while (Length)
+	{
+		if (!(Endpoint_IsReadWriteAllowed()))
+		{
+			Endpoint_ClearIN();
+
+			if (BytesProcessed != NULL)
+			{
+				*BytesProcessed += BytesInTransfer;
+				return ENDPOINT_RWSTREAM_IncompleteTransfer;
+			}
+
+			if ((ErrorCode = Endpoint_WaitUntilReady()))
+			  return ErrorCode;
+		}
+		else
+		{
+			Endpoint_Write_8(0);
+
+			Length--;
+			BytesInTransfer++;
+		}
+	}
+	
+	return ENDPOINT_RWSTREAM_NoError;
+}
+
+/* The following abuses the C preprocessor in order to copy-paste 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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_RW.c"
+
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_RW.c"
+#endif
+
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#include "Template/Template_Endpoint_RW.c"
 #endif
 
-#endif

+#endif
+
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
+#include "Template/Template_Endpoint_Control_R.c"
+
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_Control_W.c"
+#endif
+
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
+	#include "Template/Template_Endpoint_Control_W.c"
+
+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE
+	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
+	#include "Template/Template_Endpoint_Control_R.c"
+#endif
+
+#endif
+
+#endif
diff --git a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h
index 3269d2b1..f2fe2899 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h
@@ -1,648 +1,648 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-              

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 

-  documentation, and that the name of the author not be used in 

-  advertising or publicity pertaining to distribution of the 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Endpoint data stream transmission and reception management for the AVR XMEGA microcontrollers.

- *  \copydetails Group_EndpointStreamRW_XMEGA

- *

- *  \note This file should not be included directly. It is automatically included as needed by the USB driver

- *        dispatch header located in LUFA/Drivers/USB/USB.h.

- */

-

-/** \ingroup Group_EndpointStreamRW

- *  \defgroup Group_EndpointStreamRW_XMEGA Read/Write of Multi-Byte Streams (XMEGA)

- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR XMEGA architecture.

- *

- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from

- *  and to endpoints.

- *

- *  @{

- */ 

-

-#ifndef __ENDPOINT_STREAM_XMEGA_H__

-#define __ENDPOINT_STREAM_XMEGA_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../USBMode.h"		

-		#include "../USBTask.h"

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_USB_DRIVER)

-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Function Prototypes: */

-			/** \name Stream functions for null data */

-			//@{

-

-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Discard_Stream(uint16_t Length,

-			                                uint16_t* const BytesProcessed);

-

-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending

-			 *  full packets to the host as needed. The last packet is not automatically sent once the 

-			 *  remaining bytes have been written; the user is responsible for manually sending the last

-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.

-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Null_Stream(uint16_t Length,

-			                             uint16_t* const BytesProcessed);

-

-			//@}

-

-			/** \name Stream functions for RAM source/destination data */

-			//@{

-		

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

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes full while there is still data to process (and after the current

-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the

-			 *  total number of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used on CONTROL type endpoints.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *

-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,

-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid

-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time

-			 *  the endpoint bank becomes empty while there is still data to process (and after the current

-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number

-			 *  of bytes processed in the stream, and the function will exit with an error code of

-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed

-			 *  in the user code - to continue the transfer, call the function again with identical parameters

-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.

-			 *

-			 *  <b>Single Stream Transfer Example:</b>

-			 *  \code

-			 *  uint8_t DataStream[512];

-			 *  uint8_t ErrorCode;

-			 *  

-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *       // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  <b>Partial Stream Transfers Example:</b>

-			 *  \code

-			 *  uint8_t  DataStream[512];

-			 *  uint8_t  ErrorCode;

-			 *  uint16_t BytesProcessed;

-			 *  

-			 *  BytesProcessed = 0;

-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),

-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)

-			 *  {

-			 *      // Stream not yet complete - do other actions here, abort if required

-			 *  }

-			 *  

-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)

-			 *  {

-			 *      // Stream failed to complete - check ErrorCode here

-			 *  }

-			 *  \endcode

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \note This routine should not be used 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.

-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,

-			                                uint16_t Length,

-			                                uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const 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.

-			 *

-			 *  \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* const Buffer,

-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for EEPROM source/destination data */

-			//@{

-

-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().

-			 *

-			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,

-			                                 uint16_t Length,

-			                                 uint16_t* const BytesProcessed) 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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_BE(void* const Buffer,

-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-			/** \name Stream functions for PROGMEM source/destination data */

-			//@{

-

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

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) 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.

-			 *

-			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current

-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.

-			 *

-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

-			 */

-			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,

-			                                  uint16_t Length,

-			                                  uint16_t* const BytesProcessed) 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const 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.

-			 *        \n\n

-			 *

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

-			 *

-			 *  \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* const Buffer,

-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

-			//@}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-		

-#endif

-

-/** @} */

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+              
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Endpoint data stream transmission and reception management for the AVR XMEGA microcontrollers.
+ *  \copydetails Group_EndpointStreamRW_XMEGA
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
+/** \ingroup Group_EndpointStreamRW
+ *  \defgroup Group_EndpointStreamRW_XMEGA Read/Write of Multi-Byte Streams (XMEGA)
+ *  \brief Endpoint data stream transmission and reception management for the Atmel AVR XMEGA architecture.
+ *
+ *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
+ *  and to endpoints.
+ *
+ *  @{
+ */ 
+
+#ifndef __ENDPOINT_STREAM_XMEGA_H__
+#define __ENDPOINT_STREAM_XMEGA_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../USBMode.h"		
+		#include "../USBTask.h"
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Function Prototypes: */
+			/** \name Stream functions for null data */
+			//@{
+
+			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
+			 *  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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Discard_Stream(uint16_t Length,
+			                                uint16_t* const BytesProcessed);
+
+			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
+			 *  full packets to the host as needed. The last packet is not automatically sent once the 
+			 *  remaining bytes have been written; the user is responsible for manually sending the last
+			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
+			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Null_Stream(uint16_t Length,
+			                             uint16_t* const BytesProcessed);
+
+			//@}
+
+			/** \name Stream functions for RAM source/destination data */
+			//@{
+		
+			/** 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes full while there is still data to process (and after the current
+			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
+			 *  total number of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used on CONTROL type endpoints.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *
+			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
+			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
+			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
+			 *  the endpoint bank becomes empty while there is still data to process (and after the current
+			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
+			 *  of bytes processed in the stream, and the function will exit with an error code of
+			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
+			 *  in the user code - to continue the transfer, call the function again with identical parameters
+			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
+			 *
+			 *  <b>Single Stream Transfer Example:</b>
+			 *  \code
+			 *  uint8_t DataStream[512];
+			 *  uint8_t ErrorCode;
+			 *  
+			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *       // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  <b>Partial Stream Transfers Example:</b>
+			 *  \code
+			 *  uint8_t  DataStream[512];
+			 *  uint8_t  ErrorCode;
+			 *  uint16_t BytesProcessed;
+			 *  
+			 *  BytesProcessed = 0;
+			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
+			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+			 *  {
+			 *      // Stream not yet complete - do other actions here, abort if required
+			 *  }
+			 *  
+			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
+			 *  {
+			 *      // Stream failed to complete - check ErrorCode here
+			 *  }
+			 *  \endcode
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \note This routine should not be used 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.
+			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
+			                                uint16_t Length,
+			                                uint16_t* const BytesProcessed) 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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 status OUT packet
+			 *  to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const 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
+			 *  status IN packet to finalize the transfer's status stage 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.
+			 *
+			 *  \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* const Buffer,
+			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for EEPROM source/destination data */
+			//@{
+
+			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
+
+			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().
+			 *
+			 *  \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]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,
+			                                 uint16_t Length,
+			                                 uint16_t* const BytesProcessed) 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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_BE(void* const Buffer,
+			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+			/** \name Stream functions for PROGMEM source/destination data */
+			//@{
+
+			/** 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) 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.
+			 *
+			 *  \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] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
+			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
+			 *
+			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
+			 */
+			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,
+			                                  uint16_t Length,
+			                                  uint16_t* const BytesProcessed) 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const 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.
+			 *        \n\n
+			 *
+			 *  \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.
+			 *
+			 *  \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* const Buffer,
+			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
+			//@}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+		
+#endif
+
+/** @} */
 
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
index 23de8fc0..3d2926c3 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
@@ -90,14 +90,18 @@
 
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
-			#if !defined(CONTROL_ONLY_DEVICE) || defined(__DOXYGEN__)
+			#if (!defined(MAX_ENDPOINT_INDEX) && !defined(CONTROL_ONLY_DEVICE)) || defined(__DOXYGEN__)
 				/** Total number of endpoints (including the default control endpoint at address 0) which may
 				 *  be used in the device. Different USB AVR models support different amounts of endpoints,
 				 *  this value reflects the maximum number of endpoints for the currently selected AVR model.
 				 */
 				#define ENDPOINT_TOTAL_ENDPOINTS            16
 			#else
-				#define ENDPOINT_TOTAL_ENDPOINTS            1
+				#if defined(CONTROL_ONLY_DEVICE)
+					#define ENDPOINT_TOTAL_ENDPOINTS        1
+				#else
+					#define ENDPOINT_TOTAL_ENDPOINTS        (MAX_ENDPOINT_INDEX + 1)
+				#endif
 			#endif
 
 	/* Private Interface - For use in library only: */
@@ -242,8 +246,12 @@
 			{
 				uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | ((Banks > 1) ? USB_EP_PINGPONG_bm : 0) | Endpoint_BytesToEPSizeMask(Size));
 
+				if ((Address & ENDPOINT_EPNUM_MASK) >= ENDPOINT_TOTAL_ENDPOINTS)
+				  return false;
+
 				// TODO - Fix once limitations are lifted
-				if ((Banks > 1) || (Size > 64))
+				EPConfigMask &= ~USB_EP_PINGPONG_bm;
+				if (Size > 64)
 				  return false;
 
 				switch (Type)
diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
index 844ef650..09d4ab62 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
+++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
@@ -76,7 +76,7 @@ void USB_Init(
 	USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1));
 	NVM.CMD  = 0;
 
-	/* Ugly workaround to ensure an aligned table, since __BIGGEST_ALIGNMENT__ == 1 for 8-bit AVR-GCC */
+	/* Ugly workaround to ensure an aligned table, since __BIGGEST_ALIGNMENT__ == 1 for the 8-bit AVR-GCC toochain */
 	USB.EPPTR = ((intptr_t)&USB_EndpointTable[1] & ~(1 << 0));
 	USB.CTRLA = (USB_STFRNUM_bm | ((ENDPOINT_TOTAL_ENDPOINTS - 1) << USB_MAXEP_gp));
 
diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
index 25402e85..e1c782db 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
@@ -180,7 +180,7 @@
 			 *                      from the \ref USB_Modes_t enum.
 			 *
 			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behaviour. This should be comprised of
+			 *                      interface to control the USB interface's behavior. This should be comprised of
 			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
 			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
 			 *                      mode speed.