Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
index 05f6f76..4e9587b 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  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


@@ -46,11 +46,10 @@
 
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
 
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Misc/TerminalCodes.h>

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>
+               #include <LUFA/Drivers/Peripheral/Serial.h>

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

-               #include <LUFA/Drivers/USB/Class/HID.h>
-               
+

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


@@ -64,33 +63,36 @@
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
                #define LEDMASK_USB_ERROR           (LEDS_LED1 | LEDS_LED3)
 
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
                #define LEDMASK_USB_ERROR           (LEDS_LED1 | LEDS_LED3)
 

-               /** HID Report Descriptor Usage Page value for a toggle button */
+               /** HID Report Descriptor Usage Page value for a toggle button. */

                #define USAGE_PAGE_BUTTON           0x09
 
                #define USAGE_PAGE_BUTTON           0x09
 

-               /** HID Report Descriptor Usage Page value for a Generic Desktop Control */
+               /** HID Report Descriptor Usage Page value for a Generic Desktop Control. */

                #define USAGE_PAGE_GENERIC_DCTRL    0x01
 
                #define USAGE_PAGE_GENERIC_DCTRL    0x01
 

-               /** HID Report Descriptor Usage for a Mouse */
+               /** HID Report Descriptor Usage for a Mouse. */

                #define USAGE_MOUSE                 0x02
 
                #define USAGE_MOUSE                 0x02
 

-               /** HID Report Descriptor Usage value for a X axis movement */
+               /** HID Report Descriptor Usage value for a X axis movement. */

                #define USAGE_X                     0x30
 
                #define USAGE_X                     0x30
 

-               /** HID Report Descriptor Usage value for a Y axis movement */
+               /** HID Report Descriptor Usage value for a Y axis movement. */

                #define USAGE_Y                     0x31
                #define USAGE_Y                     0x31

-               
-               /** HID Report Descriptor Usage value for a Scroll Wheel movement */
+
+               /** HID Report Descriptor Usage value for a Scroll Wheel movement. */

                #define USAGE_SCROLL_WHEEL          0x38
 
        /* Function Prototypes: */
                void SetupHardware(void);
                #define USAGE_SCROLL_WHEEL          0x38
 
        /* Function Prototypes: */
                void SetupHardware(void);

-       
+               void MouseHost_Task(void);
+

                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
                void EVENT_USB_Host_DeviceAttached(void);
                void EVENT_USB_Host_DeviceUnattached(void);
                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
                void EVENT_USB_Host_DeviceAttached(void);
                void EVENT_USB_Host_DeviceUnattached(void);

-               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
+                                                           const uint8_t SubErrorCode);

                void EVENT_USB_Host_DeviceEnumerationComplete(void);
                void EVENT_USB_Host_DeviceEnumerationComplete(void);

-               
-               bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);
-               
+
+               bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);
+

 #endif
 #endif

+