aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/Core/Device.h
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-03-21 11:10:02 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-03-21 11:10:02 +0000
commitf595043584d864d2618da62f422cf57ed5eda6f4 (patch)
treeed1db5d5b56343dd26549f3804f08ee6e1975eb9 /LUFA/Drivers/USB/Core/Device.h
parentaba7932a5c7c5f4a65f1c8558c94ed313ff3ca96 (diff)
downloadlufa-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/Device.h')
-rw-r--r--LUFA/Drivers/USB/Core/Device.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h
index bbc1b46ca..be3dfd118 100644
--- a/LUFA/Drivers/USB/Core/Device.h
+++ b/LUFA/Drivers/USB/Core/Device.h
@@ -121,7 +121,8 @@
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const void** const DescriptorAddress
- #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+ #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
+ !(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);