From 767c0ec5894f1acaad5e0def12d628c6f21bcf87 Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Thu, 16 Aug 2007 23:01:18 +0000 Subject: Pass plugin api pointer to funtion directly, fixes crashes when doing incremental builds. Fix incorrect backlight changes in rockblox introduced recently. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14373 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/lib/helper.c | 9 ++++----- apps/plugins/lib/helper.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'apps/plugins/lib') diff --git a/apps/plugins/lib/helper.c b/apps/plugins/lib/helper.c index 42c9dec..65108ce 100644 --- a/apps/plugins/lib/helper.c +++ b/apps/plugins/lib/helper.c @@ -19,16 +19,14 @@ #include "plugin.h" -/* the plugin must declare the plugin_api struct pointer itself */ -extern struct plugin_api* rb; - /* * force the backlight on * now enabled regardless of HAVE_BACKLIGHT because it is not needed to * build and makes modded targets easier to update */ -void backlight_force_on(void) +void backlight_force_on(struct plugin_api* rb) { + if(!rb) return; /* #ifdef HAVE_BACKLIGHT */ if (rb->global_settings->backlight_timeout > 1) rb->backlight_set_timeout(1); @@ -44,8 +42,9 @@ void backlight_force_on(void) * now enabled regardless of HAVE_BACKLIGHT because it is not needed to * build and makes modded targets easier to update */ -void backlight_use_settings(void) +void backlight_use_settings(struct plugin_api* rb) { + if(!rb) return; /* #ifdef HAVE_BACKLIGHT */ rb->backlight_set_timeout(rb->global_settings->backlight_timeout); #if CONFIG_CHARGING diff --git a/apps/plugins/lib/helper.h b/apps/plugins/lib/helper.h index 71a6708..f2f5f87 100644 --- a/apps/plugins/lib/helper.h +++ b/apps/plugins/lib/helper.h @@ -24,7 +24,7 @@ /** * Backlight on/off operations */ -void backlight_force_on(void); -void backlight_use_settings(void); +void backlight_force_on(struct plugin_api* rb); +void backlight_use_settings(struct plugin_api* rb); #endif -- cgit v1.1