summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2009-10-05 02:17:27 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2009-10-05 02:17:27 +0000
commitfac05ab2f755318bb42ce0eca55eb4061358bad1 (patch)
treeab72ba8a48a5b481b13c95f654f9f4e22caf8b6a
parent5949250ce11c83c36cdbd4bc39509aefba0cc26c (diff)
downloadrockbox-fac05ab2f755318bb42ce0eca55eb4061358bad1.tar.gz
rockbox-fac05ab2f755318bb42ce0eca55eb4061358bad1.zip
Fix Red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22935 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugin.c3
-rw-r--r--apps/plugin.h2
-rw-r--r--firmware/drivers/button.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index c37b2fb29b..a2059266b2 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -668,8 +668,9 @@ static const struct plugin_api rockbox_api = {
668 appsversion, 668 appsversion,
669 /* new stuff at the end, sort into place next time 669 /* new stuff at the end, sort into place next time
670 the API gets incompatible */ 670 the API gets incompatible */
671 671#ifdef HAVE_BUTTON_DATA
672 button_status_wdata, 672 button_status_wdata,
673#endif
673}; 674};
674 675
675int plugin_load(const char* plugin, const void* parameter) 676int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 344026f986..b060104373 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -837,7 +837,9 @@ struct plugin_api {
837 /* new stuff at the end, sort into place next time 837 /* new stuff at the end, sort into place next time
838 the API gets incompatible */ 838 the API gets incompatible */
839 839
840#ifdef HAVE_BUTTON_DATA
840 int (*button_status_wdata)(int *pdata); 841 int (*button_status_wdata)(int *pdata);
842#endif
841}; 843};
842 844
843/* plugin header */ 845/* plugin header */
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 6e30cb116d..088ba0a4c5 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -305,7 +305,9 @@ static void button_tick(void)
305 } 305 }
306 } 306 }
307 lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); 307 lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT);
308#ifdef HAVE_BUTTON_DATA
308 lastdata = data; 309 lastdata = data;
310#endif
309} 311}
310 312
311#ifdef HAVE_ADJUSTABLE_CPU_FREQ 313#ifdef HAVE_ADJUSTABLE_CPU_FREQ