diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-20 17:16:21 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-20 17:16:21 +0000 |
| commit | 87a8f05c504df358dd8daf018069bf83d767e130 (patch) | |
| tree | aac4b2e9f666d28d37ca6078afc08926021867f8 /Projects/XPLAINBridge/XPLAINBridge.h | |
| parent | 7f4149489110377f6773b5e78147e9cde04bbeeb (diff) | |
| parent | cc3ee891c9316e3106a5b6379c9e9e1b1cb1c195 (diff) | |
Merge in latest trunk.
git-svn-id: http://lufa-lib.googlecode.com/svn/branches/AppConfigHeaders@2232 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/XPLAINBridge/XPLAINBridge.h')
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index 688ac7bd..80e822af 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -43,9 +43,9 @@ #include <avr/interrupt.h> #include <util/delay.h> - #include "AVRISPDescriptors.h" #include "USARTDescriptors.h" - + + #include "AVRISPDescriptors.h" #include "Lib/V2Protocol.h" #include "Lib/SoftUART.h" #include "Config/AppConfig.h" @@ -95,8 +95,9 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, - const void** const DescriptorAddress) - ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); + const void** const DescriptorAddress, + uint8_t* const DescriptorMemorySpace) + ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4); #endif |