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

1 files changed, 5 insertions, 13 deletions

diff --git a/Demos/Device/DualCDC/DualCDC.h b/Demos/Device/DualCDC/DualCDC.h
index 65f661f9..117af601 100644
--- a/Demos/Device/DualCDC/DualCDC.h
+++ b/Demos/Device/DualCDC/DualCDC.h
@@ -60,19 +60,6 @@
 		/** CDC Class specific request to set the current virtual serial port handshake line states. */

 		#define REQ_SetControlLineState      0x22

 

-	/* 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.

@@ -121,6 +108,11 @@
 		TASK(CDC2_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