diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-18 10:05:21 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-18 10:05:21 +0000 |
| commit | 2ee9fc707784e115d744dbc229bdc893f4bb6bc1 (patch) | |
| tree | 1f4de5f6d8e2a9bfe89d3263f19f9b9ebf855812 /Bootloaders/TeensyHID | |
| parent | 72c2922e38a2dfd14eb2d8e3692171704b5508f4 (diff) | |
| download | lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.tar.gz lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.tar.bz2 lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.zip | |
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.
Diffstat (limited to 'Bootloaders/TeensyHID')
| -rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.c | 4 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.h | 14 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/makefile | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c index cb1407ad4..ee6c91a62 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 ae180f778..0dd58524b 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 bff9e11da..d022c9315 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 ------------------------------------
|