From cbc244845f97b5561f297b8e7a66d3284e4f700a Mon Sep 17 00:00:00 2001
From: bertrik <bertrik@a1c6a512-1295-4272-9138-f99709370657>
Date: Sun, 29 Jun 2008 11:03:12 +0000
Subject: [PATCH] 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
---
 firmware/target/arm/sandisk/sansa-e200/button-e200.c   | 2 --
 firmware/target/arm/sandisk/sansa-e200/button-target.h | 4 ++++
 firmware/target/arm/system-pp502x.c                    | 5 +----
 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 d5ff84a75..21c0c376e 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;
 #endif /* BOOTLOADER */
 static int  int_btn         = BUTTON_NONE;
 
-void button_int(void);
-
 void button_init_device(void)
 {
     /* 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 a9aa66320..969f91b14 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 @@
 bool button_hold(void);
 void button_init_device(void);
 int button_read_device(void);
+#ifndef BOOTLOADER
+void clickwheel_int(void);
+#endif
+void button_int(void);
 
 /* Sandisk Sansa E200 button codes */
 
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 44a90637d..0f336576d 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -24,6 +24,7 @@
 #include "i2c-pp.h"
 #include "as3514.h"
 #include "ata-sd-target.h"
+#include "button-target.h"
 #ifdef HAVE_USBSTACK
 #include "usb_drv.h"
 #endif
@@ -33,10 +34,6 @@ extern void TIMER1(void);
 extern void TIMER2(void);
 extern void ipod_mini_button_int(void); /* iPod Mini 1st gen only */
 extern void ipod_4g_button_int(void);   /* iPod 4th gen and higher only */
-#ifdef SANSA_E200
-extern void button_int(void);
-extern void clickwheel_int(void);
-#endif
 #ifdef MROBE_100
 extern void button_int(void);
 #endif
-- 
2.11.4.GIT