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.

2012-05-20 17:09:39 +00:00
parent 32cfb8cf4f
commit 5833b27f80
15 changed files with 108 additions and 356 deletions
@@ -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