diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 11:10:02 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 11:10:02 +0000 |
| commit | f595043584d864d2618da62f422cf57ed5eda6f4 (patch) | |
| tree | ed1db5d5b56343dd26549f3804f08ee6e1975eb9 /LUFA/Drivers/USB/Core/DeviceStandardReq.c | |
| parent | aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96 (diff) | |
| download | lufa-f595043584d864d2618da62f422cf57ed5eda6f4.tar.gz lufa-f595043584d864d2618da62f422cf57ed5eda6f4.tar.bz2 lufa-f595043584d864d2618da62f422cf57ed5eda6f4.zip | |
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.
Diffstat (limited to 'LUFA/Drivers/USB/Core/DeviceStandardReq.c')
| -rw-r--r-- | LUFA/Drivers/USB/Core/DeviceStandardReq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c index 2ac6c0a54..f6bedda5f 100644 --- 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 !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) @@ -248,7 +249,7 @@ static void USB_Device_GetDescriptor(void) 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); |