diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-03-14 23:15:16 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-03-14 23:36:30 +0100 |
commit | 470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 (patch) | |
tree | f3bef37bc0f8ff7da4beddad9903209ced1bc25a /firmware/ata_idle_notify.c | |
parent | 50f0dd80d660b332a1739e07a630c2cef1b678c6 (diff) | |
download | rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.tar.gz rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.zip |
events: Rework event subsystem (add_event, send_event) to be more versatile.
add_event_ex is added that takes an extra user_data pointer. This pointer is
passed to the callback (add_event and add_event_ex have slightly different
callbacks types). All callbacks also get the event id passed. Events added
with add_event_ex must be removed with remove_event_ex because the user_data
pointer must match in addition to the callback pointer.
On the other add_event is simplified to omit the oneshort parameter which
was almost always false (still there with add_event_ex).
As a side effect the ata_idle_notify callbacks are changed as well, they
do not take a data parameter anymore which was always NULL anyway.
This commit also adds some documentation to events.h
Change-Id: I13e29a0f88ef908f175b376d83550f9e0231f772
Diffstat (limited to 'firmware/ata_idle_notify.c')
-rw-r--r-- | firmware/ata_idle_notify.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/firmware/ata_idle_notify.c b/firmware/ata_idle_notify.c index 35d192bee0..ee9f3c035f 100644 --- a/firmware/ata_idle_notify.c +++ b/firmware/ata_idle_notify.c | |||
@@ -25,12 +25,20 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "string.h" | 26 | #include "string.h" |
27 | 27 | ||
28 | void register_storage_idle_func(void (*function)(void *data)) | 28 | static void wrapper(unsigned short id, void *ev_data, void *user_data) |
29 | { | ||
30 | (void)id; | ||
31 | (void)ev_data; | ||
32 | void (*func)(void) = user_data; | ||
33 | func(); | ||
34 | } | ||
35 | |||
36 | void register_storage_idle_func(void (*function)(void)) | ||
29 | { | 37 | { |
30 | #if USING_STORAGE_CALLBACK | 38 | #if USING_STORAGE_CALLBACK |
31 | add_event(DISK_EVENT_SPINUP, true, function); | 39 | add_event_ex(DISK_EVENT_SPINUP, true, wrapper, function); |
32 | #else | 40 | #else |
33 | function(NULL); /* just call the function now */ | 41 | function(); /* just call the function now */ |
34 | /* this _may_ cause problems later if the calling function | 42 | /* this _may_ cause problems later if the calling function |
35 | sets a variable expecting the callback to unset it, because | 43 | sets a variable expecting the callback to unset it, because |
36 | the callback will be run before this function exits, so before the var is set */ | 44 | the callback will be run before this function exits, so before the var is set */ |
@@ -38,12 +46,12 @@ void register_storage_idle_func(void (*function)(void *data)) | |||
38 | } | 46 | } |
39 | 47 | ||
40 | #if USING_STORAGE_CALLBACK | 48 | #if USING_STORAGE_CALLBACK |
41 | void unregister_storage_idle_func(void (*func)(void *data), bool run) | 49 | void unregister_storage_idle_func(void (*func)(void), bool run) |
42 | { | 50 | { |
43 | remove_event(DISK_EVENT_SPINUP, func); | 51 | remove_event_ex(DISK_EVENT_SPINUP, wrapper, func); |
44 | 52 | ||
45 | if (run) | 53 | if (run) |
46 | func(NULL); | 54 | func(); |
47 | } | 55 | } |
48 | 56 | ||
49 | bool call_storage_idle_notifys(bool force) | 57 | bool call_storage_idle_notifys(bool force) |