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.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1721 d5102386-fcda-11dd-9fdb-3debd5008f28

1 files changed, 90 insertions, 82 deletions

diff --git a/LUFA/Drivers/USB/Core/EndpointStream.c b/LUFA/Drivers/USB/Core/EndpointStream.c
index 974af682..893a6ff3 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