Add in new architecture attribute defines to selectively remove the EEPROM and FLASH...

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index b7d564a..42662ef 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -80,7 +80,11 @@
                        
                        typedef uint8_t uint_reg_t;
                        
                        
                        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>
                        #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 _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
                        // ==================================================
 
                        typedef uint32_t uint_reg_t;
                        
                        #define  ARCH_BIG_ENDIAN

+

                        #include "Endianness.h"
                #else
                        #error Unknown device architecture specified.
                        #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 bbc1b46..be3dfd1 100644 (file)
--- 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,\r
                                                            const uint8_t wIndex,\r
                                                            const void** const DescriptorAddress\r
                        uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
                                                            const uint8_t wIndex,\r
                                                            const void** const DescriptorAddress\r

-                       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                       #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \\r
+                           !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))\r

                                                            , uint8_t* MemoryAddressSpace\r
                        #endif\r
                                                            ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
                                                            , uint8_t* MemoryAddressSpace\r
                        #endif\r
                                                            ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index 2ac6c0a..f6bedda 100644 (file)
--- 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 ((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)
                                                         , &DescriptorAddressSpace
        #endif
                                                                                                         )) == NO_DESCRIPTOR)


@@ -248,7 +249,7 @@ static void USB_Device_GetDescriptor(void)
 
        Endpoint_ClearSETUP();
 
 
        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);
        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 dbf1ca4..26a55a4 100644 (file)
--- 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: */
                #endif
 
        /* Public Interface - May be used in end-application: */

