Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / Bootloaders / HID / BootloaderHID.h

diff --git a/Bootloaders/HID/BootloaderHID.h b/Bootloaders/HID/BootloaderHID.h
index 190dff8..a281633 100644 (file)
--- a/Bootloaders/HID/BootloaderHID.h
+++ b/Bootloaders/HID/BootloaderHID.h
@@ -1,21 +1,21 @@
 /*
              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)
-         
-  Permission to use, copy, modify, distribute, and sell this 
+  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
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,7 +32,7 @@
  *
  *  Header file for TeensyHID.c.
  */
  *
  *  Header file for TeensyHID.c.
  */

- 
+

 #ifndef _TEENSYHID_H_
 #define _TEENSYHID_H_
 
 #ifndef _TEENSYHID_H_
 #define _TEENSYHID_H_
 


@@ -47,15 +47,21 @@
                #include "Descriptors.h"
 
                #include <LUFA/Drivers/USB/USB.h>
                #include "Descriptors.h"
 
                #include <LUFA/Drivers/USB/USB.h>

-               
-       /* Macros: */           
+
+       /* Macros: */

                /** Bootloader special address to start the user application */
                #define COMMAND_STARTAPPLICATION   0xFFFF
                /** Bootloader special address to start the user application */
                #define COMMAND_STARTAPPLICATION   0xFFFF

+
+               /** Magic bootloader key to unlock forced application start mode. */
+               #define MAGIC_BOOT_KEY             0xDC42

                
        /* Function Prototypes: */
                
        /* Function Prototypes: */

-               void SetupHardware(void);
+               static void SetupHardware(void);

 
 

+               void Application_Jump_Check(void) ATTR_INIT_SECTION(3);
+               

                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_UnhandledControlRequest(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_UnhandledControlRequest(void);

-               
+

 #endif
 #endif

+