Be doubly-certain that the incomming CDC class driver's endpoint/pipe is flushed...

[pub/USBasp.git] / Bootloaders / TeensyHID / TeensyHID.h

diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 0dd5852..6393898 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

          \r
          \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

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


@@ -40,29 +40,24 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r

-               #include <avr/wdt.h>\r

                #include <avr/power.h>\r
                #include <avr/power.h>\r

-               #include <util/delay.h>\r

                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r
 \r
                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r
 \r

-               #include <LUFA/Version.h>                    // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
+               #include <LUFA/Drivers/USB/USB.h>\r

                \r
                \r

-       /* Preprocessor Checks: */\r
-               #if !defined(__AVR_AT90USB162__)\r
-                       #error This bootloader is not compatible with the selected AVR model.\r
-               #endif\r
-\r

        /* Macros: */\r
                /** HID Class specific request to send the next HID report to the device. */\r
                #define REQ_SetReport             0x09\r
                \r
        /* Macros: */\r
                /** HID Class specific request to send the next HID report to the device. */\r
                #define REQ_SetReport             0x09\r
                \r

+               /** Teensy Bootloader special address to start the user application */\r

                #define TEENSY_STARTAPPLICATION   0xFFFF\r
                \r
        /* Function Prototypes: */\r
                #define TEENSY_STARTAPPLICATION   0xFFFF\r
                \r
        /* Function Prototypes: */\r

-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void SetupHardware(void);\r
+\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r

                \r
 #endif\r
                \r
 #endif\r