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.

1 files changed, 5 insertions, 5 deletions

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 9dc2f9d04..32b12fc61 100644
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -100,7 +100,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);

@@ -115,7 +115,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 Mouse reporting tasks.

  */

-EVENT_HANDLER(USB_Disconnect)

+void EVENT_USB_Disconnect(void)

 {

 	/* Stop running mouse reporting and USB management tasks */

 	Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);

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

  *  of the USB device after enumeration - the device endpoints are configured and the mouse reporting task started.

  */ 

-EVENT_HANDLER(USB_ConfigurationChanged)

+void EVENT_USB_ConfigurationChanged(void)

 {

 	/* Setup Mouse Report Endpoint */

 	Endpoint_ConfigureEndpoint(MOUSE_EPNUM, EP_TYPE_INTERRUPT,

@@ -146,7 +146,7 @@ EVENT_HANDLER(USB_ConfigurationChanged)
  *  control requests that are not handled internally by the USB library (including the HID 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)

 {

 	/* Handle HID Class specific requests */

 	switch (USB_ControlRequest.bRequest)

@@ -195,7 +195,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				Endpoint_ClearSETUP();

 				

 				/* Set or clear the flag depending on what the host indicates that the current Protocol should be */

-				UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);

+				UsingReportProtocol = (USB_ControlRequest.wValue != 0);

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));