-               /* Macros: */
-                       #if defined(USE_SINGLE_DEVICE_CONFIGURATION)
-                               #define FIXED_NUM_CONFIGURATIONS           1
-                       #endif
-

                /* Enums: */
                /* 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.
                                /** 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 974af68..893a6ff 100644 (file)
--- 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)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_RW.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      const void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      const void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r


@@ -146,22 +130,6 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_RW.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r


@@ -170,14 +138,6 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
-#include "Template/Template_Endpoint_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r


@@ -186,13 +146,57 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      void*\r
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
-#include "Template/Template_Endpoint_RW.c"\r
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_RW.c"\r
+#endif\r
+\r
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #include "Template/Template_Endpoint_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      void*\r
+       #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #include "Template/Template_Endpoint_RW.c"\r
+#endif\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r


@@ -202,58 +206,62 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_Control_W.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_Control_W.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_Control_W.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_Control_W.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_Control_W.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Endpoint_Control_W.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_Control_W.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Endpoint_Control_W.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_Control_R.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_Control_R.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
-#include "Template/Template_Endpoint_Control_R.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_Control_R.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
 #include "Template/Template_Endpoint_Control_R.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
-#include "Template/Template_Endpoint_Control_R.c"\r
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_Control_W.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_Control_W.c"\r
+#endif\r
+\r
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_Control_W.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Endpoint_Control_W.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #include "Template/Template_Endpoint_Control_R.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #include "Template/Template_Endpoint_Control_R.c"\r
+#endif\r

 \r
 #endif
 \r
 #endif

diff --git a/LUFA/Drivers/USB/Core/EndpointStream.h b/LUFA/Drivers/USB/Core/EndpointStream.h
index 02a3483..b4454a3 100644 (file)
--- 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 */\r
                        //@{\r
 \r
                        /** \name Stream functions for EEPROM source/destination data */\r
                        //@{\r
 \r

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

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

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -482,6 +485,8 @@
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().\r
                         *\r
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -495,6 +500,8 @@
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Read_Stream_LE().\r
                         *\r
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Read_Stream_LE().\r
                         *\r

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

                         *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.\r
                         *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.\r
                         *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -508,6 +515,8 @@
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Read_Stream_BE().\r
                         *\r
 \r
                        /** EEPROM buffer source version of \ref Endpoint_Read_Stream_BE().\r
                         *\r

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

                         *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.\r
                         *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.\r
                         *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -526,6 +535,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -545,6 +557,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -564,6 +579,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -583,6 +601,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -594,15 +615,19 @@
                         */\r
                        uint8_t Endpoint_Read_Control_EStream_BE(void* const Buffer,\r
                                                                 uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r
                         */\r
                        uint8_t Endpoint_Read_Control_EStream_BE(void* const Buffer,\r
                                                                 uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r

+                       #endif\r

                        //@}\r
 \r
                        /** \name Stream functions for PROGMEM source/destination data */\r
                        //@{\r
 \r
                        //@}\r
 \r
                        /** \name Stream functions for PROGMEM source/destination data */\r
                        //@{\r
 \r

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

                        /** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r
                        /** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -618,6 +643,8 @@
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current\r


@@ -638,6 +665,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -659,6 +689,9 @@
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *        \n\n\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r

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

                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r


@@ -670,6 +703,7 @@
                         */\r
                        uint8_t Endpoint_Write_Control_PStream_BE(const void* const Buffer,\r
                                                                  uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r
                         */\r
                        uint8_t Endpoint_Write_Control_PStream_BE(const void* const Buffer,\r
                                                                  uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r

+                       #endif\r

                        //@}\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                        //@}\r
 \r
        /* Disable C linkage for C++ Compilers: */\r

diff --git a/LUFA/Drivers/USB/Core/PipeStream.c b/LUFA/Drivers/USB/Core/PipeStream.c
index 4465471..66babf4 100644 (file)
--- 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)\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Pipe_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Pipe_RW.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Pipe_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      const void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      const void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r


@@ -158,24 +140,6 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)\r
 #include "Template/Template_Pipe_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
-#include "Template/Template_Pipe_RW.c"\r
-\r
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      const void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
-#include "Template/Template_Pipe_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r


@@ -185,15 +149,6 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
 #include "Template/Template_Pipe_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r
-#define  TEMPLATE_BUFFER_TYPE                      void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
-#include "Template/Template_Pipe_RW.c"\r
-\r

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r
 #define  TEMPLATE_BUFFER_TYPE                      void*\r
 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r


@@ -203,14 +158,63 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
 #include "Template/Template_Pipe_RW.c"\r
 \r

-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r
-#define  TEMPLATE_BUFFER_TYPE                      void*\r
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
-#include "Template/Template_Pipe_RW.c"\r
+#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Pipe_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #include "Template/Template_Pipe_RW.c"\r
+#endif\r
+\r
+#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Pipe_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      const void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #include "Template/Template_Pipe_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r
+       #define  TEMPLATE_BUFFER_TYPE                      void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
+       #include "Template/Template_Pipe_RW.c"\r
+\r
+       #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r
+       #define  TEMPLATE_BUFFER_TYPE                      void*\r
+       #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+       #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+       #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
+       #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
+       #include "Template/Template_Pipe_RW.c"\r
+#endif\r

 \r
 #endif\r
 
 \r
 #endif\r
 

diff --git a/LUFA/Drivers/USB/Core/PipeStream.h b/LUFA/Drivers/USB/Core/PipeStream.h
index c579631..c914fc1 100644 (file)
--- 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 */\r
                        //@{\r
                        \r
                        /** \name Stream functions for EEPROM source/destination data */\r
                        //@{\r
                        \r

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

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

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -378,6 +381,8 @@
                        \r
                        /** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().\r
                         *\r
                        \r
                        /** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -391,6 +396,8 @@
 \r
                        /** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().\r
                         *\r
 \r
                        /** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().\r
                         *\r

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

                         *  \param[out] Buffer          Pointer to the source data buffer to write to.\r
                         *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[out] Buffer          Pointer to the source data buffer to write to.\r
                         *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -404,6 +411,8 @@
                        \r
                        /** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().\r
                         *\r
                        \r
                        /** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().\r
                         *\r

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

                         *  \param[out] Buffer          Pointer to the source data buffer to write to.\r
                         *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[out] Buffer          Pointer to the source data buffer to write to.\r
                         *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -414,15 +423,19 @@
                        uint8_t Pipe_Read_EStream_BE(void* const Buffer,\r
                                                     uint16_t Length,\r
                                                     uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);\r
                        uint8_t Pipe_Read_EStream_BE(void* const Buffer,\r
                                                     uint16_t Length,\r
                                                     uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);\r

+                       #endif\r

                        //@}\r
 \r
                        /** \name Stream functions for PROGMEM source/destination data */\r
                        //@{\r
                        \r
                        //@}\r
 \r
                        /** \name Stream functions for PROGMEM source/destination data */\r
                        //@{\r
                        \r

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

                        /** FLASH buffer source version of \ref Pipe_Write_Stream_LE().\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r
                        /** FLASH buffer source version of \ref Pipe_Write_Stream_LE().\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -438,6 +451,8 @@
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r
                         *\r
                         *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.\r
                         *\r

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

                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r
                         *  \param[in] Buffer          Pointer to the source data buffer to read from.\r
                         *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should\r


@@ -448,6 +463,7 @@
                        uint8_t Pipe_Write_PStream_BE(const void* const Buffer,\r
                                                      uint16_t Length,\r
                                                      uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);\r
                        uint8_t Pipe_Write_PStream_BE(const void* const Buffer,\r
                                                      uint16_t Length,\r
                                                      uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);\r

+                       #endif\r

                        //@}\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                        //@}\r
 \r
        /* Disable C linkage for C++ Compilers: */\r

diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
index 8b29628..da32b3e 100644 (file)
--- 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.\r
                #endif\r
 \r
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r

+               #if !defined(F_USB)\r
+                       #error F_USB is not defined. You must define F_USB to the frequency of the clock input to the USB module.\r
+               #endif\r
+\r

        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** \name USB Controller Option Masks */\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** \name USB Controller Option Masks */\r

diff --git a/LUFA/ManPages/ConfiguringApps.txt b/LUFA/ManPages/ConfiguringApps.txt
index b56341e..c4a1ce2 100644 (file)
--- a/LUFA/ManPages/ConfiguringApps.txt
+++ b/LUFA/ManPages/ConfiguringApps.txt
@@ -6,10 +6,10 @@
 
 /** \page Page_ConfiguringApps Configuring the Demos, Bootloaders and Projects
  *
 
 /** \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.
  *
  *  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:
  *
  *  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>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
  *    - <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
  *  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.
  *
  *
  *  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
  *  \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.
  *
  *  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.
  *
  *
  *  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
  *  \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,
  *
  *  \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
  *  \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.
  */
  *  on the available LUFA compile time configuration options.
  */