diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-18 10:05:21 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-18 10:05:21 +0000 |
| commit | bdb6e45008319647b72d9adc8fb4ec06a0f1ea9b (patch) | |
| tree | 1f4de5f6d8e2a9bfe89d3263f19f9b9ebf855812 /Demos/Host/MouseHost/ConfigDescriptor.c | |
| parent | a74816480d92f683b2d11682d516f347a1a69301 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@554 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Host/MouseHost/ConfigDescriptor.c')
| -rw-r--r-- | Demos/Host/MouseHost/ConfigDescriptor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Host/MouseHost/ConfigDescriptor.c b/Demos/Host/MouseHost/ConfigDescriptor.c index 435a4f90..0f6ab59a 100644 --- a/Demos/Host/MouseHost/ConfigDescriptor.c +++ b/Demos/Host/MouseHost/ConfigDescriptor.c @@ -70,7 +70,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the mouse interface from the configuration descriptor */
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
- NextMouseInterface) != DESCRIPTOR_SEARCH_COMP_Found)
+ DComp_NextMouseInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{
/* Descriptor not found, error out */
return NoHIDInterfaceFound;
@@ -78,7 +78,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the mouse interface's data endpoint descriptor */
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
- NextInterfaceMouseDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
+ DComp_NextInterfaceMouseDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
{
/* Descriptor not found, error out */
return NoEndpointFound;
@@ -105,7 +105,7 @@ uint8_t ProcessConfigurationDescriptor(void) *
* \return A value from the DSEARCH_Return_ErrorCodes_t enum
*/
-DESCRIPTOR_COMPARATOR(NextMouseInterface)
+uint8_t DComp_NextMouseInterface(void* CurrentDescriptor)
{
/* Determine if the current descriptor is an interface descriptor */
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
@@ -132,7 +132,7 @@ DESCRIPTOR_COMPARATOR(NextMouseInterface) *
* \return A value from the DSEARCH_Return_ErrorCodes_t enum
*/
-DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint)
+uint8_t DComp_NextInterfaceMouseDataEndpoint(void* CurrentDescriptor)
{
/* Determine the type of the current descriptor */
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
|