Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index ac4378d..720f329 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, 2011.

 
   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 2011  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,18 +41,18 @@
                #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 "AVRISPDescriptors.h"
                #include "USARTDescriptors.h"
 

-               #include "Lib/LightweightRingBuff.h"

                #include "Lib/SoftUART.h"
                #include "Lib/V2Protocol.h"
 
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include "Lib/SoftUART.h"
                #include "Lib/V2Protocol.h"
 
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Board/LEDs.h>

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

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

-               #include <LUFA/Drivers/USB/Class/CDC.h>

 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */


@@ -77,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);


@@ -87,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);