diff options
author | Dean Camera <[email protected]> | 2012-05-20 17:09:39 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2012-05-20 17:09:39 +0000 |
commit | 5833b27f80f4b6b10f5765468f5863e57b97a65a (patch) | |
tree | a8df9f72605f3f069fa42a67d35ba6874cc0144d /Projects/XPLAINBridge/XPLAINBridge.h | |
parent | 32cfb8cf4f56f45ddfc50a6b2803ac98496c2c0b (diff) | |
download | qmk_firmware-5833b27f80f4b6b10f5765468f5863e57b97a65a.tar.gz qmk_firmware-5833b27f80f4b6b10f5765468f5863e57b97a65a.zip |
Alter the XPLAINBridge and AVRISP-MKII clone projects so that the descriptors from the AVRISP-MKII clone project can be directly used in the XPLAINBridge project. Add support for RESET_TOGGLES_LIBUSB_COMPAT option in the XPLAINBridge project.
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 33c66bf516..abf2511e5e 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" @@ -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 |