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.

5 files changed, 21 insertions, 23 deletions

diff --git a/Demos/Host/MouseHost/ConfigDescriptor.c b/Demos/Host/MouseHost/ConfigDescriptor.c
index 435a4f90c..0f6ab59ae 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)

diff --git a/Demos/Host/MouseHost/ConfigDescriptor.h b/Demos/Host/MouseHost/ConfigDescriptor.h
index 40286e546..cb1ae63ad 100644
--- a/Demos/Host/MouseHost/ConfigDescriptor.h
+++ b/Demos/Host/MouseHost/ConfigDescriptor.h
@@ -61,13 +61,12 @@
 			InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */

 			NoHIDInterfaceFound             = 4, /**< A compatible HID interface was not found in the device's Configuration Descriptor */

 			NoEndpointFound                 = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */

-		};	

-

-	/* Configuration Descriptor Comparison Functions: */

-		DESCRIPTOR_COMPARATOR(NextMouseInterface);

-		DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint);

+		};

 

 	/* Function Prototypes: */

-		uint8_t ProcessConfigurationDescriptor(void);	

+		uint8_t ProcessConfigurationDescriptor(void);

+

+		uint8_t DComp_NextMouseInterface(void* CurrentDescriptor);

+		uint8_t DComp_NextInterfaceMouseDataEndpoint(void* CurrentDescriptor);

 

 #endif

diff --git a/Demos/Host/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c
index 77db55282..7db95808a 100644
--- a/Demos/Host/MouseHost/MouseHost.c
+++ b/Demos/Host/MouseHost/MouseHost.c
@@ -80,7 +80,7 @@ int main(void)
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and

  *  starts the library USB task to begin the enumeration and USB management process.

  */

-EVENT_HANDLER(USB_DeviceAttached)

+void EVENT_USB_DeviceAttached(void)

 {

 	puts_P(PSTR("Device Attached.\r\n"));

 	UpdateStatus(Status_USBEnumerating);

@@ -92,7 +92,7 @@ EVENT_HANDLER(USB_DeviceAttached)
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and

  *  stops the library USB task management process.

  */

-EVENT_HANDLER(USB_DeviceUnattached)

+void EVENT_USB_DeviceUnattached(void)

 {

 	/* Stop mouse and USB management task */

 	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

@@ -105,7 +105,7 @@ EVENT_HANDLER(USB_DeviceUnattached)
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully

  *  enumerated by the host and is now ready to be used by the application.

  */

-EVENT_HANDLER(USB_DeviceEnumerationComplete)

+void EVENT_USB_DeviceEnumerationComplete(void)

 {

 	/* Start Mouse Host task */

 	Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN);

@@ -115,7 +115,7 @@ EVENT_HANDLER(USB_DeviceEnumerationComplete)
 }

 

 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */

-EVENT_HANDLER(USB_HostError)

+void EVENT_USB_HostError(const uint8_t ErrorCode)

 {

 	USB_ShutDown();

 

@@ -129,7 +129,7 @@ EVENT_HANDLER(USB_HostError)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while

  *  enumerating an attached USB device.

  */

-EVENT_HANDLER(USB_DeviceEnumerationFailed)

+void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

 	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);

diff --git a/Demos/Host/MouseHost/MouseHost.h b/Demos/Host/MouseHost/MouseHost.h
index 81b0412c5..7111218ba 100644
--- a/Demos/Host/MouseHost/MouseHost.h
+++ b/Demos/Host/MouseHost/MouseHost.h
@@ -83,14 +83,13 @@
 			Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */

 		};

 		

-	/* Event Handlers: */

-		HANDLES_EVENT(USB_DeviceAttached);

-		HANDLES_EVENT(USB_DeviceUnattached);

-		HANDLES_EVENT(USB_DeviceEnumerationComplete);

-		HANDLES_EVENT(USB_HostError);

-		HANDLES_EVENT(USB_DeviceEnumerationFailed);

-

 	/* Function Prototypes: */

+		void EVENT_USB_HostError(const uint8_t ErrorCode);

+		void EVENT_USB_DeviceAttached(void);

+		void EVENT_USB_DeviceUnattached(void);

+		void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);

+		void EVENT_USB_DeviceEnumerationComplete(void);

+

 		void UpdateStatus(uint8_t CurrentStatus);

 		void ReadNextReport(void);

 		

diff --git a/Demos/Host/MouseHost/makefile b/Demos/Host/MouseHost/makefile
index 1cfba959a..4987c9dde 100644
--- a/Demos/Host/MouseHost/makefile
+++ b/Demos/Host/MouseHost/makefile
@@ -505,7 +505,7 @@ sizeafter:
 checkhooks: build

 	@echo

 	@echo ------- Unhooked LUFA Events -------

-	@$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \

+	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

 	@echo ------------------------------------