From 2ee9fc707784e115d744dbc229bdc893f4bb6bc1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 18 May 2009 10:05:21 +0000 Subject: [PATCH] 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. --- Bootloaders/CDC/BootloaderCDC.c | 6 +- Bootloaders/CDC/BootloaderCDC.h | 14 +- Bootloaders/CDC/makefile | 2 +- Bootloaders/DFU/BootloaderDFU.c | 4 +- Bootloaders/DFU/BootloaderDFU.h | 12 +- Bootloaders/DFU/makefile | 2 +- Bootloaders/TeensyHID/TeensyHID.c | 4 +- Bootloaders/TeensyHID/TeensyHID.h | 14 +- Bootloaders/TeensyHID/makefile | 2 +- Demos/Device/AudioInput/AudioInput.c | 8 +- Demos/Device/AudioInput/AudioInput.h | 18 +- Demos/Device/AudioInput/makefile | 2 +- Demos/Device/AudioOutput/AudioOutput.c | 8 +- Demos/Device/AudioOutput/AudioOutput.h | 18 +- Demos/Device/AudioOutput/makefile | 2 +- Demos/Device/CDC/CDC.c | 8 +- Demos/Device/CDC/CDC.h | 18 +- Demos/Device/CDC/makefile | 2 +- Demos/Device/DualCDC/DualCDC.c | 8 +- Demos/Device/DualCDC/DualCDC.h | 18 +- Demos/Device/DualCDC/makefile | 2 +- Demos/Device/GenericHID/GenericHID.c | 8 +- Demos/Device/GenericHID/GenericHID.h | 15 +- Demos/Device/GenericHID/makefile | 2 +- Demos/Device/Joystick/Joystick.c | 8 +- Demos/Device/Joystick/Joystick.h | 18 +- Demos/Device/Joystick/makefile | 2 +- Demos/Device/Keyboard/Keyboard.c | 10 +- Demos/Device/Keyboard/Keyboard.h | 34 ++- Demos/Device/Keyboard/makefile | 2 +- Demos/Device/KeyboardMouse/KeyboardMouse.c | 8 +- Demos/Device/KeyboardMouse/KeyboardMouse.h | 18 +- Demos/Device/KeyboardMouse/makefile | 2 +- Demos/Device/MIDI/MIDI.c | 6 +- Demos/Device/MIDI/MIDI.h | 14 +- Demos/Device/MIDI/makefile | 2 +- Demos/Device/MassStorage/MassStorage.c | 16 +- Demos/Device/MassStorage/MassStorage.h | 23 +- Demos/Device/MassStorage/SCSI.c | 8 +- Demos/Device/MassStorage/makefile | 2 +- Demos/Device/Mouse/Mouse.c | 10 +- Demos/Device/Mouse/Mouse.h | 18 +- Demos/Device/Mouse/makefile | 2 +- Demos/Device/RNDISEthernet/RNDISEthernet.c | 8 +- Demos/Device/RNDISEthernet/RNDISEthernet.h | 18 +- Demos/Device/RNDISEthernet/makefile | 2 +- Demos/Device/USBtoSerial/USBtoSerial.c | 8 +- Demos/Device/USBtoSerial/USBtoSerial.h | 18 +- Demos/Device/USBtoSerial/makefile | 2 +- Demos/Host/CDCHost/CDCHost.c | 10 +- Demos/Host/CDCHost/CDCHost.h | 13 +- Demos/Host/CDCHost/ConfigDescriptor.c | 16 +- Demos/Host/CDCHost/ConfigDescriptor.h | 11 +- Demos/Host/CDCHost/makefile | 2 +- Demos/Host/GenericHIDHost/ConfigDescriptor.c | 8 +- Demos/Host/GenericHIDHost/ConfigDescriptor.h | 9 +- Demos/Host/GenericHIDHost/GenericHIDHost.c | 10 +- Demos/Host/GenericHIDHost/GenericHIDHost.h | 13 +- Demos/Host/GenericHIDHost/makefile | 2 +- Demos/Host/KeyboardHost/ConfigDescriptor.c | 8 +- Demos/Host/KeyboardHost/ConfigDescriptor.h | 9 +- Demos/Host/KeyboardHost/KeyboardHost.c | 10 +- Demos/Host/KeyboardHost/KeyboardHost.h | 13 +- Demos/Host/KeyboardHost/makefile | 2 +- .../KeyboardHostWithParser/ConfigDescriptor.c | 12 +- .../KeyboardHostWithParser/ConfigDescriptor.h | 11 +- .../KeyboardHostWithParser.c | 10 +- .../KeyboardHostWithParser.h | 13 +- Demos/Host/KeyboardHostWithParser/makefile | 2 +- Demos/Host/MassStorageHost/ConfigDescriptor.c | 8 +- Demos/Host/MassStorageHost/ConfigDescriptor.h | 9 +- Demos/Host/MassStorageHost/MassStorageHost.c | 10 +- Demos/Host/MassStorageHost/MassStorageHost.h | 13 +- Demos/Host/MassStorageHost/makefile | 2 +- Demos/Host/MouseHost/ConfigDescriptor.c | 8 +- Demos/Host/MouseHost/ConfigDescriptor.h | 11 +- Demos/Host/MouseHost/MouseHost.c | 10 +- Demos/Host/MouseHost/MouseHost.h | 13 +- Demos/Host/MouseHost/makefile | 2 +- .../MouseHostWithParser/ConfigDescriptor.c | 12 +- .../MouseHostWithParser/ConfigDescriptor.h | 11 +- .../MouseHostWithParser/MouseHostWithParser.c | 10 +- .../MouseHostWithParser/MouseHostWithParser.h | 13 +- Demos/Host/MouseHostWithParser/makefile | 2 +- Demos/Host/StillImageHost/ConfigDescriptor.c | 8 +- Demos/Host/StillImageHost/ConfigDescriptor.h | 9 +- Demos/Host/StillImageHost/StillImageHost.c | 10 +- Demos/Host/StillImageHost/StillImageHost.h | 13 +- Demos/Host/StillImageHost/makefile | 2 +- Demos/OTG/TestApp/TestEvents.c | 36 +-- Demos/OTG/TestApp/TestEvents.h | 71 ++---- Demos/OTG/TestApp/makefile | 2 +- LUFA/ChangeLog.txt | 4 + LUFA/Drivers/USB/Class/ConfigDescriptor.c | 2 +- LUFA/Drivers/USB/Class/ConfigDescriptor.h | 115 ++++----- LUFA/Drivers/USB/HighLevel/Events.h | 220 ++++-------------- LUFA/Drivers/USB/HighLevel/StdDescriptors.c | 2 +- LUFA/Drivers/USB/HighLevel/StdDescriptors.h | 10 - LUFA/Drivers/USB/HighLevel/StdRequestType.h | 20 +- LUFA/Drivers/USB/HighLevel/StreamCallbacks.h | 34 +-- LUFA/Drivers/USB/HighLevel/USBInterrupt.c | 44 ++-- LUFA/Drivers/USB/HighLevel/USBInterrupt.h | 107 --------- LUFA/Drivers/USB/HighLevel/USBTask.h | 58 +---- LUFA/Drivers/USB/LowLevel/DevChapter9.c | 6 +- LUFA/Drivers/USB/LowLevel/DevChapter9.h | 23 -- LUFA/Drivers/USB/LowLevel/Device.h | 2 +- LUFA/Drivers/USB/LowLevel/Endpoint.h | 32 +-- LUFA/Drivers/USB/LowLevel/Host.c | 10 +- LUFA/Drivers/USB/LowLevel/Host.h | 6 +- LUFA/Drivers/USB/LowLevel/LowLevel.c | 4 +- LUFA/Drivers/USB/LowLevel/LowLevel.h | 20 +- LUFA/Drivers/USB/LowLevel/Pipe.h | 30 +-- LUFA/MigrationInformation.txt | 12 +- Projects/Magstripe/Magstripe.c | 8 +- Projects/Magstripe/Magstripe.h | 20 +- Projects/Magstripe/makefile | 2 +- 116 files changed, 594 insertions(+), 1122 deletions(-) diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f36c4fc3ed..265e90f8f8 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -119,7 +119,7 @@ int main(void) /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user * application started. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Upon disconnection, run user application */ RunBootloader = false; @@ -128,7 +128,7 @@ EVENT_HANDLER(USB_Disconnect) /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready * to relay data to and from the attached USB host. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup CDC Notification, Rx and Tx Endpoints */ Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, @@ -148,7 +148,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library, 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/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h index e302a39663..da755936d5 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/Bootloaders/CDC/BootloaderCDC.h @@ -83,16 +83,6 @@ /** Eight character bootloader firmware identifier reported to the host when requested */ #define SOFTWARE_IDENTIFIER "LUFACDC" - - /* Event Handlers: */ - /** 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 a non-returning pointer to the start of the loaded application in flash memory. */ @@ -132,6 +122,10 @@ TASK(CDC_Task); /* Function Prototypes: */ + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); + #if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__) static void ReadWriteMemoryBlock(const uint8_t Command); static uint8_t FetchNextCommandByte(void); diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 0eecb18f87..3caec538d0 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -502,7 +502,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 ------------------------------------ diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 83881f13ec..10a30167bf 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -139,7 +139,7 @@ int main (void) /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user * application started. */ -EVENT_HANDLER(USB_Disconnect) +void EventHandler_USB_Disconnect(void) { /* Upon disconnection, run user application */ RunBootloader = false; @@ -149,7 +149,7 @@ EVENT_HANDLER(USB_Disconnect) * control requests that are not handled internally by the USB library (including the DFU commands, which are * all issued via the control endpoint), so that they can be handled appropriately for the application. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EventHandler_USB_UnhandledControlPacket(void) { /* Get the size of the command and data from the wLength value */ SentCommand.DataSize = USB_ControlRequest.wLength; diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h index e996f2b79c..a78d80d0ca 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/Bootloaders/DFU/BootloaderDFU.h @@ -191,15 +191,11 @@ errUNKNOWN = 14, errSTALLEDPKT = 15 }; - - /* Event Handlers: */ - /** 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_UnhandledControlPacket event when thrown by the library. */ - HANDLES_EVENT(USB_UnhandledControlPacket); - + /* Function Prototypes: */ + void EVENT_USB_Disconnect(void); + void EVENT_USB_UnhandledControlPacket(void); + #if defined(INCLUDE_FROM_BOOTLOADER_C) static void DiscardFillerBytes(uint8_t NumberOfBytes); static void ProcessBootloaderCommand(void); diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 124ea58c57..94525c10bb 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -503,7 +503,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 ------------------------------------ diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c index cb1407ad4b..ee6c91a625 100644 --- a/Bootloaders/TeensyHID/TeensyHID.c +++ b/Bootloaders/TeensyHID/TeensyHID.c @@ -81,7 +81,7 @@ int main(void) /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready * to relay data to and from the attached USB host. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup HID Report Endpoint */ Endpoint_ConfigureEndpoint(HID_EPNUM, EP_TYPE_INTERRUPT, @@ -93,7 +93,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) diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h index ae180f7781..0dd58524b7 100644 --- a/Bootloaders/TeensyHID/TeensyHID.h +++ b/Bootloaders/TeensyHID/TeensyHID.h @@ -60,15 +60,9 @@ #define REQ_SetReport 0x09 #define TEENSY_STARTAPPLICATION 0xFFFF - - /* Event Handlers: */ - /** 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); + + /* Function Prototypes: */ + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); #endif diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index bff9e11da9..d022c93159 100644 --- a/Bootloaders/TeensyHID/makefile +++ b/Bootloaders/TeensyHID/makefile @@ -502,7 +502,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 ------------------------------------ diff --git a/Demos/Device/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c index 05094c2b88..ecd8cdda8b 100644 --- a/Demos/Device/AudioInput/AudioInput.c +++ b/Demos/Device/AudioInput/AudioInput.c @@ -80,7 +80,7 @@ int main(void) /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and * configures the sample update and PWM timers. */ -EVENT_HANDLER(USB_Connect) +void EVENT_USB_Connect(void) { /* Start USB management task */ Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); @@ -97,7 +97,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, disables the sample update and PWM output timers and stops the USB and Audio management tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop the sample reload timer */ TCCR0B = 0; @@ -113,7 +113,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. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup audio stream endpoint */ Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS, @@ -128,7 +128,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library (including the Audio class-specific * requests) so that they can be handled appropriately for the application. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EVENT_USB_UnhandledControlPacket(void) { /* Process General and Audio specific control requests */ switch (USB_ControlRequest.bRequest) diff --git a/Demos/Device/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h index b7174d1f89..6358c24a0f 100644 --- a/Demos/Device/AudioInput/AudioInput.h +++ b/Demos/Device/AudioInput/AudioInput.h @@ -71,20 +71,12 @@ /* Task Definitions: */ TASK(USB_Audio_Task); - /* 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); - /* 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/AudioInput/makefile b/Demos/Device/AudioInput/makefile index aca88cb875..7c8b7ab5ab 100644 --- a/Demos/Device/AudioInput/makefile +++ b/Demos/Device/AudioInput/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 ------------------------------------ diff --git a/Demos/Device/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c index 640462da16..7ec2e3534c 100644 --- a/Demos/Device/AudioOutput/AudioOutput.c +++ b/Demos/Device/AudioOutput/AudioOutput.c @@ -75,7 +75,7 @@ int main(void) /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and * configures the sample update and PWM timers. */ -EVENT_HANDLER(USB_Connect) +void EventHandler_USB_Connect(void) { /* Start USB management task */ Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); @@ -110,7 +110,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, disables the sample update and PWM output timers and stops the USB and Audio management tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EventHandler_USB_Disconnect(void) { /* Stop the timers */ TCCR0B = 0; @@ -140,7 +140,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. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EventHandler_USB_ConfigurationChanged(void) { /* Setup audio stream endpoint */ Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS, @@ -155,7 +155,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library (including the Audio class-specific * requests) so that they can be handled appropriately for the application. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EventHandler_USB_UnhandledControlPacket(void) { /* Process General and Audio specific control requests */ switch (USB_ControlRequest.bRequest) diff --git a/Demos/Device/AudioOutput/AudioOutput.h b/Demos/Device/AudioOutput/AudioOutput.h index 05b24ad07f..d8725a07b3 100644 --- a/Demos/Device/AudioOutput/AudioOutput.h +++ b/Demos/Device/AudioOutput/AudioOutput.h @@ -107,21 +107,13 @@ /* Task Definitions: */ TASK(USB_Audio_Task); - - /* 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); /* 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/AudioOutput/makefile b/Demos/Device/AudioOutput/makefile index 0a6401b70f..fc200be4a8 100644 --- a/Demos/Device/AudioOutput/makefile +++ b/Demos/Device/AudioOutput/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 ------------------------------------ diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c index 59aa98ceb8..d7ebb9e6b2 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 1537f0ba3c..4c4ca74d56 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 ce2436eb86..5755dda1e3 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 ------------------------------------ diff --git a/Demos/Device/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c index 9750ea23e1..34d772ff07 100644 --- a/Demos/Device/DualCDC/DualCDC.c +++ b/Demos/Device/DualCDC/DualCDC.c @@ -118,7 +118,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); @@ -130,7 +130,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(CDC1_Task, TASK_STOP); @@ -144,7 +144,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 tasks are started. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup CDC Notification, Rx and Tx Endpoints for the first CDC */ Endpoint_ConfigureEndpoint(CDC1_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, @@ -184,7 +184,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) { /* Determine which interface's Line Coding data is being set from the wIndex parameter */ uint8_t* LineCodingData = (USB_ControlRequest.wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2; diff --git a/Demos/Device/DualCDC/DualCDC.h b/Demos/Device/DualCDC/DualCDC.h index 65f661f97c..117af601e2 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 diff --git a/Demos/Device/DualCDC/makefile b/Demos/Device/DualCDC/makefile index fc0005d668..75099c5339 100644 --- a/Demos/Device/DualCDC/makefile +++ b/Demos/Device/DualCDC/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 ------------------------------------ diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c index 0369f9f521..f43499a0f5 100644 --- a/Demos/Device/GenericHID/GenericHID.c +++ b/Demos/Device/GenericHID/GenericHID.c @@ -75,7 +75,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); @@ -87,7 +87,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 task. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running HID reporting and USB management tasks */ Scheduler_SetTaskMode(USB_HID_Report, TASK_STOP); @@ -100,7 +100,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, and configures the generic HID device endpoints. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup Generic IN Report Endpoint */ Endpoint_ConfigureEndpoint(GENERIC_IN_EPNUM, EP_TYPE_INTERRUPT, @@ -120,7 +120,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) diff --git a/Demos/Device/GenericHID/GenericHID.h b/Demos/Device/GenericHID/GenericHID.h index 5841595e34..30354b7560 100644 --- a/Demos/Device/GenericHID/GenericHID.h +++ b/Demos/Device/GenericHID/GenericHID.h @@ -67,20 +67,15 @@ Status_USBReady = 2, /**< USB interface is connected and ready */ }; - /* 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); - /* Task Definitions: */ TASK(USB_HID_Report); /* 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); void ProcessGenericHIDReport(uint8_t* DataArray); void CreateGenericHIDReport(uint8_t* DataArray); diff --git a/Demos/Device/GenericHID/makefile b/Demos/Device/GenericHID/makefile index 23d27911cf..c70c6a123e 100644 --- a/Demos/Device/GenericHID/makefile +++ b/Demos/Device/GenericHID/makefile @@ -504,7 +504,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 ------------------------------------ diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c index e1faeede71..8c50a2c163 100644 --- a/Demos/Device/Joystick/Joystick.c +++ b/Demos/Device/Joystick/Joystick.c @@ -76,7 +76,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); @@ -88,7 +88,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 joystick reporting tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running joystick reporting and USB management tasks */ Scheduler_SetTaskMode(USB_Joystick_Report, TASK_STOP); @@ -101,7 +101,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 joystick reporting task started. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup Joystick Report Endpoint */ Endpoint_ConfigureEndpoint(JOYSTICK_EPNUM, EP_TYPE_INTERRUPT, @@ -119,7 +119,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) diff --git a/Demos/Device/Joystick/Joystick.h b/Demos/Device/Joystick/Joystick.h index c274b5bc57..9763cada39 100644 --- a/Demos/Device/Joystick/Joystick.h +++ b/Demos/Device/Joystick/Joystick.h @@ -78,20 +78,12 @@ Status_USBReady = 2, /**< USB interface is connected and ready */ }; - /* 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); - /* Function Prototypes: */ + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); + bool GetNextReport(USB_JoystickReport_Data_t* ReportData); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Device/Joystick/makefile b/Demos/Device/Joystick/makefile index 9ab8ec274b..7550ed33b7 100644 --- a/Demos/Device/Joystick/makefile +++ b/Demos/Device/Joystick/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 ------------------------------------ diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c index fe041ef086..6abd193f4b 100644 --- a/Demos/Device/Keyboard/Keyboard.c +++ b/Demos/Device/Keyboard/Keyboard.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. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running keyboard reporting and USB management tasks */ Scheduler_SetTaskMode(USB_Keyboard_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, and configures the keyboard device endpoints. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup Keyboard Keycode Report Endpoint */ Endpoint_ConfigureEndpoint(KEYBOARD_EPNUM, EP_TYPE_INTERRUPT, @@ -151,7 +151,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) @@ -220,7 +220,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())); diff --git a/Demos/Device/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h index 2cc9c5ca8e..c4ed6e07cc 100644 --- a/Demos/Device/Keyboard/Keyboard.h +++ b/Demos/Device/Keyboard/Keyboard.h @@ -55,25 +55,25 @@ /* Macros: */ /** Idle period indicating that reports should be sent only when the inputs have changed */ - #define HID_IDLE_CHANGESONLY 0 + #define HID_IDLE_CHANGESONLY 0 /** HID Class specific request to get the next HID report from the device. */ - #define REQ_GetReport 0x01 + #define REQ_GetReport 0x01 /** HID Class specific request to get the idle timeout period of the device. */ - #define REQ_GetIdle 0x02 + #define REQ_GetIdle 0x02 /** HID Class specific request to send the next HID report to the device. */ - #define REQ_SetReport 0x09 + #define REQ_SetReport 0x09 /** HID Class specific request to set the idle timeout period of the device. */ - #define REQ_SetIdle 0x0A + #define REQ_SetIdle 0x0A /** HID Class specific request to get the current HID protocol in use, either report or boot. */ - #define REQ_GetProtocol 0x03 + #define REQ_GetProtocol 0x03 /** HID Class specific request to set the current HID protocol in use, either report or boot. */ - #define REQ_SetProtocol 0x0B + #define REQ_SetProtocol 0x0B /* Task Definitions: */ TASK(USB_Keyboard_Report); @@ -97,25 +97,17 @@ Status_USBEnumerating = 1, /**< USB interface is enumerating */ Status_USBReady = 2, /**< USB interface is connected and ready */ }; - - /* 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); /* Function Prototypes: */ + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); + void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData); void ProcessLEDReport(uint8_t LEDReport); void SendNextReport(void); void ReceiveNextReport(void); void UpdateStatus(uint8_t CurrentStatus); - + #endif diff --git a/Demos/Device/Keyboard/makefile b/Demos/Device/Keyboard/makefile index bacf6dc576..3c597bf494 100644 --- a/Demos/Device/Keyboard/makefile +++ b/Demos/Device/Keyboard/makefile @@ -504,7 +504,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 ------------------------------------ diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c index 5c9332849d..25d633e435 100644 --- a/Demos/Device/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c @@ -84,7 +84,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); @@ -96,7 +96,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 task. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running HID reporting and USB management tasks */ Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); @@ -108,7 +108,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, and configures the keyboard and mouse device endpoints. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup Keyboard Report Endpoint */ Endpoint_ConfigureEndpoint(KEYBOARD_IN_EPNUM, EP_TYPE_INTERRUPT, @@ -133,7 +133,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) { uint8_t* ReportData; uint8_t ReportSize; diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.h b/Demos/Device/KeyboardMouse/KeyboardMouse.h index 9a1fee1f4c..e3f9434029 100644 --- a/Demos/Device/KeyboardMouse/KeyboardMouse.h +++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h @@ -95,20 +95,12 @@ int8_t Y; /**< Current mouse delta Y movement, as a signed 8-bit integer */ } USB_MouseReport_Data_t; - /* 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); - /* 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/KeyboardMouse/makefile b/Demos/Device/KeyboardMouse/makefile index e483998777..b26bdbed61 100644 --- a/Demos/Device/KeyboardMouse/makefile +++ b/Demos/Device/KeyboardMouse/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 ------------------------------------ diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c index 1323e11634..b6b43df6a2 100644 --- a/Demos/Device/MIDI/MIDI.c +++ b/Demos/Device/MIDI/MIDI.c @@ -74,7 +74,7 @@ int main(void) } /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */ -EVENT_HANDLER(USB_Connect) +void EVENT_USB_Connect(void) { /* Start USB management task */ Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); @@ -86,7 +86,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, disables the sample update and PWM output timers and stops the USB and MIDI management tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running audio and USB management tasks */ Scheduler_SetTaskMode(USB_MIDI_Task, TASK_STOP); @@ -99,7 +99,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 MIDI management task started. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup MIDI stream endpoints */ Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h index 4d801e82f0..635036ae85 100644 --- a/Demos/Device/MIDI/MIDI.h +++ b/Demos/Device/MIDI/MIDI.h @@ -80,17 +80,11 @@ /* Task Definitions: */ TASK(USB_MIDI_Task); - /* 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); - /* Function Prototypes: */ + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Device/MIDI/makefile b/Demos/Device/MIDI/makefile index 1ad946e763..89bfc6cc0d 100644 --- a/Demos/Device/MIDI/makefile +++ b/Demos/Device/MIDI/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 ------------------------------------ diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c index 1da8930b02..82e7e8aa23 100644 --- a/Demos/Device/MassStorage/MassStorage.c +++ b/Demos/Device/MassStorage/MassStorage.c @@ -86,7 +86,7 @@ int main(void) } /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */ -EVENT_HANDLER(USB_Connect) +void EventHandler_USB_Connect(void) { /* Indicate USB enumerating */ UpdateStatus(Status_USBEnumerating); @@ -98,7 +98,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 Mass Storage management task. */ -EVENT_HANDLER(USB_Disconnect) +void EventHandler_USB_Disconnect(void) { /* Stop running mass storage task */ Scheduler_SetTaskMode(USB_MassStorage, TASK_STOP); @@ -110,7 +110,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 Mass Storage management task started. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EventHandler_USB_ConfigurationChanged(void) { /* Setup Mass Storage In and Out Endpoints */ Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK, @@ -132,7 +132,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library (including the Mass Storage class-specific * requests) so that they can be handled appropriately for the application. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EventHandler_USB_UnhandledControlPacket(void) { /* Process UFI specific control requests */ switch (USB_ControlRequest.bRequest) @@ -283,7 +283,7 @@ static bool ReadInCommandBlock(void) /* Read in command block header */ Endpoint_Read_Stream_LE(&CommandBlock, (sizeof(CommandBlock) - sizeof(CommandBlock.SCSICommandData)), - AbortOnMassStoreReset); + StreamCallback_AbortOnMassStoreReset); /* Check if the current command is being aborted by the host */ if (IsMassStoreReset) @@ -305,7 +305,7 @@ static bool ReadInCommandBlock(void) /* Read in command block command data */ Endpoint_Read_Stream_LE(&CommandBlock.SCSICommandData, CommandBlock.SCSICommandLength, - AbortOnMassStoreReset); + StreamCallback_AbortOnMassStoreReset); /* Check if the current command is being aborted by the host */ if (IsMassStoreReset) @@ -346,7 +346,7 @@ static void ReturnCommandStatus(void) /* Write the CSW to the endpoint */ Endpoint_Write_Stream_LE(&CommandStatus, sizeof(CommandStatus), - AbortOnMassStoreReset); + StreamCallback_AbortOnMassStoreReset); /* Check if the current command is being aborted by the host */ if (IsMassStoreReset) @@ -359,7 +359,7 @@ static void ReturnCommandStatus(void) /** Stream callback function for the Endpoint stream read and write functions. This callback will abort the current stream transfer * if a Mass Storage Reset request has been issued to the control endpoint. */ -STREAM_CALLBACK(AbortOnMassStoreReset) +uint8_t StreamCallback_AbortOnMassStoreReset(void) { /* Abort if a Mass Storage reset command was received */ if (IsMassStoreReset) diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h index f0baf1461f..afe9872ea9 100644 --- a/Demos/Device/MassStorage/MassStorage.h +++ b/Demos/Device/MassStorage/MassStorage.h @@ -130,23 +130,12 @@ /* Task Definitions: */ TASK(USB_MassStorage); - /* Stream Callbacks: */ - STREAM_CALLBACK(AbortOnMassStoreReset); - - /* 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); - /* 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); #if defined(INCLUDE_FROM_MASSSTORAGE_C) @@ -154,4 +143,6 @@ static void ReturnCommandStatus(void); #endif + uint8_t StreamCallback_AbortOnMassStoreReset(void); + #endif diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c index a88be515a9..5993a546dd 100644 --- a/Demos/Device/MassStorage/SCSI.c +++ b/Demos/Device/MassStorage/SCSI.c @@ -166,12 +166,12 @@ static bool SCSI_Command_Inquiry(void) } /* Write the INQUIRY data to the endpoint */ - Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, AbortOnMassStoreReset); + Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, StreamCallback_AbortOnMassStoreReset); uint8_t PadBytes[AllocationLength - BytesTransferred]; /* Pad out remaining bytes with 0x00 */ - Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset); + Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), StreamCallback_AbortOnMassStoreReset); /* Finalize the stream transfer to send the last packet */ Endpoint_ClearIN(); @@ -193,12 +193,12 @@ static bool SCSI_Command_Request_Sense(void) uint8_t BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData); /* Send the SENSE data - this indicates to the host the status of the last command */ - Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, AbortOnMassStoreReset); + Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, StreamCallback_AbortOnMassStoreReset); uint8_t PadBytes[AllocationLength - BytesTransferred]; /* Pad out remaining bytes with 0x00 */ - Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset); + Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), StreamCallback_AbortOnMassStoreReset); /* Finalize the stream transfer to send the last packet */ Endpoint_ClearIN(); diff --git a/Demos/Device/MassStorage/makefile b/Demos/Device/MassStorage/makefile index 65a22c6a32..95c91f61df 100644 --- a/Demos/Device/MassStorage/makefile +++ b/Demos/Device/MassStorage/makefile @@ -508,7 +508,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 ------------------------------------ diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c index 9dc2f9d04e..32b12fc618 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())); diff --git a/Demos/Device/Mouse/Mouse.h b/Demos/Device/Mouse/Mouse.h index 3bbbac2346..65879da8ef 100644 --- a/Demos/Device/Mouse/Mouse.h +++ b/Demos/Device/Mouse/Mouse.h @@ -98,20 +98,12 @@ Status_USBReady = 2, /**< USB interface is connected and ready */ }; - /* 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); - /* Function Prototypes: */ + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); + void CreateMouseReport(USB_MouseReport_Data_t* ReportData); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Device/Mouse/makefile b/Demos/Device/Mouse/makefile index 3fa887b7b5..d5ad211455 100644 --- a/Demos/Device/Mouse/makefile +++ b/Demos/Device/Mouse/makefile @@ -504,7 +504,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 ------------------------------------ diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c index fd88ecf896..b046f78703 100644 --- a/Demos/Device/RNDISEthernet/RNDISEthernet.c +++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c @@ -83,7 +83,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); @@ -95,7 +95,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 all the relevant tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running TCP/IP and USB management tasks */ Scheduler_SetTaskMode(RNDIS_Task, TASK_STOP); @@ -110,7 +110,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, and configures the RNDIS device endpoints and starts the relevant tasks. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup CDC Notification, Rx and Tx Endpoints */ Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK, @@ -138,7 +138,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library (including the RNDIS control commands, * which set up the USB RNDIS network adapter), so that they can be handled appropriately for the application. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EVENT_USB_UnhandledControlPacket(void) { /* Process RNDIS class commands */ switch (USB_ControlRequest.bRequest) diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h index b3fd4dbd51..7c3c8dabe8 100644 --- a/Demos/Device/RNDISEthernet/RNDISEthernet.h +++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h @@ -60,19 +60,6 @@ /* Macros: */ /** Notification value to indicate that a frame is ready to be read by the host. */ #define NOTIF_RESPONSE_AVAILABLE 0x01 - - /* 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 a RNDIS notification message, for transmission to the RNDIS host via the notification @@ -102,6 +89,11 @@ TASK(Ethernet_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/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile index 7a9722bbf2..e46b13bf23 100644 --- a/Demos/Device/RNDISEthernet/makefile +++ b/Demos/Device/RNDISEthernet/makefile @@ -518,7 +518,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 ------------------------------------ diff --git a/Demos/Device/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c index ea8dcd5995..ef51a6eeb3 100644 --- a/Demos/Device/USBtoSerial/USBtoSerial.c +++ b/Demos/Device/USBtoSerial/USBtoSerial.c @@ -93,7 +93,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); @@ -105,7 +105,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); @@ -122,7 +122,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, @@ -148,7 +148,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/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h index 0352f5d75f..cd1f42c3f5 100644 --- a/Demos/Device/USBtoSerial/USBtoSerial.h +++ b/Demos/Device/USBtoSerial/USBtoSerial.h @@ -112,19 +112,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. @@ -186,6 +173,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 ReconfigureUSART(void); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Device/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile index 6f7f64182f..8808abe2f5 100644 --- a/Demos/Device/USBtoSerial/makefile +++ b/Demos/Device/USBtoSerial/makefile @@ -506,7 +506,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 ------------------------------------ diff --git a/Demos/Host/CDCHost/CDCHost.c b/Demos/Host/CDCHost/CDCHost.c index a4194090a3..b83473106a 100644 --- a/Demos/Host/CDCHost/CDCHost.c +++ b/Demos/Host/CDCHost/CDCHost.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 keyboard 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 CDC Host task */ Scheduler_SetTaskMode(USB_CDC_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/CDCHost/CDCHost.h b/Demos/Host/CDCHost/CDCHost.h index 3819540d6b..afec780e7d 100644 --- a/Demos/Host/CDCHost/CDCHost.h +++ b/Demos/Host/CDCHost/CDCHost.h @@ -76,14 +76,13 @@ /* Task Definitions: */ TASK(USB_CDC_Host); - /* 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); #endif diff --git a/Demos/Host/CDCHost/ConfigDescriptor.c b/Demos/Host/CDCHost/ConfigDescriptor.c index faad3ccd2b..baf02a2162 100644 --- a/Demos/Host/CDCHost/ConfigDescriptor.c +++ b/Demos/Host/CDCHost/ConfigDescriptor.c @@ -71,7 +71,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the CDC control interface from the configuration descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoCDCInterfaceFound; @@ -82,14 +82,14 @@ uint8_t ProcessConfigurationDescriptor(void) { /* Fetch the next bulk or interrupt endpoint from the current CDC interface */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Check to see if the control interface's notification pipe has been found, if so search for the data interface */ if (FoundEndpoints & (1 << CDC_NOTIFICATIONPIPE)) { /* Get the next CDC data interface from the configuration descriptor (CDC class has two CDC interfaces) */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextCDCDataInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextCDCDataInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoCDCInterfaceFound; @@ -110,7 +110,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the next CDC control interface from the configuration descriptor (CDC class has two CDC interfaces) */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoCDCInterfaceFound; @@ -119,7 +119,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Fetch the next bulk or interrupt endpoint from the current CDC interface */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoEndpointFound; @@ -186,7 +186,7 @@ uint8_t ProcessConfigurationDescriptor(void) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextCDCControlInterface) +uint8_t DComp_NextCDCControlInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -210,7 +210,7 @@ DESCRIPTOR_COMPARATOR(NextCDCControlInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextCDCDataInterface) +uint8_t DComp_NextCDCDataInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -236,7 +236,7 @@ DESCRIPTOR_COMPARATOR(NextCDCDataInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextInterfaceCDCDataEndpoint) +uint8_t DComp_NextInterfaceCDCDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { diff --git a/Demos/Host/CDCHost/ConfigDescriptor.h b/Demos/Host/CDCHost/ConfigDescriptor.h index ea00f610f3..1a118cad3e 100644 --- a/Demos/Host/CDCHost/ConfigDescriptor.h +++ b/Demos/Host/CDCHost/ConfigDescriptor.h @@ -75,12 +75,11 @@ NoEndpointFound = 5, /**< Compatible CDC endpoints were not found in the device's CDC interface */ }; - /* Configuration Descriptor Comparison Functions: */ - DESCRIPTOR_COMPARATOR(NextCDCControlInterface); - DESCRIPTOR_COMPARATOR(NextCDCDataInterface); - DESCRIPTOR_COMPARATOR(NextInterfaceCDCDataEndpoint); - /* Function Prototypes: */ uint8_t ProcessConfigurationDescriptor(void); - + + uint8_t DComp_NextCDCControlInterface(void* CurrentDescriptor); + uint8_t DComp_NextCDCDataInterface(void* CurrentDescriptor); + uint8_t DComp_NextInterfaceCDCDataEndpoint(void* CurrentDescriptor); + #endif diff --git a/Demos/Host/CDCHost/makefile b/Demos/Host/CDCHost/makefile index ecd6269def..d9c58a377e 100644 --- a/Demos/Host/CDCHost/makefile +++ b/Demos/Host/CDCHost/makefile @@ -506,7 +506,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 ------------------------------------ diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.c b/Demos/Host/GenericHIDHost/ConfigDescriptor.c index 1c0a6b291b..29fa60ba38 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 fac772979c..b58d44027a 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 580612c972..e731f90cf9 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 3ae473e003..7e2f8b822a 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 d261da9275..617ab7e5ba 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 ------------------------------------ diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.c b/Demos/Host/KeyboardHost/ConfigDescriptor.c index b0233d98c8..e586ea5d35 100644 --- a/Demos/Host/KeyboardHost/ConfigDescriptor.c +++ b/Demos/Host/KeyboardHost/ConfigDescriptor.c @@ -70,7 +70,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface from the configuration descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextKeyboardInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextKeyboardInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoHIDInterfaceFound; @@ -78,7 +78,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface's data endpoint descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextInterfaceKeyboardDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextInterfaceKeyboardDataEndpoint) != 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(NextKeyboardInterface) +uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -129,7 +129,7 @@ DESCRIPTOR_COMPARATOR(NextKeyboardInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint) +uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.h b/Demos/Host/KeyboardHost/ConfigDescriptor.h index 416315b97b..425f0a4bef 100644 --- a/Demos/Host/KeyboardHost/ConfigDescriptor.h +++ b/Demos/Host/KeyboardHost/ConfigDescriptor.h @@ -62,12 +62,11 @@ 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(NextKeyboardInterface); - DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint); /* Function Prototypes: */ - uint8_t ProcessConfigurationDescriptor(void); + uint8_t ProcessConfigurationDescriptor(void); + + uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor); + uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor); #endif diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c index 628a273142..2b9bb2b0b5 100644 --- a/Demos/Host/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/KeyboardHost/KeyboardHost.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 Keyboard 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 Keyboard Host task */ Scheduler_SetTaskMode(USB_Keyboard_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/KeyboardHost/KeyboardHost.h b/Demos/Host/KeyboardHost/KeyboardHost.h index 6a601439af..d00b76afba 100644 --- a/Demos/Host/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/KeyboardHost/KeyboardHost.h @@ -83,14 +83,13 @@ /* Task Definitions: */ TASK(USB_Keyboard_Host); - /* 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/KeyboardHost/makefile b/Demos/Host/KeyboardHost/makefile index e304974e24..9ea163e660 100644 --- a/Demos/Host/KeyboardHost/makefile +++ b/Demos/Host/KeyboardHost/makefile @@ -506,7 +506,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 ------------------------------------ diff --git a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c index 9cdf6f88a1..4ee3b998f9 100644 --- a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c +++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c @@ -70,7 +70,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface from the configuration descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextKeyboardInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextKeyboardInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoHIDInterfaceFound; @@ -78,7 +78,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface's HID descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextHID) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoHIDDescriptorFound; @@ -89,7 +89,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface's data endpoint descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextInterfaceKeyboardDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextInterfaceKeyboardDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoEndpointFound; @@ -116,7 +116,7 @@ uint8_t ProcessConfigurationDescriptor(void) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextKeyboardInterface) +uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -140,7 +140,7 @@ DESCRIPTOR_COMPARATOR(NextKeyboardInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint) +uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { @@ -163,7 +163,7 @@ DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextHID) +uint8_t DComp_NextHID(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID) return DESCRIPTOR_SEARCH_Found; diff --git a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h index 1deff6328b..338adc93bd 100644 --- a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h +++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h @@ -68,13 +68,12 @@ NoHIDDescriptorFound = 5, /**< A compatible HID descriptor was not found in the device's HID interface */ NoEndpointFound = 5, /**< A compatible HID IN endpoint was not found in the device's HID interface */ }; - - /* Configuration Descriptor Comparison Functions: */ - DESCRIPTOR_COMPARATOR(NextKeyboardInterface); - DESCRIPTOR_COMPARATOR(NextInterfaceKeyboardDataEndpoint); - DESCRIPTOR_COMPARATOR(NextHID); /* Function Prototypes: */ - uint8_t ProcessConfigurationDescriptor(void); + uint8_t ProcessConfigurationDescriptor(void); + uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor); + uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor); + uint8_t DComp_NextHID(void* CurrentDescriptor); + #endif diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c index 9eb3d108ad..840cb90cf4 100644 --- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.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 keyboard 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 Keyboard Host task */ Scheduler_SetTaskMode(USB_Keyboard_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/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h index a0e055fa6c..acb5b8b3ef 100644 --- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -67,14 +67,13 @@ /* Task Definitions: */ TASK(USB_Keyboard_Host); - /* 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 ProcessKeyboardReport(uint8_t* KeyboardReport); diff --git a/Demos/Host/KeyboardHostWithParser/makefile b/Demos/Host/KeyboardHostWithParser/makefile index ad8f072539..43559d8f12 100644 --- a/Demos/Host/KeyboardHostWithParser/makefile +++ b/Demos/Host/KeyboardHostWithParser/makefile @@ -507,7 +507,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 ------------------------------------ diff --git a/Demos/Host/MassStorageHost/ConfigDescriptor.c b/Demos/Host/MassStorageHost/ConfigDescriptor.c index c02f3b0de1..c951c797e6 100644 --- a/Demos/Host/MassStorageHost/ConfigDescriptor.c +++ b/Demos/Host/MassStorageHost/ConfigDescriptor.c @@ -71,7 +71,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the mass storage interface from the configuration descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextMassStorageInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextMassStorageInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoInterfaceFound; @@ -82,7 +82,7 @@ uint8_t ProcessConfigurationDescriptor(void) { /* Fetch the next bulk endpoint from the current mass storage interface */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextInterfaceBulkDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextInterfaceBulkDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoEndpointFound; @@ -127,7 +127,7 @@ uint8_t ProcessConfigurationDescriptor(void) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextMassStorageInterface) +uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -152,7 +152,7 @@ DESCRIPTOR_COMPARATOR(NextMassStorageInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextInterfaceBulkDataEndpoint) +uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { diff --git a/Demos/Host/MassStorageHost/ConfigDescriptor.h b/Demos/Host/MassStorageHost/ConfigDescriptor.h index b02e088284..6c0b8e6f4e 100644 --- a/Demos/Host/MassStorageHost/ConfigDescriptor.h +++ b/Demos/Host/MassStorageHost/ConfigDescriptor.h @@ -65,12 +65,11 @@ NoInterfaceFound = 4, /**< A compatible MSD interface was not found in the device's Configuration Descriptor */ NoEndpointFound = 5, /**< The correct MSD endpoint descriptors were not found in the device's MSD interface */ }; - - /* Configuration Descriptor Comparison Functions: */ - DESCRIPTOR_COMPARATOR(NextMassStorageInterface); - DESCRIPTOR_COMPARATOR(NextInterfaceBulkDataEndpoint); - + /* Function Prototypes: */ uint8_t ProcessConfigurationDescriptor(void); + uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor); + uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor); + #endif diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c index d06e3a63af..a2e6631e27 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/MassStorageHost/MassStorageHost.c @@ -85,7 +85,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); @@ -97,7 +97,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 USB management and Mass Storage tasks */ Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); @@ -110,7 +110,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) { /* Once device is fully enumerated, start the Mass Storage Host task */ Scheduler_SetTaskMode(USB_MassStore_Host, TASK_RUN); @@ -120,7 +120,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(); @@ -134,7 +134,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/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h index 2160659702..1646ad75e9 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/MassStorageHost/MassStorageHost.h @@ -70,15 +70,14 @@ /* Task Definitions: */ TASK(USB_MassStore_Host); - - /* 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 ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile index 6987794bc9..5c1de65ea3 100644 --- a/Demos/Host/MassStorageHost/makefile +++ b/Demos/Host/MassStorageHost/makefile @@ -508,7 +508,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 ------------------------------------ diff --git a/Demos/Host/MouseHost/ConfigDescriptor.c b/Demos/Host/MouseHost/ConfigDescriptor.c index 435a4f90c8..0f6ab59ae1 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 40286e546e..cb1ae63ade 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 77db55282f..7db95808ae 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 81b0412c5d..7111218ba6 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 1cfba959a1..4987c9dde8 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 ------------------------------------ diff --git a/Demos/Host/MouseHostWithParser/ConfigDescriptor.c b/Demos/Host/MouseHostWithParser/ConfigDescriptor.c index c008523728..5d9d3f04e0 100644 --- a/Demos/Host/MouseHostWithParser/ConfigDescriptor.c +++ b/Demos/Host/MouseHostWithParser/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 HID descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextHID) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoHIDDescriptorFound; @@ -89,7 +89,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; @@ -116,7 +116,7 @@ uint8_t ProcessConfigurationDescriptor(void) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextMouseInterface) +uint8_t DComp_NextMouseInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -140,7 +140,7 @@ DESCRIPTOR_COMPARATOR(NextMouseInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint) +uint8_t DComp_NextInterfaceMouseDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { @@ -163,7 +163,7 @@ DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextHID) +uint8_t DComp_NextHID(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID) return DESCRIPTOR_SEARCH_Found; diff --git a/Demos/Host/MouseHostWithParser/ConfigDescriptor.h b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h index 7cb12dbca9..08400c50fc 100644 --- a/Demos/Host/MouseHostWithParser/ConfigDescriptor.h +++ b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h @@ -69,13 +69,12 @@ NoHIDDescriptorFound = 5, /**< A compatible HID descriptor was not found in the device's HID interface */ 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); - DESCRIPTOR_COMPARATOR(NextHID); /* Function Prototypes: */ - uint8_t ProcessConfigurationDescriptor(void); + uint8_t ProcessConfigurationDescriptor(void); + + uint8_t DComp_NextMouseInterface(void* CurrentDescriptor); + uint8_t DComp_NextInterfaceMouseDataEndpoint(void* CurrentDescriptor); + uint8_t DComp_NextHID(void* CurrentDescriptor); #endif diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c index 58a189f6b1..f26e9e2a6b 100644 --- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.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/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h index 99970e261b..f2cc2fd001 100644 --- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h @@ -66,15 +66,14 @@ /* Task Definitions: */ TASK(USB_Mouse_Host); - - /* 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 ProcessMouseReport(uint8_t* MouseReport); diff --git a/Demos/Host/MouseHostWithParser/makefile b/Demos/Host/MouseHostWithParser/makefile index 4e1aa90b49..be8f48f7d1 100644 --- a/Demos/Host/MouseHostWithParser/makefile +++ b/Demos/Host/MouseHostWithParser/makefile @@ -507,7 +507,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 ------------------------------------ diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.c b/Demos/Host/StillImageHost/ConfigDescriptor.c index b58dfb8bdb..1084969643 100644 --- a/Demos/Host/StillImageHost/ConfigDescriptor.c +++ b/Demos/Host/StillImageHost/ConfigDescriptor.c @@ -71,7 +71,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the Still Image interface from the configuration descriptor */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextStillImageInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextStillImageInterface) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoInterfaceFound; @@ -82,7 +82,7 @@ uint8_t ProcessConfigurationDescriptor(void) { /* Fetch the next endpoint from the current Still Image interface */ if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - NextSImageInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextSImageInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoEndpointFound; @@ -148,7 +148,7 @@ uint8_t ProcessConfigurationDescriptor(void) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextStillImageInterface) +uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -173,7 +173,7 @@ DESCRIPTOR_COMPARATOR(NextStillImageInterface) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -DESCRIPTOR_COMPARATOR(NextSImageInterfaceDataEndpoint) +uint8_t DComp_NextSImageInterfaceDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.h b/Demos/Host/StillImageHost/ConfigDescriptor.h index cb4de5f463..29df30c0cb 100644 --- a/Demos/Host/StillImageHost/ConfigDescriptor.h +++ b/Demos/Host/StillImageHost/ConfigDescriptor.h @@ -66,11 +66,10 @@ NoEndpointFound = 5, /**< The correct SI endpoint descriptors were not found in the device's SI interface */ }; - /* Configuration Descriptor Comparison Functions: */ - DESCRIPTOR_COMPARATOR(NextStillImageInterface); - DESCRIPTOR_COMPARATOR(NextSImageInterfaceDataEndpoint); - /* Function Prototypes: */ - uint8_t ProcessConfigurationDescriptor(void); + uint8_t ProcessConfigurationDescriptor(void); + + uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor); + uint8_t DComp_NextSImageInterfaceDataEndpoint(void* CurrentDescriptor); #endif diff --git a/Demos/Host/StillImageHost/StillImageHost.c b/Demos/Host/StillImageHost/StillImageHost.c index ceec151aae..197e832f6a 100644 --- a/Demos/Host/StillImageHost/StillImageHost.c +++ b/Demos/Host/StillImageHost/StillImageHost.c @@ -81,7 +81,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); @@ -93,7 +93,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 USB management and Still Image tasks */ Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); @@ -106,7 +106,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) { /* Once device is fully enumerated, start the Still Image Host task */ Scheduler_SetTaskMode(USB_SImage_Host, TASK_RUN); @@ -116,7 +116,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(); @@ -130,7 +130,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/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h index 4c9091cfec..909ed89bc6 100644 --- a/Demos/Host/StillImageHost/StillImageHost.h +++ b/Demos/Host/StillImageHost/StillImageHost.h @@ -68,14 +68,13 @@ /* Task Definitions: */ TASK(USB_SImage_Host); - /* 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 UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer); void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError); void UpdateStatus(uint8_t CurrentStatus); diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile index f78d66c034..3663d48041 100644 --- a/Demos/Host/StillImageHost/makefile +++ b/Demos/Host/StillImageHost/makefile @@ -506,7 +506,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 ------------------------------------ diff --git a/Demos/OTG/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c index b542bfc248..a444cc6a62 100644 --- a/Demos/OTG/TestApp/TestEvents.c +++ b/Demos/OTG/TestApp/TestEvents.c @@ -55,19 +55,19 @@ static void Abort_Program(void) } /** Event handler for the USB_VBUSChange event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_VBUSChange) +void EVENT_USB_VBUSChange(void) { puts_P(PSTR(EVENT_PREFIX "VBUS Change\r\n")); } /** Event handler for the USB_VBUSConnect event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_VBUSConnect) +void EVENT_USB_VBUSConnect(void) { puts_P(PSTR(EVENT_PREFIX "VBUS +\r\n")); } /** Event handler for the USB_VBUSDisconnect event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_VBUSDisconnect) +void EVENT_USB_VBUSDisconnect(void) { puts_P(PSTR(EVENT_PREFIX "VBUS -\r\n")); } @@ -76,7 +76,7 @@ EVENT_HANDLER(USB_VBUSDisconnect) * Event handler for the USB_Connect event. When fired, the event is logged to the USART and the * USB task started. */ -EVENT_HANDLER(USB_Connect) +void EVENT_USB_Connect(void) { puts_P(PSTR(EVENT_PREFIX "USB +\r\n")); LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED3 | LEDS_LED4); @@ -88,7 +88,7 @@ EVENT_HANDLER(USB_Connect) * Event handler for the USB_Disconnect event. When fired, the event is logged to the USART and the * USB task stopped. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); @@ -97,27 +97,27 @@ EVENT_HANDLER(USB_Disconnect) } /** Event handler for the USB_Suspend event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_Suspend) +void EVENT_USB_Suspend(void) { puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "USB Sleep\r\n")); LEDs_SetAllLEDs(LEDS_ALL_LEDS); } /** Event handler for the USB_WakeUp event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_WakeUp) +void EVENT_USB_WakeUp(void) { puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "USB Wakeup\r\n")); LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED4); } /** Event handler for the USB_Reset event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_Reset) +void EVENT_USB_Reset(void) { puts_P(PSTR(EVENT_PREFIX "USB Reset\r\n")); } /** Event handler for the USB_UIDChange event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_UIDChange) +void EVENT_USB_UIDChange(void) { char* ModeStrPtr; @@ -139,7 +139,7 @@ EVENT_HANDLER(USB_UIDChange) * Event handler for the USB_PowerOnFail event. When fired, the event is logged to the USART and the program * execution aborted. */ -EVENT_HANDLER(USB_InitFailure) +void EVENT_USB_InitFailure(const uint8_t ErrorCode) { char* ModeStrPtr; @@ -162,7 +162,7 @@ EVENT_HANDLER(USB_InitFailure) * Event handler for the USB_HostError event. When fired, the event is logged to the USART and the program * execution aborted. */ -EVENT_HANDLER(USB_HostError) +void EVENT_USB_HostError(const uint8_t ErrorCode) { puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Host Mode Error\r\n")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); @@ -171,7 +171,7 @@ EVENT_HANDLER(USB_HostError) } /** Event handler for the USB_DeviceEnumerationFailed event. When fired, the event is logged to the USART. */ -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); @@ -183,7 +183,7 @@ EVENT_HANDLER(USB_DeviceEnumerationFailed) * Event handler for the USB_DeviceError event. When fired, the event is logged to the USART and the program * execution aborted. */ -EVENT_HANDLER(USB_DeviceError) +void EVENT_USB_DeviceError(const uint8_t ErrorCode) { puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Device Mode Error\r\n")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); @@ -192,7 +192,7 @@ EVENT_HANDLER(USB_DeviceError) } /** Event handler for the USB_UnhandledControlPacket event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_UnhandledControlPacket) +void EVENT_USB_UnhandledControlPacket(void) { puts_P(PSTR(EVENT_PREFIX "Ctrl Request\r\n")); printf_P(PSTR(" -- Req Data %d\r\n"), USB_ControlRequest.bRequest); @@ -201,7 +201,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket) } /** Event handler for the USB_ConfigurationChanged event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { puts_P(PSTR(EVENT_PREFIX "Configuration Number Changed\r\n")); @@ -209,7 +209,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) } /** Event handler for the USB_DeviceAttached event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_DeviceAttached) +void EVENT_USB_DeviceAttached(void) { puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "Device +\r\n")); @@ -217,13 +217,13 @@ EVENT_HANDLER(USB_DeviceAttached) } /** Event handler for the USB_DeviceUnattached event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_DeviceUnattached) +void EVENT_USB_DeviceUnattached(void) { puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "Device -\r\n")); } /** Event handler for the USB_DeviceEnumerationComplete event. When fired, the event is logged to the USART. */ -EVENT_HANDLER(USB_DeviceEnumerationComplete) +void EVENT_USB_DeviceEnumerationComplete(void) { puts_P(PSTR(EVENT_PREFIX "Device Enumeration Complete\r\n")); } diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h index a1f149f471..656c070eaa 100644 --- a/Demos/OTG/TestApp/TestEvents.h +++ b/Demos/OTG/TestApp/TestEvents.h @@ -46,58 +46,6 @@ #include // ANSI Terminal Escape Codes #include // Simple scheduler for task management - /* Event Catch List: */ - /** Indicates that this module will catch the USB_VBUSChange event when thrown by the library. */ - HANDLES_EVENT(USB_VBUSChange); - - /** Indicates that this module will catch the USB_VBUSConnect event when thrown by the library. */ - HANDLES_EVENT(USB_VBUSConnect); - - /** Indicates that this module will catch the USB_VBUSDisconnect event when thrown by the library. */ - HANDLES_EVENT(USB_VBUSDisconnect); - - /** 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_Suspend event when thrown by the library. */ - HANDLES_EVENT(USB_Suspend); - - /** Indicates that this module will catch the USB_WakeUp event when thrown by the library. */ - HANDLES_EVENT(USB_WakeUp); - - /** Indicates that this module will catch the USB_Reset event when thrown by the library. */ - HANDLES_EVENT(USB_Reset); - - /** Indicates that this module will catch the USB_UIDChange event when thrown by the library. */ - HANDLES_EVENT(USB_UIDChange); - - /** Indicates that this module will catch the USB_InitFailure event when thrown by the library. */ - HANDLES_EVENT(USB_InitFailure); - - /** Indicates that this module will catch the USB_HostError event when thrown by the library. */ - HANDLES_EVENT(USB_HostError); - - /** Indicates that this module will catch the USB_DeviceEnumerationFailed event when thrown by the library. */ - HANDLES_EVENT(USB_DeviceEnumerationFailed); - - /** Indicates that this module will catch the USB_DeviceError event when thrown by the library. */ - HANDLES_EVENT(USB_DeviceError); - - /** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */ - HANDLES_EVENT(USB_UnhandledControlPacket); - - /** 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_DeviceAttached event when thrown by the library. */ - HANDLES_EVENT(USB_DeviceAttached); - - /** Indicates that this module will catch the USB_DeviceUnattached event when thrown by the library. */ - HANDLES_EVENT(USB_DeviceUnattached); - /* Macros: */ /** Prefix sent through the USART when an even fires before the actual event message. */ #define EVENT_PREFIX ESC_INVERSE_ON "EVENT:" ESC_INVERSE_OFF " " @@ -107,4 +55,23 @@ static void Abort_Program(void) ATTR_NO_RETURN; #endif + void EVENT_USB_VBUSChange(void); + void EVENT_USB_VBUSConnect(void); + void EVENT_USB_VBUSDisconnect(void); + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_InitFailure(const uint8_t ErrorCode); + void EVENT_USB_UIDChange(void); + 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 EVENT_USB_UnhandledControlPacket(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_Suspend(void); + void EVENT_USB_WakeUp(void); + void EVENT_USB_Reset(void); + void EVENT_USB_DeviceError(const uint8_t ErrorCode); + #endif diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile index 0ff49b6b9a..3c34d55633 100644 --- a/Demos/OTG/TestApp/makefile +++ b/Demos/OTG/TestApp/makefile @@ -509,7 +509,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 ------------------------------------ diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index c6d72cf02c..77599c9ef4 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -20,6 +20,10 @@ * - Clarified the size of library tokens which accept integer values in the Compile Time Tokens page, values now use the smallest datatype * inside the library that is able to hold their defined value to save space * - Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code + * - 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 * * * \section Sec_ChangeLog090510 Version 090510 diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.c b/LUFA/Drivers/USB/Class/ConfigDescriptor.c index 59e3a4b897..bbe258b3ab 100644 --- a/LUFA/Drivers/USB/Class/ConfigDescriptor.c +++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.c @@ -114,7 +114,7 @@ void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem, USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type); } -uint8_t USB_GetNextDescriptorComp_Prv(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine) +uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine) { uint8_t ErrorCode; diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.h b/LUFA/Drivers/USB/Class/ConfigDescriptor.h index 74d6d2727b..5c2b6e2de7 100644 --- a/LUFA/Drivers/USB/Class/ConfigDescriptor.h +++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.h @@ -110,63 +110,60 @@ #else #define DESCRIPTOR_SIZE(DescriptorPtr) DESCRIPTOR_CAST(DescriptorPtr, USB_Descriptor_Header_t).bLength #endif - - /** Creates a prototype for or begins a descriptor comparator routine. Descriptor comparator routines are - * small search routines which are passed a pointer to the current sub descriptor in the configuration - * descriptor, and which analyse the sub descriptor to determine whether or not it matches the routine's - * search parameters. Comparator routines provide a powerful way to scan through the config descriptor - * for certain descriptors matching unique criteria. + + /* Type Defines: */ + /** Type define for a Configuration Descriptor comparator function (function taking a pointer to an array + * of type void, returning a uint8_t value). * - * Comparator routines are passed in a single pointer named CurrentDescriptor, and should return a value - * of a member of the \ref DSearch_Return_ErrorCodes_t enum. + * \see \ref USB_GetNextDescriptorComp function for more details */ - #define DESCRIPTOR_COMPARATOR(name) uint8_t DCOMP_##name (void* const CurrentDescriptor) + typedef uint8_t (* const ConfigComparatorPtr_t)(void* const); - /* Pseudo-Function Macros: */ - #if defined(__DOXYGEN__) - /** Searches for the next descriptor in the given configuration descriptor using a premade comparator - * function. The routine updates the position and remaining configuration descriptor bytes values - * automatically. If a comparator routine fails a search, the descriptor pointer is retreated back - * so that the next descriptor search invocation will start from the descriptor which first caused the - * original search to fail. This behaviour allows for one comparator to be used immediately after another - * has failed, starting the second search from the descriptor which failed the first. - * - * \note This function is available in USB Host mode only. - * - * \param BytesRem Pointer to an int storing the remaining bytes in the configuration descriptor - * \param CurrConfigLoc Pointer to the current position in the configuration descriptor - * \param ComparatorRoutine Name of the comparator search function to use on the configuration descriptor - * - * \return Value of one of the members of the \ref DSearch_Comp_Return_ErrorCodes_t enum - * - * Usage Example: - * \code - * DESCRIPTOR_COMPARATOR(EndpointSearcher); // Comparator Prototype - * - * DESCRIPTOR_COMPARATOR(EndpointSearcher) - * { - * if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) - * return DESCRIPTOR_SEARCH_Found; - * else - * return DESCRIPTOR_SEARCH_NotFound; - * } - * - * //... - * // After retrieving configuration descriptor: - * if (USB_Host_GetNextDescriptorComp(&BytesRemaining, &ConfigDescriptorData, EndpointSearcher) == - * Descriptor_Search_Comp_Found) - * { - * // Do something with the endpoint descriptor - * } - * \endcode - */ - uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ComparatorPtr_t ComparatorRoutine); - #else - #define USB_GetNextDescriptorComp(DSize, DPos, DSearch) USB_GetNextDescriptorComp_Prv(DSize, DPos, DCOMP_##DSearch) - #endif + /* Function Prototypes: */ + /** Searches for the next descriptor in the given configuration descriptor using a premade comparator + * function. The routine updates the position and remaining configuration descriptor bytes values + * automatically. If a comparator routine fails a search, the descriptor pointer is retreated back + * so that the next descriptor search invocation will start from the descriptor which first caused the + * original search to fail. This behaviour allows for one comparator to be used immediately after another + * has failed, starting the second search from the descriptor which failed the first. + * + * Comparator functions should be standard functions which accept a pointer to the header of the current + * descriptor inside the configuration descriptor which is being compared, and should return a value from + * the \ref DSearch_Return_ErrorCodes_t enum as a uint8_t value. + * + * \note This function is available in USB Host mode only. + * + * \param BytesRem Pointer to an int storing the remaining bytes in the configuration descriptor + * \param CurrConfigLoc Pointer to the current position in the configuration descriptor + * \param ComparatorRoutine Name of the comparator search function to use on the configuration descriptor + * + * \return Value of one of the members of the \ref DSearch_Comp_Return_ErrorCodes_t enum + * + * Usage Example: + * \code + * uint8_t EndpointSearcher(void* CurrentDescriptor); // Comparator Prototype + * + * uint8_t EndpointSearcher(void* CurrentDescriptor) + * { + * if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) + * return DESCRIPTOR_SEARCH_Found; + * else + * return DESCRIPTOR_SEARCH_NotFound; + * } + * + * //... + * // After retrieving configuration descriptor: + * if (USB_Host_GetNextDescriptorComp(&BytesRemaining, &ConfigDescriptorData, EndpointSearcher) == + * Descriptor_Search_Comp_Found) + * { + * // Do something with the endpoint descriptor + * } + * \endcode + */ + uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine); /* Enums: */ - /** Enum for return values of a descriptor comparator made with \ref DESCRIPTOR_COMPARATOR. */ + /** Enum for return values of a descriptor comparator function. */ enum DSearch_Return_ErrorCodes_t { DESCRIPTOR_SEARCH_Found = 0, /**< Current descriptor matches comparator criteria. */ @@ -264,20 +261,6 @@ *BytesRem -= CurrDescriptorSize; } - /* Type Defines: */ - /** Type define for a Configuration Descriptor comparator function (function taking a pointer to an array - * of type void, returning a uint8_t value). - * - * \see \ref USB_GetNextDescriptorComp function for more details - */ - typedef uint8_t (* const ConfigComparatorPtr_t)(void* const); - - /* Private Interface - For use in library only: */ - #if !defined(__DOXYGEN__) - /* Function Prototypes: */ - uint8_t USB_GetNextDescriptorComp_Prv(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine); - #endif - /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) } diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h index 45ad801dea..e65352e3f1 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.h +++ b/LUFA/Drivers/USB/HighLevel/Events.h @@ -36,9 +36,9 @@ * multiple places in the user or library code, which may or may not be inside an ISR, thus each handler * should be written to be as small and fast as possible to prevent possible problems. * - * Events can be hooked by the user application using the \ref EVENT_HANDLER() and \ref HANDLES_EVENT() macros. If an - * event with no associated handler is fired within the library, it by default fires an internal empty stub - * function. This is achieved through the use of the GCC compiler's "alias" attribute. + * Events can be hooked by the user application by declaring a handler function with the same name and parameters + * listed here. If an event with no user-associated handler is fired within the library, it by default maps to an + * internal empty stub function. This is achieved through the use of the GCC compiler's "alias" attribute. * * Each event must only have one associated event handler, but can be raised by multiple sources. * @@ -59,96 +59,15 @@ extern "C" { #endif - /* Public Interface - May be used in end-application: */ - /* Macros: */ - /** Raises a given event name, with the specified parameters. For events with no parameters the - * only argument to the macro is the event name, events with parameters list the parameter values - * after the name as a comma separated list. - * - * When a given event is fired, its corresponding event handler code is executed. - * - * Usage Examples: - * \code - * // Raise the USB_VBUSChange event, which takes no parameters - * RAISE_EVENT(USB_VBUSChange); - * - * // Raise the USB_UnhandledControlPacket event which takes two parameters - * RAISE_EVENT(USB_UnhandledControlPacket, 0, 1); - * \endcode - * - * \see RAISES_EVENT() - */ - #define RAISE_EVENT(e, ...) Event_ ## e (__VA_ARGS__) - - /** Indicates that a given module can raise a given event. This is the equivalent of putting the - * event function's prototype into the module, but in a cleaner way. Each event which may be - * fired via the \ref RAISE_EVENT macro in the module should have an accompanying \ref RAISES_EVENT - * prototype in the module's header file. - * - * Usage Examples: - * \code - * // Module can raise the USB_VBUSChange event - * RAISES_EVENT(USB_VBUSChange); - * - * // ... - * // Inside a block of code in a function of the module, raise the USB_VBUSChange event - * RAISE_EVENT(USB_VBUSChange); - * \endcode - * - * \see RAISE_EVENT() - */ - #define RAISES_EVENT(e) HANDLES_EVENT(e) - - /** Defines an event handler for the given event. Event handlers should be short in length, as they - * may be raised from inside an ISR. The user application can react to each event as it sees fit, - * such as logging the event, indicating the change to the user or performing some other action. - * - * Only one event handler may be defined in any user project for each individual event. Events may - * or may not have parameters - for each event, refer to its documentation elsewhere in this module - * to determine the presence and purpose of any event parameters. - * - * Usage Example: - * \code - * // Create an event handler for the USB_VBUSChange event - * EVENT_HANDLER(USB_VBUSChange) - * { - * // Code to execute when the VBUS level changes - * } - * \endcode - * - * \see HANDLES_EVENT() - */ - #define EVENT_HANDLER(e) void Event_ ## e e ## _P - - /** Indicates that a given module handles an event. This is the equivalent of putting the - * event function's prototype into the module, but in a cleaner way. Each event which may be - * handled via the \ref EVENT_HANDLER macro in the module should have an accompanying \ref HANDLES_EVENT - * prototype in the module's header file. - * - * Usage Examples: - * \code - * // Module handles the USB_VBUSChange event - * HANDLES_EVENT(USB_VBUSChange); - * - * // Create the USB_VBUSChange event handler - * EVENT_HANDLER(USB_VBUSChange) - * { - * // Event handler code here - * } - * \endcode - * - * \see EVENT_HANDLER() - */ - #define HANDLES_EVENT(e) EVENT_HANDLER(e) - + /* Public Interface - May be used in end-application: */ /* Pseudo-Functions for Doxygen: */ - #if defined(__DOXYGEN__) + #if !defined(INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__) /** Event for VBUS level change. This event fires when the VBUS line of the USB AVR changes from * high to low or vice-versa. * * \note This event is only available on USB AVR models which support VBUS notification interrupts. */ - void USB_VBUSChange(void); + void EVENT_USB_VBUSChange(void); /** Event for VBUS attachment. This event fires when the VBUS line of the USB AVR changes from * low to high, signalling the attachment of the USB device to a host, before the enumeration @@ -156,7 +75,7 @@ * * \note This event is only available on USB AVR models which support VBUS notification interrupts. */ - void USB_VBUSConnect(void); + void EVENT_USB_VBUSConnect(void); /** Event for VBUS detachment. This event fires when the VBUS line of the USB AVR changes from * high to low, signalling the USB device has been removed from a host whether it has been enumerated @@ -164,7 +83,7 @@ * * \note This event is only available on USB AVR models which support VBUS notification interrupts. */ - void USB_VBUSDisconnect(void); + void EVENT_USB_VBUSDisconnect(void); /** Event for USB device connection. This event fires when the AVR is in USB host mode and a device * has been attached (but not yet fully enumerated), or when in device mode and the device is connected @@ -178,11 +97,11 @@ * which is not always accurate (host may suspend the bus while still connected). If the actual connection state * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by * passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection - * and disconnection events may be manually fired by \ref RAISE_EVENT(), and the \ref USB_IsConnected global changed manually. + * and disconnection events may be manually fired, and the \ref USB_IsConnected global changed manually. * * \see USBTask.h for more information on the USB management task and reducing CPU usage. */ - void USB_Connect(void); + void EVENT_USB_Connect(void); /** Event for USB device disconnection. This event fires when the AVR is in USB host mode and an * attached and enumerated device has been disconnected, or when in device mode and the device is @@ -196,11 +115,11 @@ * which is not always accurate (host may suspend the bus while still connected). If the actual connection state * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by * passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection - * and disconnection events may be manually fired by \ref RAISE_EVENT(), and the \ref USB_IsConnected global changed manually. + * and disconnection events may be manually fired, and the \ref USB_IsConnected global changed manually. * * \see USBTask.h for more information on the USB management task and reducing CPU usage. */ - void USB_Disconnect(void); + void EVENT_USB_Disconnect(void); /** Event for USB initialization failure. This event fires when the USB interface fails to * initialize correctly due to a hardware or software fault. @@ -208,9 +127,8 @@ * \note This event only exists on USB AVR models which support dual role modes. * * \param ErrorCode Error code indicating the failure reason, a value in \ref USB_InitErrorCodes_t - * located in LowLevel.h. */ - void USB_InitFailure(const uint8_t ErrorCode); + void EVENT_USB_InitFailure(const uint8_t ErrorCode); /** Event for USB mode pin level change. This event fires when the USB interface is set to dual role * mode, and the UID pin level has changed to indicate a new mode (device or host). This event fires @@ -221,24 +139,23 @@ * \note This event does not exist if the USB_DEVICE_ONLY or USB_HOST_ONLY tokens have been supplied * to the compiler (see \ref Group_USBManagement documentation). */ - void USB_UIDChange(void); + void EVENT_USB_UIDChange(void); /** Event for USB host error. This event fires when a hardware fault has occurred whilst the USB * interface is in host mode. * * \param ErrorCode Error code indicating the failure reason, a value in \ref USB_Host_ErrorCodes_t - * located in Host.h. * * \note This event only exists on USB AVR models which supports host mode. * * \note This event does not exist if the USB_DEVICE_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). */ - void USB_HostError(const uint8_t ErrorCode); + void EVENT_USB_HostError(const uint8_t ErrorCode); /** Event for USB device attachment. This event fires when a the USB interface is in host mode, and * a USB device has been connected to the USB interface. This is interrupt driven, thus fires before - * the standard \ref USB_Connect event and so can be used to programmatically start the USB management + * the standard \ref EVENT_USB_Connect event and so can be used to programmatically start the USB management * task to reduce CPU consumption. * * \note This event only exists on USB AVR models which supports host mode. @@ -248,7 +165,7 @@ * * \see \ref TASK(USB_USBTask) for more information on the USB management task and reducing CPU usage. */ - void USB_DeviceAttached(void); + void EVENT_USB_DeviceAttached(void); /** Event for USB device removal. This event fires when a the USB interface is in host mode, and * a USB device has been removed the USB interface whether or not it has been enumerated. This @@ -261,13 +178,13 @@ * * \see \ref TASK(USB_USBTask) for more information on the USB management task and reducing CPU usage. */ - void USB_DeviceUnattached(void); + void EVENT_USB_DeviceUnattached(void); /** Event for USB device enumeration failure. This event fires when a the USB interface is * in host mode, and an attached USB device has failed to enumerate completely. * * \param ErrorCode Error code indicating the failure reason, a value in - * \ref USB_Host_EnumerationErrorCodes_t located in Host.h. + * \ref USB_Host_EnumerationErrorCodes_t * * \param SubErrorCode Sub error code indicating the reason for failure - for example, if the * ErrorCode parameter indicates a control error, this will give the error @@ -278,14 +195,14 @@ * \note This event does not exist if the USB_DEVICE_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). */ - void USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); + void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); /** Event for USB device enumeration completion. This event fires when a the USB interface is * in host mode and an attached USB device has been completely enumerated and is ready to be * controlled by the user application, or when the library is in device mode, and the Host * has finished enumerating the device. */ - void USB_DeviceEnumerationComplete(void); + void EVENT_USB_DeviceEnumerationComplete(void); /** Event for unhandled control requests. This event fires when a the USB host issues a control * request to the control endpoint (address 0) that the library does not handle. This may either @@ -301,7 +218,7 @@ * request SETUP parameters into the \ref USB_ControlRequest structure which should then be used * by the application to determine how to handle the issued request. */ - void USB_UnhandledControlPacket(void); + void EVENT_USB_UnhandledControlPacket(void); /** Event for USB configuration number changed. This event fires when a the USB host changes the * selected configuration number while in device mode. This event should be hooked in device @@ -312,7 +229,7 @@ * \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). */ - void USB_ConfigurationChanged(void); + void EVENT_USB_ConfigurationChanged(void); /** Event for USB suspend. This event fires when a the USB host suspends the device by halting its * transmission of Start Of Frame pulses to the device. This is generally hooked in order to move @@ -321,9 +238,9 @@ * \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). * - * \see \ref USB_WakeUp() event for accompanying Wake Up event. + * \see \ref EVENT_USB_WakeUp() event for accompanying Wake Up event. */ - void USB_Suspend(void); + void EVENT_USB_Suspend(void); /** Event for USB wake up. This event fires when a the USB interface is suspended while in device * mode, and the host wakes up the device by supplying Start Of Frame pulses. This is generally @@ -333,9 +250,9 @@ * \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). * - * \see \ref USB_Suspend() event for accompanying Suspend event. + * \see \ref EVENT_USB_Suspend() event for accompanying Suspend event. */ - void USB_WakeUp(void); + void EVENT_USB_WakeUp(void); /** Event for USB interface reset. This event fires when a the USB interface is in device mode, and * a the USB host requests that the device reset its interface. This is generally hooked so that @@ -346,90 +263,55 @@ * \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). */ - void USB_Reset(void); + void EVENT_USB_Reset(void); /** Event for USB device mode error. This event fires when the USB interface is in device mode, * and an error occurs which prevents it from operating normally. * - * \param ErrorCode Error code indicating the source of the error. One of the values in the - * \ref USB_Device_ErrorCodes_t enum located in Device.h. + * \param ErrorCode Error code indicating the source of the error, a value in + * \ref USB_Device_ErrorCodes_t * * \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see * \ref Group_USBManagement documentation). */ - void USB_DeviceError(const uint8_t ErrorCode); + void EVENT_USB_DeviceError(const uint8_t ErrorCode); #endif /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) - /* Macros: */ - #define ALIAS_STUB(e) EVENT_HANDLER(e) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub) - - #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) - #define USB_VBUSChange_P (void) - #define USB_VBUSConnect_P (void) - #define USB_VBUSDisconnect_P (void) - #endif - - #define USB_Connect_P (void) - #define USB_Disconnect_P (void) - #define USB_DeviceEnumerationComplete_P (void) - - #if defined(USB_CAN_BE_BOTH) - #define USB_InitFailure_P (const uint8_t ErrorCode) - #define USB_UIDChange_P (void) - #endif - - #if defined(USB_CAN_BE_HOST) - #define USB_HostError_P (const uint8_t ErrorCode) - #define USB_DeviceAttached_P (void) - #define USB_DeviceUnattached_P (void) - #define USB_DeviceEnumerationFailed_P (const uint8_t ErrorCode, const uint8_t SubErrorCode) - #endif - - #if defined(USB_CAN_BE_DEVICE) - #define USB_UnhandledControlPacket_P (void) - #define USB_ConfigurationChanged_P (void) - #define USB_Suspend_P (void) - #define USB_WakeUp_P (void) - #define USB_Reset_P (void) - #define USB_DeviceError_P (const uint8_t ErrorCode) - #endif - /* Function Prototypes: */ #if defined(INCLUDE_FROM_EVENTS_C) void USB_Event_Stub(void) ATTR_CONST; #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) - ALIAS_STUB(USB_VBUSChange); - ALIAS_STUB(USB_VBUSConnect); - ALIAS_STUB(USB_VBUSDisconnect); + void EVENT_USB_VBUSChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_VBUSConnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_VBUSDisconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); #endif - - ALIAS_STUB(USB_Connect); - ALIAS_STUB(USB_Disconnect); - ALIAS_STUB(USB_DeviceEnumerationComplete); + + void EVENT_USB_Connect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_Disconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); #if defined(USB_CAN_BE_BOTH) - ALIAS_STUB(USB_InitFailure); - ALIAS_STUB(USB_UIDChange); + void EVENT_USB_InitFailure(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); #endif #if defined(USB_CAN_BE_HOST) - ALIAS_STUB(USB_HostError); - ALIAS_STUB(USB_DeviceAttached); - ALIAS_STUB(USB_DeviceUnattached); - ALIAS_STUB(USB_DeviceEnumerationFailed); + void EVENT_USB_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) + ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); #endif - #if defined(USB_CAN_BE_DEVICE) - ALIAS_STUB(USB_UnhandledControlPacket); - ALIAS_STUB(USB_ConfigurationChanged); - ALIAS_STUB(USB_Suspend); - ALIAS_STUB(USB_WakeUp); - ALIAS_STUB(USB_Reset); - ALIAS_STUB(USB_DeviceError); - #endif + void EVENT_USB_UnhandledControlPacket(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_ConfigurationChanged(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_Suspend(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_WakeUp(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_Reset(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); + void EVENT_USB_DeviceError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); #endif #endif diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.c b/LUFA/Drivers/USB/HighLevel/StdDescriptors.c index 82ef7a7ce7..ae8cc711db 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.c +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.c @@ -36,7 +36,7 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) { - RAISE_EVENT(USB_DeviceError, DEVICE_ERROR_GetDescriptorNotHooked); + EVENT_USB_DeviceError(DEVICE_ERROR_GetDescriptorNotHooked); return 0; }; diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index 390ac6b015..d94a912962 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -175,16 +175,6 @@ */ #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4) - /* Events: */ - #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__) - /** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor() - * routine is not hooked in the user application to properly return descriptors to the library. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceError); - #endif - /* Enums: */ /** Enum for the possible standard descriptor types, as given in each descriptor's header. */ enum USB_DescriptorTypes_t diff --git a/LUFA/Drivers/USB/HighLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h index fc626cc0ae..b9ae04598b 100644 --- a/LUFA/Drivers/USB/HighLevel/StdRequestType.h +++ b/LUFA/Drivers/USB/HighLevel/StdRequestType.h @@ -160,41 +160,41 @@ { REQ_GetStatus = 0, /**< Implemented in the library for device, endpoint and interface * recipients. Passed to the user application for other recipients - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_ClearFeature = 1, /**< Implemented in the library for device, endpoint and interface * recipients. Passed to the user application for other recipients - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_SetFeature = 3, /**< Implemented in the library for device, endpoint and interface * recipients. Passed to the user application for other recipients - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_SetAddress = 5, /**< Implemented in the library for the device recipient. Passed * to the user application for other recipients via the - * \ref USB_UnhandledControlPacket() event when received in + * \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_GetDescriptor = 6, /**< Implemented in the library for all recipients and all request * types. */ REQ_SetDescriptor = 7, /**< Not implemented in the library, passed to the user application - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_GetConfiguration = 8, /**< Implemented in the library for the device recipient. Passed * to the user application for other recipients via the - * \ref USB_UnhandledControlPacket() event when received in + * \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_SetConfiguration = 9, /**< Implemented in the library for the device recipient. Passed * to the user application for other recipients via the - * \ref USB_UnhandledControlPacket() event when received in + * \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_GetInterface = 10, /**< Not implemented in the library, passed to the user application - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_SetInterface = 11, /**< Not implemented in the library, passed to the user application - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ REQ_SynchFrame = 12, /**< Not implemented in the library, passed to the user application - * via the \ref USB_UnhandledControlPacket() event when received in + * via the \ref EVENT_USB_UnhandledControlPacket() event when received in * device mode. */ }; diff --git a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h index e739d8438d..a67cc8988a 100644 --- a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h +++ b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h @@ -32,7 +32,8 @@ * @defgroup Group_StreamCallbacks Endpoint and Pipe Stream Callbacks * * Macros and enums for the stream callback routines. This module contains the code required to easily set up - * stream callback functions which can be used to force early abort of a stream read/write process. + * stream callback functions which can be used to force early abort of a stream read/write process. Each callback + * should take no arguments, and return a value from the \ref StreamCallback_Return_ErrorCodes_t enum. * * @{ */ @@ -42,37 +43,6 @@ /* Public Interface - May be used in end-application: */ /* Macros: */ - /** Creates a prototype for or begins a stream callback routine. Stream callback routines are small - * routines which are executed during stream read or writes (if the callback-enabled versions of - * these functions are used) which allow the user application to abort the transfer when certain - * arbitrary conditions are met. - * - * Stream callback functions should return a value from the \ref StreamCallback_Return_ErrorCodes_t - * enum. - * - * Usage Example (Device Endpoint, but applicable for Host Pipes also): - * \code - * STREAM_CALLBACK(GlobalNotSet); // Callback Prototype - * - * STREAM_CALLBACK(GlobalNotSet) - * { - * if (MyGlobal == false) - * return ENDPOINT_STREAMCALLBACK_Continue; - * else - * return ENDPOINT_STREAMCALLBACK_Abort; - * } - * - * //... - * // Inside some routine: - * if (Endpoint_Write_Stream_LE(DataBuffer, sizeof(DataBuffer), GlobalNotSet) == - * ENDPOINT_RWSTREAM_ERROR_CallbackAborted) - * { - * // Do something when the callback aborted the transfer early - * } - * \endcode - */ - #define STREAM_CALLBACK(name) uint8_t name (void) - /** Used with the Endpoint and Pipe stream functions as the callback function parameter, indicating that the stream * call has no callback function to be called between USB packets. */ diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c index 14d277c9a4..86dfa855ae 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c @@ -72,24 +72,24 @@ ISR(USB_GEN_vect, ISR_BLOCK) { USB_INT_Clear(USB_INT_VBUS); - RAISE_EVENT(USB_VBUSChange); + EVENT_USB_VBUSChange(); if (USB_VBUS_GetStatus()) { - RAISE_EVENT(USB_VBUSConnect); + EVENT_USB_VBUSConnect(); if (USB_IsConnected) - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); USB_ResetInterface(); USB_IsConnected = true; - RAISE_EVENT(USB_Connect); + EVENT_USB_Connect(); } else { - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); USB_Detach(); USB_CLK_Freeze(); @@ -98,7 +98,7 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_IsConnected = false; - RAISE_EVENT(USB_VBUSDisconnect); + EVENT_USB_VBUSDisconnect(); USB_INT_Clear(USB_INT_VBUS); } @@ -119,13 +119,13 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_IsSuspended = true; - RAISE_EVENT(USB_Suspend); + EVENT_USB_Suspend(); #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT) if (USB_IsConnected) { USB_IsConnected = false; - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); } #endif } @@ -149,13 +149,13 @@ ISR(USB_GEN_vect, ISR_BLOCK) if (!(USB_IsConnected)) { USB_IsConnected = true; - RAISE_EVENT(USB_Connect); + EVENT_USB_Connect(); } #endif USB_IsSuspended = false; - RAISE_EVENT(USB_WakeUp); + EVENT_USB_WakeUp(); } if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI)) @@ -178,7 +178,7 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_INT_Enable(USB_INT_ENDPOINT_SETUP); #endif - RAISE_EVENT(USB_Reset); + EVENT_USB_Reset(); } #endif @@ -189,8 +189,8 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_INT_Clear(USB_INT_DCONNI); USB_INT_Disable(USB_INT_DDISCI); - RAISE_EVENT(USB_DeviceUnattached); - RAISE_EVENT(USB_Disconnect); + EVENT_USB_DeviceUnattached(); + EVENT_USB_Disconnect(); USB_ResetInterface(); } @@ -202,8 +202,8 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_Host_VBUS_Manual_Off(); USB_Host_VBUS_Auto_Off(); - RAISE_EVENT(USB_HostError, HOST_ERROR_VBusVoltageDip); - RAISE_EVENT(USB_DeviceUnattached); + EVENT_USB_HostError(HOST_ERROR_VBusVoltageDip); + EVENT_USB_DeviceUnattached(); USB_HostState = HOST_STATE_Unattached; } @@ -213,7 +213,7 @@ ISR(USB_GEN_vect, ISR_BLOCK) USB_INT_Clear(USB_INT_SRPI); USB_INT_Disable(USB_INT_SRPI); - RAISE_EVENT(USB_DeviceAttached); + EVENT_USB_DeviceAttached(); USB_INT_Enable(USB_INT_DDISCI); @@ -224,11 +224,11 @@ ISR(USB_GEN_vect, ISR_BLOCK) { USB_INT_Clear(USB_INT_BCERRI); - RAISE_EVENT(USB_DeviceEnumerationFailed, HOST_ENUMERROR_NoDeviceDetected, 0); - RAISE_EVENT(USB_DeviceUnattached); + EVENT_USB_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0); + EVENT_USB_DeviceUnattached(); if (USB_IsConnected) - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); USB_ResetInterface(); } @@ -242,12 +242,12 @@ ISR(USB_GEN_vect, ISR_BLOCK) if (USB_IsConnected) { if (USB_CurrentMode == USB_MODE_HOST) - RAISE_EVENT(USB_DeviceUnattached); + EVENT_USB_DeviceUnattached(); else - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); } - RAISE_EVENT(USB_UIDChange); + EVENT_USB_UIDChange(); USB_ResetInterface(); } diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h index 7fbb33efc8..14f693050e 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h @@ -45,113 +45,6 @@ extern "C" { #endif - /* Public Interface - May be used in end-application: */ - /* Throwable Events: */ - /** This module raises the USB Connected interrupt when the AVR is attached to a host while in device - * USB mode. - * - * \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller. - * this means that the current connection state is derived from the bus suspension and wake up events by default, - * which is not always accurate (host may suspend the bus while still connected). If the actual connection state - * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by - * passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection - * and disconnection events may be manually fired by \ref RAISE_EVENT(), and the USB_IsConnected global changed manually. - */ - RAISES_EVENT(USB_Connect); - - /** This module raises the USB Disconnected interrupt when the AVR is removed from a host while in - * device USB mode. - * - * \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller. - * this means that the current connection state is derived from the bus suspension and wake up events by default, - * which is not always accurate (host may suspend the bus while still connected). If the actual connection state - * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by - * passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection - * and disconnection events may be manually fired by \ref RAISE_EVENT(), and the USB_IsConnected global changed manually. - */ - RAISES_EVENT(USB_Disconnect); - - #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__) - /** This module raises the VBUS Change event when the current VBUS status (present or not present) has - * changed. - * - * \note Not all USB AVR models support VBUS interrupts; this event only exists on supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_VBUSChange); - - /** This module raises the VBUS Connect event when the VBUS line is powered. - * - * \note Not all USB AVR models support VBUS interrupts; this event only exists on supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_VBUSConnect); - - /** This module raises the VBUS Disconnect event when power is removed from the VBUS line. - * - * \note Not all USB AVR models support VBUS interrupts; this event only exists on supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_VBUSDisconnect); - #endif - - #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__) - /** This module raises the Suspended event when the host suspends the USB interface of the AVR - * whilst running in device mode. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_Suspend); - - /** This module raises the Wake Up event when the host resumes the USB interface of the AVR - * whilst running in device mode. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_WakeUp); - - /** This module raises the USB Reset event when the host resets the USB interface of the AVR - * whilst running in device mode. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_Reset); - #endif - - #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__) - /** This module raises the Host Error event when the VBUS line voltage dips below the minimum threshold - * while running in host mode. - * - * \note Not all USB AVR models support host mode; this event only exists on supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_HostError); - - /** This module raises the Device Unattached event when an attached device is removed from the AVR whilst - * running in host mode. - * - * \note Not all USB AVR models support host mode; this event only exists on supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceUnattached); - #endif - - #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__) - /** This module raises the UID Change event when the UID line changes in value on dual-role devices. - * - * \note Not all USB AVR models support host mode and thus the UID pin; this event only exists on - * supported AVRs. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_UIDChange); - #endif - /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index 9cb4e60597..21b1ae2005 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -67,7 +67,7 @@ * which is not always accurate (host may suspend the bus while still connected). If the actual connection state * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by * passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection - * and disconnection events may be manually fired by \ref RAISE_EVENT(), and the \ref USB_IsConnected global changed manually. + * and disconnection events may be manually fired, and the \ref USB_IsConnected global changed manually. * * \ingroup Group_USBManagement */ @@ -84,7 +84,7 @@ extern volatile bool USB_IsInitialized; /** Structure containing the last received Control request when in Device mode (for use in user-applications - * inside of the \ref USB_UnhandledControlPacket() event, or for filling up with a control request to issue when + * inside of the \ref EVENT_USB_UnhandledControlPacket() event, or for filling up with a control request to issue when * in Host mode before calling \ref USB_Host_SendControlRequest(). * * \ingroup Group_USBManagement @@ -122,52 +122,6 @@ extern volatile uint8_t USB_HostState; #endif - /* Throwable Events: */ - #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__) - /** This module raises the \ref USB_Connect event when a USB device has been connected whilst in host - * mode, but not yet enumerated. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_Connect); - - /** This module raises the \ref USB_DeviceAttached event when in host mode, and a device is attached - * to the AVR's USB interface. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceAttached); - - /** This module raises the \ref USB_DeviceUnattached event when in host mode, and a device is removed - * from the AVR's USB interface. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceUnattached); - - /** This module raises the \ref USB_DeviceEnumerationFailed event when in host mode, and an - * attached USB device has failed to successfully enumerated. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceEnumerationFailed); - - /** This module raises the \ref USB_DeviceEnumerationComplete event when in host mode, and an - * attached USB device has been successfully enumerated and ready to be used by the user - * application. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceEnumerationComplete); - - /** This module raises the \ref USB_Disconnect event when an attached USB device is removed from the USB - * bus. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_Disconnect); - #endif - /* Tasks: */ /** This is the main USB management task. The USB driver requires that this task be executed * continuously when the USB system is active (device attached in host mode, or attached to a host @@ -177,11 +131,11 @@ * The USB task must be serviced within 50mS in all modes, when needed. The task may be serviced * at all times, or (for minimum CPU consumption): * - * - In device mode, it may be disabled at start-up, enabled on the firing of the \ref USB_Connect event - * and disabled again on the firing of the \ref USB_Disconnect event. + * - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event + * and disabled again on the firing of the \ref EVENT_USB_Disconnect() event. * - * - In host mode, it may be disabled at start-up, enabled on the firing of the \ref USB_DeviceAttached - * event and disabled again on the firing of the \ref USB_DeviceUnattached event. + * - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached() + * event and disabled again on the firing of the \ref EVENT_USB_DeviceUnattached() event. * * If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library * by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch. diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index 785d10faca..8f53105a62 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -106,7 +106,7 @@ void USB_Device_ProcessControlPacket(void) } if (!(RequestHandled)) - RAISE_EVENT(USB_UnhandledControlPacket); + EVENT_USB_UnhandledControlPacket(); if (Endpoint_IsSETUPReceived()) { @@ -157,9 +157,9 @@ static void USB_Device_SetConfiguration(void) Endpoint_ClearIN(); if (!(AlreadyConfigured) && USB_ConfigurationNumber) - RAISE_EVENT(USB_DeviceEnumerationComplete); + EVENT_USB_DeviceEnumerationComplete(); - RAISE_EVENT(USB_ConfigurationChanged); + EVENT_USB_ConfigurationChanged(); } void USB_Device_GetConfiguration(void) diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h index 49795e5de3..68cb2c448d 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h @@ -81,29 +81,6 @@ * \ingroup Group_Device */ extern bool USB_CurrentlySelfPowered; - - /* Throwable Events: */ - /** This module raises the \ref USB_UnhandledControlPacket event when a request to the default control - * endpoint has been received, but the library does not implement an internal handler for it. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_UnhandledControlPacket); - - /** This module raises the \ref USB_ConfigurationChanged event when the host issues a \ref REQ_SetConfiguration - * device request, to change the currently selected configuration number. - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_ConfigurationChanged); - - /** This module raises the \ref USB_DeviceEnumerationComplete event when the host has completed its - * enumeration of the device (i.e. when a \ref REQ_SetConfiguration request changes the current configuration - * number from 0 to a non-zero value). - * - * \see \ref Group_Events for more information on this event. - */ - RAISES_EVENT(USB_DeviceEnumerationComplete); /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h index 411ece0020..ea9be4b9f9 100644 --- a/LUFA/Drivers/USB/LowLevel/Device.h +++ b/LUFA/Drivers/USB/LowLevel/Device.h @@ -115,7 +115,7 @@ #endif /* Enums: */ - /** Enum for the ErrorCode parameter of the \ref USB_DeviceError event. + /** Enum for the ErrorCode parameter of the \ref EVENT_USB_DeviceError() event. * * \see Events.h for more information on this event. */ diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h index 7f2b76a2fe..bf33848483 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.h +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h @@ -108,7 +108,7 @@ /** Endpoint number mask, for masking against endpoint addresses to retrieve the endpoint's * numerical address in the device. */ - #define ENDPOINT_EPNUM_MASK 0x03 + #define ENDPOINT_EPNUM_MASK 0x07 /** Endpoint bank size mask, for masking against endpoint addresses to retrieve the endpoint's * bank size in the device. @@ -712,9 +712,9 @@ * each USB packet, the given stream callback function is executed repeatedly until the next * packet is ready, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \note This routine should not be used on CONTROL type endpoints. * @@ -738,9 +738,9 @@ * is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early * aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \note This routine should not be used on CONTROL type endpoints. * @@ -765,9 +765,9 @@ * is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early * aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \note This routine should not be used on CONTROL type endpoints. * @@ -792,9 +792,9 @@ * each USB packet, the given stream callback function is executed repeatedly until the endpoint * is ready to accept the next packet, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \note This routine should not be used on CONTROL type endpoints. * @@ -819,9 +819,9 @@ * each USB packet, the given stream callback function is executed repeatedly until the endpoint * is ready to accept the next packet, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \note This routine should not be used on CONTROL type endpoints. * diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 9630b6aa10..b3b56b8d1c 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -90,7 +90,7 @@ void USB_Host_ProcessNextHostState(void) USB_INT_Enable(USB_INT_VBERRI); USB_IsConnected = true; - RAISE_EVENT(USB_Connect); + EVENT_USB_Connect(); USB_Host_ResumeBus(); Pipe_ClearPipes(); @@ -184,7 +184,7 @@ void USB_Host_ProcessNextHostState(void) case HOST_STATE_Default_PostAddressSet: USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS); - RAISE_EVENT(USB_DeviceEnumerationComplete); + EVENT_USB_DeviceEnumerationComplete(); USB_HostState = HOST_STATE_Addressed; break; @@ -192,14 +192,14 @@ void USB_Host_ProcessNextHostState(void) if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached)) { - RAISE_EVENT(USB_DeviceEnumerationFailed, ErrorCode, SubErrorCode); + EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode); USB_Host_VBUS_Auto_Off(); - RAISE_EVENT(USB_DeviceUnattached); + EVENT_USB_DeviceUnattached(); if (USB_IsConnected) - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); USB_ResetInterface(); } diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index 4457c07d8f..911b41bd99 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -199,7 +199,7 @@ HOST_STATE_Suspended = 13, /**< May be implemented by the user project. */ }; - /** Enum for the error codes for the \ref USB_HostError event. + /** Enum for the error codes for the \ref EVENT_USB_HostError() event. * * \see \ref Group_Events for more information on this event. */ @@ -213,14 +213,14 @@ */ }; - /** Enum for the error codes for the \ref USB_DeviceEnumerationFailed event. + /** Enum for the error codes for the \ref EVENT_USB_DeviceEnumerationFailed() event. * * \see \ref Group_Events for more information on this event. */ enum USB_Host_EnumerationErrorCodes_t { HOST_ENUMERROR_NoError = 0, /**< No error occurred. Used internally, this is not a valid - * ErrorCode parameter value for the \ref USB_DeviceEnumerationFailed + * ErrorCode parameter value for the \ref EVENT_USB_DeviceEnumerationFailed() * event. */ HOST_ENUMERROR_WaitStage = 1, /**< One of the delays between enumeration steps failed diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c index 99b9cfbe50..346420f471 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.c +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c @@ -92,7 +92,7 @@ void USB_Init( } else { - RAISE_EVENT(USB_InitFailure, USB_INITERROR_NoUSBModeSpecified); + EVENT_USB_InitFailure(USB_INITERROR_NoUSBModeSpecified); return; } #endif @@ -111,7 +111,7 @@ void USB_Init( void USB_ShutDown(void) { if (USB_IsConnected) - RAISE_EVENT(USB_Disconnect); + EVENT_USB_Disconnect(); USB_Detach(); diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index fad1cbf1f4..41b0ff5f67 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -283,7 +283,7 @@ /* Enums: */ /** Enum for error codes relating to the powering on of the USB interface. These error codes are - * used in the ErrorCode parameter value of the \ref USB_InitFailure event. + * used in the ErrorCode parameter value of the \ref EVENT_USB_InitFailure() event. */ enum USB_InitErrorCodes_t { @@ -313,24 +313,6 @@ extern volatile uint8_t USB_Options; #endif - /* Throwable Events: */ - /** This module raises the \ref USB_Disconnect event if the USB interface is reset (such as during a mode - * change while in UID mode) while the USB interface is connected to a device when in host mode, or - * a host while in device mode. - * - * \see Events.h for more information on this event. - */ - RAISES_EVENT(USB_Disconnect); - - #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__) - /** This module raises the Power On Failure event when an error occurs while initializing the USB - * interface. - * - * \see Events.h for more information on this event. - */ - RAISES_EVENT(USB_InitFailure); - #endif - /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index c96a440a03..befc996a22 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -745,9 +745,9 @@ * \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is * executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \ingroup Group_PipeRW * @@ -769,9 +769,9 @@ * \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is * executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \ingroup Group_PipeRW * @@ -793,9 +793,9 @@ * Between each USB packet, the given stream callback function is executed repeatedly until the next packet is ready, * allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \ingroup Group_PipeRW * @@ -816,9 +816,9 @@ * \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is * executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \ingroup Group_PipeRW * @@ -840,9 +840,9 @@ * \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is * executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers. * - * The callback routine should be created using the \ref STREAM_CALLBACK() macro. If the token - * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled - * and this function has the Callback parameter omitted. + * The callback routine should be created according to the information in \ref Group_StreamCallbacks. + * If the token NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are + * disabled and this function has the Callback parameter omitted. * * \ingroup Group_PipeRW * diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt index bd7374983c..7b21b8cc26 100644 --- a/LUFA/MigrationInformation.txt +++ b/LUFA/MigrationInformation.txt @@ -19,11 +19,21 @@ * - The Endpoint_ClearEndpointInterrupt() macro has been deleted and references to it should be removed. * - The DESCRIPTOR_ADDRESS() macro has been removed. User applications should use normal casts to obtain a descriptor's memory * address. + * - The library events system has been rewritten, so that all macros have been removed to allow for clearer user code. See + * \ref Group_Events for new API details. + * - The STREAM_CALLBACK() macro has been removed. User applications should replace all instances of the macro with regular + * function signatures of a function accepting no arguments and returning a uint8_t value. * - * Device Mode + * Host Mode * - Support for non-control data pipe interrupts has been dropped due to many issues in the implementation. All existing * projects using interrupts on non-control pipes should switch to polling. * - The Pipe_ClearPipeInterrupt() macro has been deleted and references to it should be removed. + * - The library events system has been rewritten, so that all macros have been removed to allow for clearer user code. See + * \ref Group_Events for new API details. + * - The STREAM_CALLBACK() macro has been removed. User applications should replace all instances of the macro with regular + * function signatures of a function accepting no arguments and returning a uint8_t value. + * - The DESCRIPTOR_COMPARATOR() macro has been removed. User applications should replace all instances of the macro with + * regular function signatures of a function accepting a pointer to the descriptor to test, and returning a uint8_t value. * * * \section Sec_Migration090510 Migrating from 090401 to 090510 diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 24172d82cf..e860d5aca6 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -115,14 +115,14 @@ int main(void) } /** Event handler for the USB_Connect event. This starts the USB task. */ -EVENT_HANDLER(USB_Connect) +void EVENT_USB_Connect(void) { /* Start USB management task */ Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); } /** Event handler for the USB_Disconnect event. This stops the USB and keyboard report tasks. */ -EVENT_HANDLER(USB_Disconnect) +void EVENT_USB_Disconnect(void) { /* Stop running keyboard reporting, card reading and USB management tasks */ Scheduler_SetTaskMode(USB_Keyboard_Report, TASK_STOP); @@ -133,7 +133,7 @@ EVENT_HANDLER(USB_Disconnect) /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready * to relay reports to the host, and starts the keyboard report task. */ -EVENT_HANDLER(USB_ConfigurationChanged) +void EVENT_USB_ConfigurationChanged(void) { /* Setup Keyboard Keycode Report Endpoint */ Endpoint_ConfigureEndpoint(KEYBOARD_EPNUM, EP_TYPE_INTERRUPT, @@ -152,7 +152,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library, 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) diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index 0393c36032..597bafd8eb 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -99,21 +99,13 @@ uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */ uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */ } USB_KeyboardReport_Data_t; - - /* 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); - + /* Function Prototypes: */ + void EVENT_USB_Connect(void); + void EVENT_USB_Disconnect(void); + void EVENT_USB_ConfigurationChanged(void); + void EVENT_USB_UnhandledControlPacket(void); + bool GetNextReport(USB_KeyboardReport_Data_t* ReportData); void SendKey(USB_KeyboardReport_Data_t* KeyboardReportData, uint8_t Key); void Send(USB_KeyboardReport_Data_t* KeyboardReportData, bool SendReport); diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile index 1e314ec2de..931c6737af 100644 --- a/Projects/Magstripe/makefile +++ b/Projects/Magstripe/makefile @@ -514,7 +514,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 ------------------------------------