Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / Projects / AVRISP-MKII / AVRISP-MKII.h

diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.h b/Projects/AVRISP-MKII/AVRISP-MKII.h
index e7b4184..8f0fabc 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP-MKII.h
+++ b/Projects/AVRISP-MKII/AVRISP-MKII.h
@@ -42,7 +42,6 @@
                #include <avr/interrupt.h>
                #include <avr/power.h>
 
                #include <avr/interrupt.h>
                #include <avr/power.h>
 

-               #include <LUFA/Version.h>

                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
 
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
 


@@ -50,7 +49,7 @@
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 

-               #include "Descriptors.h"
+               #include "AVRISPDescriptors.h"

                #include "Lib/V2Protocol.h"
                #include "Config/AppConfig.h"
 
                #include "Lib/V2Protocol.h"
                #include "Config/AppConfig.h"
 


@@ -80,6 +79,12 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);

+               
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   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