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/settings.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/settings.c')
-rw-r--r-- | apps/settings.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 58d58788be..f2a923e24d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -591,15 +591,13 @@ static bool settings_write_config(const char* filename, int options) | |||
591 | return true; | 591 | return true; |
592 | } | 592 | } |
593 | #ifndef HAVE_RTC_RAM | 593 | #ifndef HAVE_RTC_RAM |
594 | static void flush_global_status_callback(void *data) | 594 | static void flush_global_status_callback(void) |
595 | { | 595 | { |
596 | (void)data; | ||
597 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | 596 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); |
598 | } | 597 | } |
599 | #endif | 598 | #endif |
600 | static void flush_config_block_callback(void *data) | 599 | static void flush_config_block_callback(void) |
601 | { | 600 | { |
602 | (void)data; | ||
603 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | 601 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); |
604 | settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); | 602 | settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); |
605 | } | 603 | } |
@@ -1307,4 +1305,3 @@ void set_file(const char* filename, char* setting, const int maxlen) | |||
1307 | strlcpy(setting, fptr, len); | 1305 | strlcpy(setting, fptr, len); |
1308 | settings_save(); | 1306 | settings_save(); |
1309 | } | 1307 | } |
1310 | |||