summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-06-29 11:03:12 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-06-29 11:03:12 +0000
commit4e15aead43c9bbecf8a13c146ac38685afa0d200 (patch)
tree5e17ec724e79395538e9d0b6bcb1bae5ee530319
parent788d01ef7f35a44a38d34278e91f77e132f89860 (diff)
downloadrockbox-4e15aead43c9bbecf8a13c146ac38685afa0d200.tar.gz
rockbox-4e15aead43c9bbecf8a13c146ac38685afa0d200.zip
Move declaration of button_int and clickwheel_int to the proper header file instead of declaring it locally in the .c file
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17874 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/button-e200.c2
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/button-target.h4
-rw-r--r--firmware/target/arm/system-pp502x.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index d5ff84a75e..21c0c376e1 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -51,8 +51,6 @@ static bool hold_button_old = false;
51#endif /* BOOTLOADER */ 51#endif /* BOOTLOADER */
52static int int_btn = BUTTON_NONE; 52static int int_btn = BUTTON_NONE;
53 53
54void button_int(void);
55
56void button_init_device(void) 54void button_init_device(void)
57{ 55{
58 /* Enable all buttons */ 56 /* Enable all buttons */
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-target.h b/firmware/target/arm/sandisk/sansa-e200/button-target.h
index a9aa663202..969f91b143 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-target.h
+++ b/firmware/target/arm/sandisk/sansa-e200/button-target.h
@@ -30,6 +30,10 @@
30bool button_hold(void); 30bool button_hold(void);
31void button_init_device(void); 31void button_init_device(void);
32int button_read_device(void); 32int button_read_device(void);
33#ifndef BOOTLOADER
34void clickwheel_int(void);
35#endif
36void button_int(void);
33 37
34/* Sandisk Sansa E200 button codes */ 38/* Sandisk Sansa E200 button codes */
35 39
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 44a90637d4..0f336576d8 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -24,6 +24,7 @@
24#include "i2c-pp.h" 24#include "i2c-pp.h"
25#include "as3514.h" 25#include "as3514.h"
26#include "ata-sd-target.h" 26#include "ata-sd-target.h"
27#include "button-target.h"
27#ifdef HAVE_USBSTACK 28#ifdef HAVE_USBSTACK
28#include "usb_drv.h" 29#include "usb_drv.h"
29#endif 30#endif
@@ -33,10 +34,6 @@ extern void TIMER1(void);
33extern void TIMER2(void); 34extern void TIMER2(void);
34extern void ipod_mini_button_int(void); /* iPod Mini 1st gen only */ 35extern void ipod_mini_button_int(void); /* iPod Mini 1st gen only */
35extern void ipod_4g_button_int(void); /* iPod 4th gen and higher only */ 36extern void ipod_4g_button_int(void); /* iPod 4th gen and higher only */
36#ifdef SANSA_E200
37extern void button_int(void);
38extern void clickwheel_int(void);
39#endif
40#ifdef MROBE_100 37#ifdef MROBE_100
41extern void button_int(void); 38extern void button_int(void);
42#endif 39#endif