From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 15 Dec 2015 10:49:05 +0000 (+1100)
Subject: Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATION... 
X-Git-Tag: LUFA-170418~35
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7?ds=sidebyside;hp=--cc

Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled (thanks to Matlo).
---

40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 2d86ec1d9..eac7d429c 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -11,6 +11,8 @@
   *  - Core:
   *   - The CALLBACK_USB_GetDescriptor() callback function into the user application erroneously had a uint8_t type for the wIndex
   *     parameter, instead of uint16_t (thanks to Matlo)
+  *   - Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled
+  *     in a user application (thanks to Matlo)
   *
   *  \section Sec_ChangeLog151115 Version 151115
   *  <b>New:</b>
diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index a730711e6..831581569 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -152,8 +152,8 @@ static void USB_Device_SetConfiguration(void)
 			#define MemoryAddressSpace  MEMSPACE_FLASH
 		#elif defined(USE_EEPROM_DESCRIPTORS)
 			#define MemoryAddressSpace  MEMSPACE_EEPROM
-		#elif defined(USE_SRAM_DESCRIPTORS)
-			#define MemoryAddressSpace  MEMSPACE_SRAM
+		#elif defined(USE_RAM_DESCRIPTORS)
+			#define MemoryAddressSpace  MEMSPACE_RAM
 		#else
 			uint8_t MemoryAddressSpace;
 		#endif