projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add makefile template for the AVR32 UC3 architecture.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Core
/
Device.h
diff --git
a/LUFA/Drivers/USB/Core/Device.h
b/LUFA/Drivers/USB/Core/Device.h
index
bbc1b46
..
be3dfd1
100644
(file)
--- 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,
\r
const uint8_t wIndex,
\r
const void** const DescriptorAddress
\r
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
\r
const uint8_t wIndex,
\r
const void** const DescriptorAddress
\r
- #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
\r
+ #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
\r
+ !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
\r
, uint8_t* MemoryAddressSpace
\r
#endif
\r
) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
\r
, uint8_t* MemoryAddressSpace
\r
#endif
\r
) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
\r