CI: Build on Arch (bleeding-ege) and Ubuntu (stable) AVR-GCC toolchains.

[pub/USBasp.git] / Bootloaders / Printer / BootloaderPrinter.h

diff --git a/Bootloaders/Printer/BootloaderPrinter.h b/Bootloaders/Printer/BootloaderPrinter.h
index acd6001..c927ec5 100644 (file)
--- a/Bootloaders/Printer/BootloaderPrinter.h
+++ b/Bootloaders/Printer/BootloaderPrinter.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2018.

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

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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,15 +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 "Descriptors.h"
 
                #include "Descriptors.h"

+               #include "BootloaderAPI.h"

 
 

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

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

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

 
        /* Preprocessor Checks: */
                #if !defined(__OPTIMIZE_SIZE__)
 
        /* Preprocessor Checks: */
                #if !defined(__OPTIMIZE_SIZE__)

-                       #error This bootloader requires that it be optimize for size, not speed, to fit into the target device. Change optimization settings and try again.
+                       #error This bootloader requires that it be optimized for size, not speed, to fit into the target device. Change optimization settings and try again.

                #endif
 
        /* Macros: */
                #endif
 
        /* Macros: */


@@ -71,6 +74,13 @@
                /** Magic bootloader key to unlock forced application start mode. */
                #define MAGIC_BOOT_KEY             0xDC42
 
                /** Magic bootloader key to unlock forced application start mode. */
                #define MAGIC_BOOT_KEY             0xDC42
 

+       /* Type Defines: */
+               #if (FLASHEND > 0xFFFF)
+                       typedef uint32_t flashaddr_t;
+               #else
+                       typedef uint16_t flashaddr_t;
+               #endif
+

        /* Enums: */
                /** Intel HEX parser state machine states. */
                enum HEX_Parser_States_t
        /* Enums: */
                /** Intel HEX parser state machine states. */
                enum HEX_Parser_States_t