Synchronise with the 090605 release.

[pub/USBasp.git] / Demos / Host / KeyboardHost / ConfigDescriptor.h

diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.h b/Demos/Host/KeyboardHost/ConfigDescriptor.h
index 1d168b4..425f0a4 100644 (file)
--- a/Demos/Host/KeyboardHost/ConfigDescriptor.h
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "KeyboardHost.h"\r
                \r
                \r
                #include "KeyboardHost.h"\r
                \r


@@ -63,12 +62,11 @@
                        NoHIDInterfaceFound             = 4, /**< A compatible HID interface was not found in the device's Configuration Descriptor */\r
                        NoEndpointFound                 = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */\r
                };\r
                        NoHIDInterfaceFound             = 4, /**< A compatible HID interface was not found in the device's Configuration Descriptor */\r
                        NoEndpointFound                 = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */\r
                };\r

-       \r
-       /* Configuration Descriptor Comparison Functions: */\r
-               DESCRIPTOR_COMPARATOR(NextKeyboardInterface);\r
-               DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint);\r

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

-               uint8_t ProcessConfigurationDescriptor(void);   \r
+               uint8_t ProcessConfigurationDescriptor(void);\r
+               \r
+               uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor);\r
+               uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor);\r

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