Added additional bootloader API data to expose the bootloader start address and class...

[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 5a0d091..2170305 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP-MKII.h
+++ b/Projects/AVRISP-MKII/AVRISP-MKII.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  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


@@ -37,7 +37,11 @@
 #define _AVRISP_H_
 
        /* Includes: */
 #define _AVRISP_H_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
+               #include <avr/io.h>
+               #include <avr/wdt.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/Version.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>


@@ -46,17 +50,6 @@
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 

-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/io.h>
-                       #include <avr/wdt.h>
-                       #include <avr/interrupt.h>
-                       #include <avr/power.h>
-               #elif (ARCH == ARCH_UC3)
-                       #include <avr32/io.h>
-
-                       #include <LUFA/Platform/UC3/INTC_UC3.h> // TODO: FIXME
-               #endif
-

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


@@ -76,6 +69,9 @@
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_BUSY             (LEDS_LED1 | LEDS_LED2)
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_BUSY             (LEDS_LED1 | LEDS_LED2)
 

+               /** LED mask for the library LED driver, to indicate that the target is being powered by VBUS. */
+               #define LEDMASK_VBUSPOWER         LEDS_LED3
+

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