Rename the V2Protocol command handlers in the AVRISP project in preperation of XMEGA...

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

diff --git a/Projects/AVRISP/AVRISP.h b/Projects/AVRISP/AVRISP.h
index e52c1a6..a0f4d5e 100644 (file)
--- a/Projects/AVRISP/AVRISP.h
+++ b/Projects/AVRISP/AVRISP.h
@@ -46,9 +46,12 @@
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
-               #include <LUFA/Drivers/USB/USB.h>
-
+               #include <LUFA/Drivers/USB/USB.h>\r
+               \r
+               #if defined(ADC)
+                       #include <LUFA/Drivers/Peripheral/ADC.h>\r
+               #endif\r
+               

                #include "Lib/V2Protocol.h"\r
 \r
        /* Macros: */
                #include "Lib/V2Protocol.h"\r
 \r
        /* Macros: */


@@ -62,15 +65,17 @@
                #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r

-               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)                \r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
+               #define LEDMASK_BUSY             (LEDS_LED1 | LEDS_LED2)\r

 \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
 \r
                void EVENT_USB_Device_Connect(void);\r
                void EVENT_USB_Device_Disconnect(void);\r
 \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
 \r
                void EVENT_USB_Device_Connect(void);\r
                void EVENT_USB_Device_Disconnect(void);\r

-               void EVENT_USB_Device_ConfigurationChanged(void);\r
-               void EVENT_USB_Device_UnhandledControlRequest(void);
+               void EVENT_USB_Device_ConfigurationChanged(void);

 
                void Process_AVRISP_Commands(void);\r
                \r
 
                void Process_AVRISP_Commands(void);\r
                \r