Cleanup and partially fix AVRISP-MKII project's TPI programming support.

[pub/USBasp.git] / Demos / Device / LowLevel / GenericHID / GenericHID.h

diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.h b/Demos/Device/LowLevel/GenericHID/GenericHID.h
index fbd0a7f..c79ed6f 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.h
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.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,7 +40,6 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r

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

                #include <stdbool.h>\r
                #include <string.h>\r
                \r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r


@@ -52,10 +51,10 @@
                        \r
        /* Macros: */\r
                /** HID Class specific request to get the next HID report from the device. */\r
                        \r
        /* Macros: */\r
                /** HID Class specific request to get the next HID report from the device. */\r

-               #define REQ_GetReport      0x01\r
+               #define REQ_GetReport             0x01\r

 \r
                /** HID Class specific request to send the next HID report to the device. */\r
 \r
                /** HID Class specific request to send the next HID report to the device. */\r

-               #define REQ_SetReport      0x09\r
+               #define REQ_SetReport             0x09\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r


@@ -73,10 +72,11 @@
                void SetupHardware(void);\r
                void HID_Task(void);\r
        \r
                void SetupHardware(void);\r
                void HID_Task(void);\r
        \r

-               void EVENT_USB_Connect(void);\r
-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
+               void EVENT_USB_Device_StartOfFrame(void);\r

 \r
                void ProcessGenericHIDReport(uint8_t* DataArray);\r
                void CreateGenericHIDReport(uint8_t* DataArray);\r
 \r
                void ProcessGenericHIDReport(uint8_t* DataArray);\r
                void CreateGenericHIDReport(uint8_t* DataArray);\r