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, 20 insertions, 22 deletions

diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.c b/Demos/Host/GenericHIDHost/ConfigDescriptor.c
index 1c0a6b291..29fa60ba3 100644
--- a/Demos/Host/GenericHIDHost/ConfigDescriptor.c
+++ b/Demos/Host/GenericHIDHost/ConfigDescriptor.c
@@ -72,7 +72,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	

 	/* Get the HID interface from the configuration descriptor */

 	if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-	                              NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)

+	                              DComp_NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)

 	{

 		/* Descriptor not found, error out */

 		return NoHIDInterfaceFound;

@@ -82,7 +82,7 @@ uint8_t ProcessConfigurationDescriptor(void)
 	{

 		/* Get the next HID interface's data endpoint descriptor */

 		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-		                              NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)

+		                              DComp_NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)

 		{

 			/* Not all HID devices have an OUT endpoint - if we've reached the end of the HID descriptor

 			 * but only found the mandatory IN endpoint, it's safe to continue with the device enumeration */

@@ -129,7 +129,7 @@ uint8_t ProcessConfigurationDescriptor(void)
  *

  *  \return A value from the DSEARCH_Return_ErrorCodes_t enum

  */

-DESCRIPTOR_COMPARATOR(NextHIDInterface)

+uint8_t DComp_NextHIDInterface(void* CurrentDescriptor)

 {

 	/* Determine if the current descriptor is an interface descriptor */

 	if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)

@@ -155,7 +155,7 @@ DESCRIPTOR_COMPARATOR(NextHIDInterface)
  *

  *  \return A value from the DSEARCH_Return_ErrorCodes_t enum

  */

-DESCRIPTOR_COMPARATOR(NextInterfaceHIDDataEndpoint)

+uint8_t DComp_NextInterfaceHIDDataEndpoint(void* CurrentDescriptor)

 {

 	/* Determine the type of the current descriptor */

 	if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)

diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.h b/Demos/Host/GenericHIDHost/ConfigDescriptor.h
index fac772979..b58d44027 100644
--- a/Demos/Host/GenericHIDHost/ConfigDescriptor.h
+++ b/Demos/Host/GenericHIDHost/ConfigDescriptor.h
@@ -60,11 +60,10 @@
 			NoEndpointFound                 = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */

 		};	

 

-	/* Configuration Descriptor Comparison Functions: */

-		DESCRIPTOR_COMPARATOR(NextHIDInterface);

-		DESCRIPTOR_COMPARATOR(NextInterfaceHIDDataEndpoint);

-

 	/* Function Prototypes: */

-		uint8_t ProcessConfigurationDescriptor(void);	

+		uint8_t ProcessConfigurationDescriptor(void);

+

+		uint8_t DComp_NextHIDInterface(void* CurrentDescriptor);

+		uint8_t DComp_NextInterfaceHIDDataEndpoint(void* CurrentDescriptor);

 

 #endif

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index 580612c97..e731f90cf 100644
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.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 HID 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 HID Host task */

 	Scheduler_SetTaskMode(USB_HID_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/GenericHIDHost/GenericHIDHost.h b/Demos/Host/GenericHIDHost/GenericHIDHost.h
index 3ae473e00..7e2f8b822 100644
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.h
@@ -82,15 +82,14 @@
 			Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */

 			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);

 		void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);

diff --git a/Demos/Host/GenericHIDHost/makefile b/Demos/Host/GenericHIDHost/makefile
index d261da927..617ab7e5b 100644
--- a/Demos/Host/GenericHIDHost/makefile
+++ b/Demos/Host/GenericHIDHost/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 ------------------------------------