Add in new architecture attribute defines to selectively remove the EEPROM and FLASH memory space functions on architectures which do not have seperate memory address spaces.

10 files changed, 240 insertions, 173 deletions

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index b7d564aa3..42662ef39 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -80,7 +80,11 @@
 			
 			typedef uint8_t uint_reg_t;
 			
-			#define  ARCH_LITTLE_ENDIAN
+			#define ARCH_HAS_EEPROM_ADDRESS_SPACE
+			#define ARCH_HAS_FLASH_ADDRESS_SPACE
+			#define ARCH_HAS_MULTI_ADDRESS_SPACE
+			#define ARCH_LITTLE_ENDIAN
+
 			#include "Endianness.h"
 		#elif (ARCH == ARCH_UC3)
 			#include <avr32/io.h>
@@ -94,12 +98,12 @@
 			#define _delay_ms(x)
 			#define memcmp_P(...)            memcmp(__VA_ARGS__)
 			#define memcpy_P(...)            memcpy(__VA_ARGS__)
-			#define USE_RAM_DESCRIPTORS
 			// ==================================================
 
 			typedef uint32_t uint_reg_t;
 			
 			#define  ARCH_BIG_ENDIAN
+
 			#include "Endianness.h"
 		#else
 			#error Unknown device architecture specified.
diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h
index bbc1b46ca..be3dfd118 100644
--- a/LUFA/Drivers/USB/Core/Device.h
+++ b/LUFA/Drivers/USB/Core/Device.h
@@ -121,7 +121,8 @@
 			uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

 			                                    const uint8_t wIndex,

 			                                    const void** const DescriptorAddress

-			#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)

+			#if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \

+			    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))

 			                                    , uint8_t* MemoryAddressSpace

 			#endif

 			                                    ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index 2ac6c0a54..f6bedda5f 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -238,7 +238,8 @@ static void USB_Device_GetDescriptor(void)
 
 	if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
 	                                                 &DescriptorPointer
-	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
+	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
 	                                                 , &DescriptorAddressSpace
 	#endif
 													 )) == NO_DESCRIPTOR)
@@ -248,7 +249,7 @@ static void USB_Device_GetDescriptor(void)
 
 	Endpoint_ClearSETUP();
 
-	#if defined(USE_RAM_DESCRIPTORS)
+	#if defined(USE_RAM_DESCRIPTORS) || !defined(ARCH_HAS_MULTI_ADDRESS_SPACE)
 	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
 	#elif defined(USE_EEPROM_DESCRIPTORS)
 	Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.h b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
index dbf1ca4a7..26a55a4e4 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.h
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
@@ -61,13 +61,8 @@
 		#endif
 
 	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if defined(USE_SINGLE_DEVICE_CONFIGURATION)
-				#define FIXED_NUM_CONFIGURATIONS           1
-			#endif
-
 		/* Enums: */
-			#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+			#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)
 				/** Enum for the possible descriptor memory spaces, for the \c MemoryAddressSpace parameter of the
 				 *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the \c USE_*_DESCRIPTORS
 				 *  compile time options are used, to indicate in which memory space the descriptor is stored.
diff --git a/LUFA/Drivers/USB/Core/EndpointStream.c b/LUFA/Drivers/USB/Core/EndpointStream.c
index 974af682c..893a6ff35 100644
--- a/LUFA/Drivers/USB/Core/EndpointStream.c
+++ b/LUFA/Drivers/USB/Core/EndpointStream.c
@@ -122,22 +122,6 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)

 #include "Template/Template_Endpoint_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE

-#define  TEMPLATE_BUFFER_TYPE                      const void*

-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

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

-#include "Template/Template_Endpoint_RW.c"

-

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE

-#define  TEMPLATE_BUFFER_TYPE                      const void*

-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(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()

@@ -146,22 +130,6 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_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_Byte(eeprom_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_Byte(pgm_read_byte(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()

@@ -170,14 +138,6 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE

-#define  TEMPLATE_BUFFER_TYPE                      void*

-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

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

-#include "Template/Template_Endpoint_RW.c"

-

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

@@ -186,13 +146,57 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE

-#define  TEMPLATE_BUFFER_TYPE                      void*

-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

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

-#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_Byte(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_Byte(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_Byte(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_Byte(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_Byte())

+	#include "Template/Template_Endpoint_RW.c"

+

+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE

+	#define  TEMPLATE_BUFFER_TYPE                      void*

+	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

+	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())

+	#include "Template/Template_Endpoint_RW.c"

+#endif

 

 #endif

 

@@ -202,58 +206,62 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)

 #include "Template/Template_Endpoint_Control_W.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

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

-#include "Template/Template_Endpoint_Control_W.c"

-

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(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_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_Byte(pgm_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_Byte(eeprom_read_byte(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_Byte()

 #include "Template/Template_Endpoint_Control_R.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

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

-#include "Template/Template_Endpoint_Control_R.c"

-

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_Control_R.c"

 

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE

-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

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

-#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_Byte(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_Byte(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_Byte(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_Byte(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_Byte())

+	#include "Template/Template_Endpoint_Control_R.c"

+

+	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE

+	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())

+	#include "Template/Template_Endpoint_Control_R.c"

+#endif

 

 #endif
diff --git a/LUFA/Drivers/USB/Core/EndpointStream.h b/LUFA/Drivers/USB/Core/EndpointStream.h
index 02a348347..b4454a330 100644
--- a/LUFA/Drivers/USB/Core/EndpointStream.h
+++ b/LUFA/Drivers/USB/Core/EndpointStream.h
@@ -467,8 +467,11 @@
 			/** \name Stream functions for EEPROM source/destination data */

 			//@{

 

