Merge in latest trunk.

[pub/USBasp.git] / Projects / XPLAINBridge / XPLAINBridge.h

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 688ac7b..80e822a 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -43,9 +43,9 @@
                #include <avr/interrupt.h>
                #include <util/delay.h>
 
                #include <avr/interrupt.h>
                #include <util/delay.h>
 

-               #include "AVRISPDescriptors.h"

                #include "USARTDescriptors.h"
                #include "USARTDescriptors.h"

-               
+
+               #include "AVRISPDescriptors.h"          

                #include "Lib/V2Protocol.h"
                #include "Lib/SoftUART.h"
                #include "Config/AppConfig.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,
 
                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
 
 
 #endif