Added new TOTAL_NUM_CONFIGURATIONS option, removed USE_SINGLE_DEVICE_CONFIGURATION compile time option (but silently convert it to USE_SINGLE_DEVICE_CONFIGURATION internally for compatibility).

Added new USE_FLASH_DESCRIPTORS compile time option. By default, descriptors can now lie in mixed memory spaces (specified by a new parameter to the CALLBACK_USB_GetDescriptor() function) unless one of the USE_*_DESCRIPTORS compile time option is specified.

5 files changed, 92 insertions, 19 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index bad934a3c..2ac0dd354 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -39,7 +39,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
 	  return;

 	  

 	if ((USB_ControlRequest.wIndex   != HIDInterfaceInfo->Config.InterfaceNumber) &&

-	    (USB_ControlRequest.bRequest != SetIdle))

+	    (USB_ControlRequest.bRequest != REQ_SetIdle))

 	{

 		return;

 	}

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 1b6099153..90ea3ab4b 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -107,7 +107,7 @@
 			} USB_ClassInfo_CDC_Host_t;

 			

 		/* Enums: */

-			typedef enum

+			enum

 			{

 				CDC_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully */

 				CDC_ENUMERROR_ControlError               = 1, /**< A control request to the device failed to complete successfully */

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 231821646..deaa9c038 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -132,23 +132,51 @@ static void USB_Device_SetConfiguration(void)
 {

 	bool AlreadyConfigured = (USB_ConfigurationNumber != 0);

 

-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)

-	if ((uint8_t)USB_ControlRequest.wValue > 1)

+#if defined(TOTAL_NUM_CONFIGURATIONS)

+	if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS)

+	  return;

 #else

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

+	uint8_t MemoryAddressSpace;

+	#endif

+	

 	USB_Descriptor_Device_t* DevDescriptorPtr;

 

-	if ((CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||

+	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr

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

+	                               , &MemoryAddressSpace) == NO_DESCRIPTOR)

+	#endif

+	{

+		return;

+	}

+	

 	#if defined(USE_RAM_DESCRIPTORS)

-	    ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))

+	if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)

+	  return;

 	#elif defined (USE_EEPROM_DESCRIPTORS)

-	    ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))

+	if ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations))

+	  return;

+	#elif defined (USE_FLASH_DESCRIPTORS)

+	if ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations))

+	  return;

 	#else

-	    ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))

-	#endif

-#endif

+	if (MemoryAddressSpace == MEMSPACE_FLASH)

 	{

-		return;

+		if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))

+		  return;

 	}

+	else if (MemoryAddressSpace == MEMSPACE_EEPROM)

+	{

+		if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))

+		  return;

+	}

+	else

+	{

+		if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)

+		  return;

+	}

+	#endif

+#endif

 	

 	Endpoint_ClearSETUP();

 

@@ -229,6 +257,10 @@ static void USB_Device_GetDescriptor(void)
 	void*    DescriptorPointer;

 	uint16_t DescriptorSize;

 	

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

+	uint8_t  DescriptorAddressSpace;

+	#endif

+	

 	#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))

 	if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))

 	{

@@ -238,7 +270,11 @@ static void USB_Device_GetDescriptor(void)
 	#endif

 	

 	if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,

-	                                                 &DescriptorPointer)) == NO_DESCRIPTOR)

+	                                                 &DescriptorPointer

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

+	                                                 , &DescriptorAddressSpace

+	#endif

+													 )) == NO_DESCRIPTOR)

 	{

 		return;

 	}

@@ -249,8 +285,15 @@ static void USB_Device_GetDescriptor(void)
 	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);

 	#elif defined(USE_EEPROM_DESCRIPTORS)

 	Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);

-	#else

+	#elif defined(USE_FLASH_DESCRIPTORS)

 	Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);	

+	#else

+	if (DescriptorAddressSpace == MEMSPACE_FLASH)

+	  Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);	

+	else if (DescriptorAddressSpace == MEMSPACE_EEPROM)

+	  Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);

+	else

+	  Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);	

 	#endif

 

 	Endpoint_ClearOUT();

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 2640cbba1..55e3b8253 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -48,16 +48,33 @@
 			extern "C" {

 		#endif

 

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

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

+		/* Macros: */

+			#if defined(USE_SINGLE_DEVICE_CONFIGURATION)

+				#define TOTAL_NUM_CONFIGURATIONS           1

+			#endif

+	

+		/* Enums: */

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

+				/** Enum for the possible descriptor memory spaces, for the MemoryAddressSpace of the

+				 *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the USE_*_DESCRIPTORS

+				 *  compile time options are used, to indicate in which memory space the descriptor is stored.

+				 *

+				 *  \ingroup Group_Device

+				 */

+				enum USB_DescriptorMemorySpaces_t

+				{

+					MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory */

+					MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory */

+					MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory */

+				};

+			#endif

+	

 		/* Global Variables: */

 			/** Indicates the currently set configuration number of the device. USB devices may have several

 			 *  different configurations which the host can select between; this indicates the currently selected

 			 *  value, or 0 if no configuration has been selected.

 			 *

-			 *  If a device has only one single configuration, the token USE_SINGLE_DEVICE_CONFIGURATION may be

-			 *  defined in the project makefile and passed to the compiler using the -D switch. This optimize for

-			 *  a single configuration, saving a small amount of space in the resulting compiled binary.

-			 *

 			 *  \note This variable should be treated as read-only in the user application, and never manually

 			 *        changed in value.

 			 *

@@ -87,6 +104,12 @@
 	#if !defined(__DOXYGEN__)

 		#if defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)

 			#error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.

+		#elif defined(USE_RAM_DESCRIPTORS) && defined(USE_FLASH_DESCRIPTORS)

+			#error USE_RAM_DESCRIPTORS and USE_FLASH_DESCRIPTORS are mutually exclusive.

+		#elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)

+			#error USE_FLASH_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.

+		#elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS)

+			#error Only one of the USE_*_DESCRIPTORS modes should be selected.

 		#endif

 	

 		/* Function Prototypes: */

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index 470c317a0..975d09a79 100644
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -133,6 +133,9 @@
 			 *                     standards.

 			 *  \param[out] DescriptorAddress  Pointer to the descriptor in memory. This should be set by the routine to

 			 *                                 the address of the descriptor.

+			 *  \param[out] MemoryAddressSpace A value from the \ref USB_DescriptorMemorySpaces_t enum to indicate the memory

+			 *                                 space in which the descriptor is stored. This parameter does not exist when one

+			 *                                 of the USE_*_DESCRIPTORS compile time options is used.

 			 *

 			 *  \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.

 			 *        If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to

@@ -142,7 +145,11 @@
 			 *

 			 *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise

 			 */

-			uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+			uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress

+			#if !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);

 

 	/* Private Interface - For use in library only: */