diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2015-12-15 21:49:05 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2015-12-15 21:49:05 +1100 |
| commit | 40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7 (patch) | |
| tree | dfb9e5e41f168ca797eec03500eab5ff51fed814 /LUFA | |
| parent | 92e9cb71e290ea7e05d15f4761b8a07d786a8aa9 (diff) | |
| download | lufa-40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7.tar.gz lufa-40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7.tar.bz2 lufa-40e1caa2da06d6d4699d5dc3dafb3d34b81f23f7.zip | |
Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled (thanks to Matlo).
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/DoxygenPages/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/DeviceStandardReq.c | 4 |
2 files changed, 4 insertions, 2 deletions
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 |