From 2ee9fc707784e115d744dbc229bdc893f4bb6bc1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 18 May 2009 10:05:21 +0000 Subject: Rewritten event system to remove all macros, to make user code clearer. Fixed incorrect ENDPOINT_EPNUM_MASK mask preventing endpoints above EP3 from being selected (thanks to Jonathan Oakley). Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code. Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code. --- Demos/Host/StillImageHost/ConfigDescriptor.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Demos/Host/StillImageHost/ConfigDescriptor.h') diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.h b/Demos/Host/StillImageHost/ConfigDescriptor.h index cb4de5f46..29df30c0c 100644 --- a/Demos/Host/StillImageHost/ConfigDescriptor.h +++ b/Demos/Host/StillImageHost/ConfigDescriptor.h @@ -66,11 +66,10 @@ NoEndpointFound = 5, /**< The correct SI endpoint descriptors were not found in the device's SI interface */ }; - /* Configuration Descriptor Comparison Functions: */ - DESCRIPTOR_COMPARATOR(NextStillImageInterface); - DESCRIPTOR_COMPARATOR(NextSImageInterfaceDataEndpoint); - /* Function Prototypes: */ - uint8_t ProcessConfigurationDescriptor(void); + uint8_t ProcessConfigurationDescriptor(void); + + uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor); + uint8_t DComp_NextSImageInterfaceDataEndpoint(void* CurrentDescriptor); #endif -- cgit v1.2.3