+			#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE) || defined(__DOXYGEN__)

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -482,6 +485,8 @@
 

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -495,6 +500,8 @@
 

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -508,6 +515,8 @@
 

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -526,6 +535,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -545,6 +557,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -564,6 +579,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -583,6 +601,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -594,15 +615,19 @@
 			 */

 			uint8_t Endpoint_Read_Control_EStream_BE(void* const Buffer,

 			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			#endif

 			//@}

 

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

 			//@{

 

+			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE) || defined(__DOXYGEN__)

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -618,6 +643,8 @@
 			 *

 			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -638,6 +665,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -659,6 +689,9 @@
 			 *        \n\n

 			 *

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

+			 *        \n\n

+			 *

+			 *  \note This function is not available on all architectures.

 			 *

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

@@ -670,6 +703,7 @@
 			 */

 			uint8_t Endpoint_Write_Control_PStream_BE(const void* const Buffer,

 			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			#endif

 			//@}

 

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

diff --git a/LUFA/Drivers/USB/Core/PipeStream.c b/LUFA/Drivers/USB/Core/PipeStream.c
index 4465471a8..66babf4a1 100644
--- a/LUFA/Drivers/USB/Core/PipeStream.c
+++ b/LUFA/Drivers/USB/Core/PipeStream.c
@@ -131,24 +131,6 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)

 #include "Template/Template_Pipe_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE

-#define  TEMPLATE_BUFFER_TYPE                      const void*

