diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-18 10:05:21 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-18 10:05:21 +0000 |
| commit | bdb6e45008319647b72d9adc8fb4ec06a0f1ea9b (patch) | |
| tree | 1f4de5f6d8e2a9bfe89d3263f19f9b9ebf855812 /Projects/Magstripe/Magstripe.c | |
| parent | a74816480d92f683b2d11682d516f347a1a69301 (diff) | |
Rewritten event system to remove all macros, to make user code clearer.
Fixed incorrect ENDPOINT_EPNUM_MASK mask preventing endpoints above EP3 from being selected (thanks to Jonathan Oakley).
Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code.
Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@554 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/Magstripe/Magstripe.c')
| -rw-r--r-- | Projects/Magstripe/Magstripe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 24172d82..e860d5ac 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)
|