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.

3 files changed, 10 insertions, 18 deletions

diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c
index 59aa98ceb..d7ebb9e6b 100644
--- a/Demos/Device/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
@@ -104,7 +104,7 @@ int main(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and

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

  */

-EVENT_HANDLER(USB_Connect)

+void EVENT_USB_Connect(void)

 {

 	/* Start USB management task */

 	Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);

@@ -116,7 +116,7 @@ EVENT_HANDLER(USB_Connect)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via

  *  the status LEDs and stops the USB management and CDC management tasks.

  */

-EVENT_HANDLER(USB_Disconnect)

+void EVENT_USB_Disconnect(void)

 {

 	/* Stop running CDC and USB management tasks */

 	Scheduler_SetTaskMode(CDC_Task, TASK_STOP);

@@ -129,7 +129,7 @@ EVENT_HANDLER(USB_Disconnect)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration

  *  of the USB device after enumeration - the device endpoints are configured and the CDC management task started.

  */

-EVENT_HANDLER(USB_ConfigurationChanged)

+void EVENT_USB_ConfigurationChanged(void)

 {

 	/* Setup CDC Notification, Rx and Tx Endpoints */

 	Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,

@@ -155,7 +155,7 @@ EVENT_HANDLER(USB_ConfigurationChanged)
  *  control requests that are not handled internally by the USB library (including the CDC control commands,

  *  which are all issued via the control endpoint), so that they can be handled appropriately for the application.

  */

-EVENT_HANDLER(USB_UnhandledControlPacket)

+void EVENT_USB_UnhandledControlPacket(void)

 {

 	uint8_t* LineCodingData = (uint8_t*)&LineCoding;

 

diff --git a/Demos/Device/CDC/CDC.h b/Demos/Device/CDC/CDC.h
index 1537f0ba3..4c4ca74d5 100644
--- a/Demos/Device/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
@@ -111,19 +111,6 @@
 		 */

 		#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)

 		

-	/* Event Handlers: */

-		/** Indicates that this module will catch the USB_Connect event when thrown by the library. */

-		HANDLES_EVENT(USB_Connect);

-

-		/** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */

-		HANDLES_EVENT(USB_Disconnect);

-

-		/** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */

-		HANDLES_EVENT(USB_ConfigurationChanged);

-

-		/** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */

-		HANDLES_EVENT(USB_UnhandledControlPacket);

-		

 	/* Type Defines: */

 		/** Type define for the virtual serial port line encoding settings, for storing the current USART configuration

 		 *  as set by the host via a class specific request.

@@ -185,6 +172,11 @@
 		TASK(CDC_Task);

 

 	/* Function Prototypes: */

+		void EVENT_USB_Connect(void);

+		void EVENT_USB_Disconnect(void);

+		void EVENT_USB_ConfigurationChanged(void);

+		void EVENT_USB_UnhandledControlPacket(void);

+

 		void UpdateStatus(uint8_t CurrentStatus);

 

 #endif

diff --git a/Demos/Device/CDC/makefile b/Demos/Device/CDC/makefile
index ce2436eb8..5755dda1e 100644
--- a/Demos/Device/CDC/makefile
+++ b/Demos/Device/CDC/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 ------------------------------------