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

[pub/USBasp.git] / Demos / Host / LowLevel / GenericHIDHost / GenericHIDHost.h

diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h
index 493d4f4..0afaa4f 100644 (file)
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.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


@@ -30,7 +30,7 @@
 
 /** \file
  *
 
 /** \file
  *

- *  Header file for MouseHost.c.
+ *  Header file for GenericHIDHost.c.

  */
 
 #ifndef _GENERICHID_HOST_H_
  */
 
 #ifndef _GENERICHID_HOST_H_


@@ -47,21 +47,12 @@
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Version.h>
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>

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

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

-               
-               #include "ConfigDescriptor.h"
-               
-       /* Macros: */
-               /** Pipe number for the HID data IN pipe */
-               #define HID_DATA_IN_PIPE          1
-               
-               /** Pipe number for the HID data OUT pipe */
-               #define HID_DATA_OUT_PIPE         2

 
 

-               /** HID Class specific request to send a HID report to the device. */
-               #define REQ_SetReport             0x09
+               #include "ConfigDescriptor.h"

 
 

+       /* Macros: */

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


@@ -73,7 +64,7 @@
 
                /** 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 Type to indicate an IN report. */
                #define REPORT_TYPE_IN           1
 
                /** HID Report Type to indicate an IN report. */
                #define REPORT_TYPE_IN           1
 


@@ -82,18 +73,21 @@
 
                /** HID Report Type to indicate a FEATURE report. */
                #define REPORT_TYPE_FEATURE      3
 
                /** HID Report Type to indicate a FEATURE report. */
                #define REPORT_TYPE_FEATURE      3

-               
+

        /* Function Prototypes: */
                void SetupHardware(void);
        /* Function Prototypes: */
                void SetupHardware(void);

-               void HID_Host_Task(void);
-       
+               void ReadNextReport(void);
+               void WriteNextReport(uint8_t* ReportOUTData,
+                                    const uint8_t ReportIndex,
+                                    const uint8_t ReportType,
+                                    uint16_t ReportLength);
+               

                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);
 

-               void ReadNextReport(void);
-               void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);
-               

 #endif
 #endif

+