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 /apps/plugins/battery_bench.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 'apps/plugins/battery_bench.c')
-rw-r--r-- | apps/plugins/battery_bench.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 93876d0807..174a589d8f 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -359,9 +359,8 @@ static unsigned int charge_state(void) | |||
359 | #endif | 359 | #endif |
360 | 360 | ||
361 | 361 | ||
362 | static void flush_buffer(void* data) | 362 | static void flush_buffer(void) |
363 | { | 363 | { |
364 | (void)data; | ||
365 | int fd; | 364 | int fd; |
366 | unsigned int i; | 365 | unsigned int i; |
367 | 366 | ||
@@ -445,7 +444,7 @@ static void thread(void) | |||
445 | for this to occur because it requires > 16 hours of no disk activity. | 444 | for this to occur because it requires > 16 hours of no disk activity. |
446 | */ | 445 | */ |
447 | if (buf_idx == BUF_ELEMENTS) { | 446 | if (buf_idx == BUF_ELEMENTS) { |
448 | flush_buffer(NULL); | 447 | flush_buffer(); |
449 | } | 448 | } |
450 | 449 | ||
451 | /* sleep some time until next measurement */ | 450 | /* sleep some time until next measurement */ |
@@ -479,7 +478,7 @@ static void thread(void) | |||
479 | /* unregister flush callback and flush to disk */ | 478 | /* unregister flush callback and flush to disk */ |
480 | rb->unregister_storage_idle_func(flush_buffer, true); | 479 | rb->unregister_storage_idle_func(flush_buffer, true); |
481 | #else | 480 | #else |
482 | flush_buffer(NULL); | 481 | flush_buffer(); |
483 | #endif | 482 | #endif |
484 | 483 | ||
485 | /* log end of bench and exit reason */ | 484 | /* log end of bench and exit reason */ |