aboutsummaryrefslogtreecommitdiff
path: root/LUFA/Drivers/USB/Core/Device.h
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2011-03-21 11:10:02 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2011-03-21 11:10:02 +0000
commit3d0202abe1124ce89436968dfaebbf5189b15045 (patch)
treeed1db5d5b56343dd26549f3804f08ee6e1975eb9 /LUFA/Drivers/USB/Core/Device.h
parent2ee4fb0693a55e5c1bc5923ad482fbea383030f1 (diff)
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1721 d5102386-fcda-11dd-9fdb-3debd5008f28
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 bbc1b46c..be3dfd11 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);