From 470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 14 Mar 2014 23:15:16 +0100 Subject: 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 --- apps/plugins/battery_bench.c | 7 +++---- apps/plugins/mpegplayer/mpeg_settings.c | 5 +++-- apps/plugins/mpegplayer/mpegplayer.c | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'apps/plugins') 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) #endif -static void flush_buffer(void* data) +static void flush_buffer(void) { - (void)data; int fd; unsigned int i; @@ -445,7 +444,7 @@ static void thread(void) for this to occur because it requires > 16 hours of no disk activity. */ if (buf_idx == BUF_ELEMENTS) { - flush_buffer(NULL); + flush_buffer(); } /* sleep some time until next measurement */ @@ -479,7 +478,7 @@ static void thread(void) /* unregister flush callback and flush to disk */ rb->unregister_storage_idle_func(flush_buffer, true); #else - flush_buffer(NULL); + flush_buffer(); #endif /* log end of bench and exit reason */ diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index bcef4c66bf..b5c9c6bbc8 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -677,8 +677,9 @@ static uint32_t increment_time(uint32_t val, int32_t amount, uint32_t range) } #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) -static void get_start_time_lcd_enable_hook(void *param) +static void get_start_time_lcd_enable_hook(unsigned short id, void *param) { + (void)id; (void)param; rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_0, 0); } @@ -698,7 +699,7 @@ static int get_start_time(uint32_t duration) mylcd_update(); #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) - rb->add_event(LCD_EVENT_ACTIVATION, false, get_start_time_lcd_enable_hook); + rb->add_event(LCD_EVENT_ACTIVATION, get_start_time_lcd_enable_hook); #endif draw_slider(0, 100, &rc_bound); diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 928c48ab11..467c961912 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -1026,8 +1026,9 @@ static void fps_init(void) #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) /* So we can refresh the overlay */ -static void osd_lcd_enable_hook(void* param) +static void osd_lcd_enable_hook(unsigned short id, void* param) { + (void)id; (void)param; rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_1, 0); } @@ -1043,7 +1044,7 @@ static void osd_backlight_on_video_mode(bool video_on) #endif } else { #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) - rb->add_event(LCD_EVENT_ACTIVATION, false, osd_lcd_enable_hook); + rb->add_event(LCD_EVENT_ACTIVATION, osd_lcd_enable_hook); #endif /* Revert to user's backlight settings */ backlight_use_settings(); -- cgit v1.2.3