-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(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_Byte(eeprom_read_byte(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

@@ -158,24 +140,6 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_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_Byte(pgm_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_Byte(eeprom_read_byte(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

@@ -185,15 +149,6 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()

 #include "Template/Template_Pipe_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE

-#define  TEMPLATE_BUFFER_TYPE                      void*

-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            0

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

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

-#include "Template/Template_Pipe_RW.c"

-

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

@@ -203,14 +158,63 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()

 #include "Template/Template_Pipe_RW.c"

 

-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE

-#define  TEMPLATE_BUFFER_TYPE                      void*

-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

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

-#include "Template/Template_Pipe_RW.c"

+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)

+	#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_Byte(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_Byte(pgm_read_byte(BufferPtr))

+	#include "Template/Template_Pipe_RW.c"

+#endif

+

+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)

+	#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_Byte(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_Byte(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_Byte())

+	#include "Template/Template_Pipe_RW.c"

+

+	#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE

+	#define  TEMPLATE_BUFFER_TYPE                      void*

+	#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

+	#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

+	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)

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

+	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())

+	#include "Template/Template_Pipe_RW.c"

+#endif

 

 #endif

 
diff --git a/LUFA/Drivers/USB/Core/PipeStream.h b/LUFA/Drivers/USB/Core/PipeStream.h
index c579631dc..c914fc149 100644
--- a/LUFA/Drivers/USB/Core/PipeStream.h
+++ b/LUFA/Drivers/USB/Core/PipeStream.h
@@ -363,8 +363,11 @@
 			/** \name Stream functions for EEPROM source/destination data */

 			//@{

 			

+			#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE) || defined(__DOXYGEN__)

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -378,6 +381,8 @@
 			

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -391,6 +396,8 @@
 

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -404,6 +411,8 @@
 			

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -414,15 +423,19 @@
 			uint8_t Pipe_Read_EStream_BE(void* const Buffer,

 			                             uint16_t Length,

 			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

+			#endif

 			//@}

 

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

 			//@{

 			

+			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE) || defined(__DOXYGEN__)

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

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -438,6 +451,8 @@
 			 *

 			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.

 			 *

+			 *  \note This function is not available on all architectures.

+			 *

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

@@ -448,6 +463,7 @@
 			uint8_t Pipe_Write_PStream_BE(const void* const Buffer,

 			                              uint16_t Length,

 			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);

+			#endif

 			//@}

 

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

diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
index 8b29628ed..da32b3ed4 100644
--- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
@@ -80,6 +80,10 @@
 			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.

 		#endif

 

+		#if !defined(F_USB)

+			#error F_USB is not defined. You must define F_USB to the frequency of the clock input to the USB module.

+		#endif

+

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

 		/* Macros: */

 			/** \name USB Controller Option Masks */

diff --git a/LUFA/ManPages/ConfiguringApps.txt b/LUFA/ManPages/ConfiguringApps.txt
index b56341ee2..c4a1ce224 100644
--- a/LUFA/ManPages/ConfiguringApps.txt
+++ b/LUFA/ManPages/ConfiguringApps.txt
@@ -6,10 +6,10 @@
 
 /** \page Page_ConfiguringApps Configuring the Demos, Bootloaders and Projects
  *
- *  If the target AVR model, clock speed, board or other settings are different from the current settings, they must be changed
- *  and the project recompiled from the source code before being programmed into the AVR microcontroller. Most project
- *  configuration options are located in the "makefile" build script inside each LUFA application's folder, however some
- *  demo or application-specific configuration settings (such as the output format in the AudioOut demo) are located in one or
+ *  If the target microcontroller model, architecture, clock speed, board or other settings are different from the current
+ *  settings, they must be changed and the project recompiled from the source code before being programmed into the microcontroller.
+ *  Most project configuration options are located in the "makefile" build script inside each LUFA application's folder, however
+ *  some demo or application-specific configuration settings (such as the output format in the AudioOut demo) are located in one or
  *  more of the source files of the project. See each project's individual documentation for application-specific configuration
  *  values.
  *
@@ -20,10 +20,11 @@
  *  Inside each makefile, a number of configuration variables are located, with the format "<VARIABLE NAME> = <VALUE>". For
  *  each application, the important variables which should be altered are:
  *
- *    - <b>MCU</b>, the target AVR processor
+ *    - <b>MCU</b>, the target processor model
+ *    - <b>ARCH</b>, the target microcontroller architecture
  *    - <b>BOARD</b>, the target board hardware
- *    - <b>F_USB</b>, the target raw master clock frequency, before any prescaling is performed
- *    - <b>F_CPU</b>, the target AVR CPU master clock frequency, after any prescaling
+ *    - <b>F_CPU</b>, the target CPU master clock frequency, after any prescaling
+ *    - <b>F_USB</b>, the target raw input clock to the USB module of the processor
  *    - <b>CDEFS</b>, the C preprocessor defines which configure options the source code
  *    - <b>LUFA_PATH</b>, the path to the LUFA library source code
  *    - <b>LUFA_OPTS</b>, the compile time LUFA options which configure the library features
@@ -31,14 +32,21 @@
  *  These values should be changed to reflect the build hardware.
  *
  *  \section Sec_MCU The MCU Parameter
- *  This parameter indicates the target AVR model for the compiled application. This should be set to the model of the target AVR
- *  (such as the AT90USB1287, or the ATMEGA32U4), in all lower-case (e.g. "at90usb1287"). Note that not all demos support all the
- *  USB AVR models, as they may make use of peripherals or modes only present in some devices.
+ *  This parameter indicates the target microcontroller model for the compiled application. This should be set to the model of the target
+ *  microcontroller (such as the AT90USB1287, or the ATMEGA32U4), in all lower-case (e.g. "at90usb1287"). Note that not all demos support all the
+ *  microcontroller models and architectures, as they may make use of peripherals or modes only present in some devices.
  *
  *  For supported processor models, see \ref Page_DeviceSupport.
  *
+ *  \section Sec_ARCH The ARCH Parameter
+ *  This parameter indicates the target microcontroller architecture the library is to be compiled for. Different microcontroller
+ *  architectures require different source files to be compiled into the final binary, and so this option must be set to the correct
+ *  architecture for the selected platform.
+ *
+ *  For supported processor architectures, see \ref Page_DeviceSupport.
+ *
  *  \section Sec_BOARD The BOARD Parameter
- *  This parameter indicates the target AVR board hardware for the compiled application. Some LUFA library drivers are board-specific,
+ *  This parameter indicates the target board hardware for the compiled application. Some LUFA library drivers are board-specific,
  *  such as the LED driver, and the library needs to know the layout of the target board. If you are using one of the board models listed
  *  on the main library page, change this parameter to the board name in all UPPER-case.
  *
@@ -50,21 +58,13 @@
  *
  *  For boards with built in hardware driver support within the LUFA library, see \ref Page_DeviceSupport.
  *
- *  \section Sec_F_USB The F_USB Parameter
- *  This parameter indicates the target AVR's input clock frequency, in Hz. This is the actual clock input, before any prescaling is performed. In the
- *  USB AVR architecture, the input clock before any prescaling is fed directly to the PLL subsystem, and thus the PLL is derived directly from the
- *  clock input. The PLL then feeds the USB and other sections of the AVR with the correct upscaled frequencies required for those sections to function.
- *
- *  <b>Note that this value does not actually *alter* the AVR's input clock frequency</b>, it is just a way to indicate to the library the clock frequency
- *  of the AVR as set by the AVR's fuses. If this value does not reflect the actual running frequency of the AVR, incorrect operation of one of more
- *  library components will occur.
- *
  *  \section Sec_F_CPU The F_CPU Parameter
- *  This parameter indicates the target AVR's master CPU clock frequency, in Hz.
+ *  This parameter indicates the target microcontroller's main CPU clock frequency, in Hz. This is used by many libraries (and applications) for
+ *  timing related purposes, and should reflect the actual CPU speed after any prescaling or adjustments are performed.
  *
- *  <b>Note that this value does not actually *alter* the AVR's CPU clock frequency</b>, it is just a way to indicate to the library the clock frequency
- *  of the AVR core as set by the AVR's fuses. If this value does not reflect the actual running frequency of the AVR, incorrect operation of one of more
- *  library components will occur.
+ *  \section Sec_F_USB The F_USB Parameter
+ *  This parameter indicates the raw input clock frequency to the USB module within the microcontroller in Hz. This may be very different on some platforms
+ *  to the main CPU clock or other peripheral/bus clocks.
  *
  *  \section Sec_CDEFS The CDEFS Parameter
  *  Many applications have features which can be controlled by the defining of specially named preprocessor tokens at the point of compilation - for example,
@@ -82,8 +82,8 @@
  *  \section Sec_LUFA_OPTS The LUFA_OPTS Parameter
  *  This value is similar to the CDEFS parameter listed elsewhere -- indeed, it is simply a convenient place to group LUFA related tokens away from the
  *  application's compile time tokens. Normally, these options do not need to be altered to allow an application to compile and run correctly on a
- *  different board or AVR to the current configuration - if the options are incorrect, then the demo is most likely incompatible with the chosen USB AVR
- *  model and cannot be made to function through the altering of the makefile settings alone (or at all). Settings such as the USB mode (device, host or both),
- *  the USB interface speed (Low or Full speed) and other LUFA configuration options can be set here - see \ref Page_TokenSummary documentation for details
+ *  different board or microcontroller to the current configuration - if the options are incorrect, then the demo is most likely incompatible with the chosen
+ *  microcontroller model and cannot be made to function through the altering of the makefile settings alone (or at all). Settings such as the USB mode
+ *  (device, host or both), the USB interface speed and other LUFA configuration options can be set here - see \ref Page_TokenSummary documentation for details
  *  on the available LUFA compile time configuration options.
  */