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

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 43129c1..80e822a 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -41,16 +41,17 @@
                #include <avr/wdt.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <avr/wdt.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>

+               #include <util/delay.h>

 
 

-               #include "AVRISPDescriptors.h"

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

-               #include "Lib/LightweightRingBuff.h"
-               #include "Lib/SoftUART.h"
+               #include "AVRISPDescriptors.h"          

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

+               #include "Lib/SoftUART.h"
+               #include "Config/AppConfig.h"

 
 

-               #include <LUFA/Version.h>

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

+               #include <LUFA/Drivers/Misc/RingBuffer.h>

                #include <LUFA/Drivers/USB/USB.h>
 
        /* Macros: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Macros: */


@@ -76,9 +77,9 @@
                #define MODE_PDI_PROGRAMMER      true
 
        /* External Variables: */
                #define MODE_PDI_PROGRAMMER      true
 
        /* External Variables: */

-               extern bool       CurrentFirmwareMode;
-               extern RingBuff_t UARTtoUSB_Buffer;
-               extern RingBuff_t USBtoUART_Buffer;
+               extern bool         CurrentFirmwareMode;
+               extern RingBuffer_t UARTtoUSB_Buffer;
+               extern RingBuffer_t USBtoUART_Buffer;

 
        /* Function Prototypes: */
                void SetupHardware(void);
 
        /* Function Prototypes: */
                void SetupHardware(void);


@@ -86,7 +87,7 @@
                void UARTBridge_Task(void);
 
                void EVENT_USB_Device_ConfigurationChanged(void);
                void UARTBridge_Task(void);
 
                void EVENT_USB_Device_ConfigurationChanged(void);

-               void EVENT_USB_Device_UnhandledControlRequest(void);
+               void EVENT_USB_Device_ControlRequest(void);

                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
 
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
 


@@ -94,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