Add script reading bootloader flags

[pub/lufa.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..dffad01 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, 2021.

 
   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 2021  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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -37,28 +37,22 @@
 #define _AVRISP_H_
 
        /* Includes: */
 #define _AVRISP_H_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
-               #include <LUFA/Version.h>
+               #include <avr/io.h>
+               #include <avr/wdt.h>
+               #include <avr/interrupt.h>
+               #include <avr/power.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>

+               #include <LUFA/Platform/Platform.h>

 
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 
 
                #if defined(ADC)
                        #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 "AVRISPDescriptors.h"

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

+               #include "Config/AppConfig.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. */


@@ -76,6 +70,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);


@@ -84,5 +81,10 @@
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
 
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
 

+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint16_t wIndex,
+                                                   const void** const DescriptorAddress)
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+

 #endif
 
 #endif