Remove dual ISR for software PDI mode, use a single ISR instead to reduce code comple...

[pub/USBasp.git] / Demos / Host / ClassDriver / MouseHost / MouseHost.h

diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.h b/Demos/Host/ClassDriver/MouseHost/MouseHost.h
index 9e3087f..1fdf42b 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.h
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.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/pgmspace.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r

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

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


@@ -49,17 +48,9 @@
                #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r

-               #include <LUFA/Drivers/USB/Class/HID.h> \r
-               \r
-               #include "ConfigDescriptor.h"\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r

                \r
        /* Macros: */\r
                \r
        /* Macros: */\r

-               /** Pipe number for the mouse data IN pipe */\r
-               #define MOUSE_DATAPIPE              1\r
-               \r
-               /** HID Class Specific request to set the report protocol mode */\r
-               #define REQ_SetProtocol             0x0B\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
 \r


@@ -71,26 +62,14 @@
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

-\r
-       /* Type Defines: */\r
-               /** Type define for a standard Boot Protocol Mouse report */\r
-               typedef struct\r
-               {\r
-                       uint8_t Button; /**< Button mask for currently pressed buttons in the mouse */\r
-                       int8_t  X; /**< Current delta X movement of the mouse */\r
-                       int8_t  Y; /**< Current delta Y movement on the mouse */\r
-               } USB_MouseReport_Data_t;\r
-\r
+               \r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

-               void Mouse_HID_Task(void);\r

                void SetupHardware(void);\r
                void SetupHardware(void);\r

-               \r
-               void EVENT_USB_HostError(const uint8_t ErrorCode);\r
-               void EVENT_USB_DeviceAttached(void);\r
-               void EVENT_USB_DeviceUnattached(void);\r
-               void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
-               void EVENT_USB_DeviceEnumerationComplete(void);\r
-\r
-               void ReadNextReport(void);\r
+       \r
+               void EVENT_USB_Host_HostError(const uint8_t ErrorCode);\r
+               void EVENT_USB_Host_DeviceAttached(void);\r
+               void EVENT_USB_Host_DeviceUnattached(void);\r
+               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
+               void EVENT_USB_Host_DeviceEnumerationComplete(void);\r

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