Much more efficient algorithm for the Endpoint/Pipe configuration routine of unordere...

[pub/USBasp.git] / Demos / Host / LowLevel / JoystickHostWithParser / ConfigDescriptor.h

diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/ConfigDescriptor.h b/Demos/Host/LowLevel/JoystickHostWithParser/ConfigDescriptor.h
index 6dad690..b6a27e7 100644 (file)
--- a/Demos/Host/LowLevel/JoystickHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/ConfigDescriptor.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   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 2010  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


@@ -38,24 +38,15 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               
-               #include "HIDReport.h"
-               
-       /* Macros: */
-               /** Interface Class value for the Human Interface Device class */
-               #define JOYSTICK_CLASS              0x03

 
 

-               /** Interface Protocol value for a Boot Protocol Mouse compliant device */
-               #define JOYSTICK_PROTOCOL           0x02
+               #include "HIDReport.h"

 
 

-               /** Descriptor header type constant for a HID descriptor */
-               #define DTYPE_HID                   0x21
+       /* Macros: */
+               /** Pipe number for the joystick report data pipe. */
+               #define JOYSTICK_DATA_IN_PIPE       1

 
 

-               /** Descriptor header type constant for a HID report descriptor */
-               #define DTYPE_Report                0x22
-       

        /* Enums: */
        /* Enums: */

-               /** Enum for the possible return codes of the ProcessConfigurationDescriptor() function. */
+               /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */

                enum JoystickHostWithParser_GetConfigDescriptorDataCodes_t
                {
                        SuccessfulConfigRead            = 0, /**< Configuration Descriptor was processed successfully */
                enum JoystickHostWithParser_GetConfigDescriptorDataCodes_t
                {
                        SuccessfulConfigRead            = 0, /**< Configuration Descriptor was processed successfully */


@@ -64,7 +55,7 @@
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoHIDInterfaceFound             = 4, /**< A compatible HID interface was not found in the device's Configuration Descriptor */
                        NoHIDDescriptorFound            = 5, /**< A compatible HID descriptor was not found in the device's HID interface */
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoHIDInterfaceFound             = 4, /**< A compatible HID interface was not found in the device's Configuration Descriptor */
                        NoHIDDescriptorFound            = 5, /**< A compatible HID descriptor was not found in the device's HID interface */

-                       NoEndpointFound                 = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */
+                       NoCompatibleInterfaceFound      = 4, /**< A compatible interface with the required endpoints was not found */

                };
 
        /* Function Prototypes: */
                };
 
        /* Function Prototypes: */


@@ -75,3 +66,4 @@
                uint8_t DComp_NextHID(void* CurrentDescriptor);
 
 #endif
                uint8_t DComp_NextHID(void* CurrentDescriptor);
 
 #endif

+