summaryrefslogtreecommitdiffstats
path: root/firmware/target/coldfire
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2012-01-08 00:07:19 +0000
committerRafaël Carré <rafael.carre@gmail.com>2012-01-08 00:07:19 +0000
commit95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3 (patch)
tree26527cbd96f62ff5a26d46e8b63be40e0a306084 /firmware/target/coldfire
parent63ead774d534db1e07cdae3edb56655d43b19902 (diff)
downloadrockbox-95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3.tar.gz
rockbox-95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3.zip
button-target.h : move prototypes to button.h
no need to define BUTTON_REMOTE anymore git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31620 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r--firmware/target/coldfire/iaudio/button-target.h7
-rw-r--r--firmware/target/coldfire/iaudio/m3/button-target.h8
-rw-r--r--firmware/target/coldfire/iriver/button-target.h7
-rw-r--r--firmware/target/coldfire/iriver/h100/button-h100.c2
-rw-r--r--firmware/target/coldfire/iriver/h300/button-h300.c2
-rw-r--r--firmware/target/coldfire/mpio/hd200/button-target.h8
-rw-r--r--firmware/target/coldfire/mpio/hd300/button-target.h8
7 files changed, 3 insertions, 39 deletions
diff --git a/firmware/target/coldfire/iaudio/button-target.h b/firmware/target/coldfire/iaudio/button-target.h
index 0259ea2134..655a172404 100644
--- a/firmware/target/coldfire/iaudio/button-target.h
+++ b/firmware/target/coldfire/iaudio/button-target.h
@@ -21,16 +21,9 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#include <stdbool.h>
-#include "config.h"
-
#define HAS_BUTTON_HOLD
#define HAS_REMOTE_BUTTON_HOLD
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
void button_enable_scan(bool enable);
bool button_scan_enabled(void);
diff --git a/firmware/target/coldfire/iaudio/m3/button-target.h b/firmware/target/coldfire/iaudio/m3/button-target.h
index 66457fe07c..8409cf6075 100644
--- a/firmware/target/coldfire/iaudio/m3/button-target.h
+++ b/firmware/target/coldfire/iaudio/m3/button-target.h
@@ -22,17 +22,9 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#include <stdbool.h>
-#include "config.h"
-
#define HAS_BUTTON_HOLD
#define HAS_REMOTE_BUTTON_HOLD
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
-
/* iaudio M3 specific button codes */
/* Main unit's buttons */
diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h
index 4c15630e34..a677d042b3 100644
--- a/firmware/target/coldfire/iriver/button-target.h
+++ b/firmware/target/coldfire/iriver/button-target.h
@@ -24,17 +24,12 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#include <stdbool.h>
#include "config.h"
+#include <stdbool.h>
#define HAS_BUTTON_HOLD
#define HAS_REMOTE_BUTTON_HOLD
-bool button_hold(void);
-bool remote_button_hold(void);
-bool remote_button_hold_only(void);
-void button_init_device(void);
-int button_read_device(void);
#ifdef IRIVER_H300_SERIES
void button_enable_scan(bool enable);
bool button_scan_enabled(void);
diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c
index c32b979a00..dbaefdcf2a 100644
--- a/firmware/target/coldfire/iriver/h100/button-h100.c
+++ b/firmware/target/coldfire/iriver/h100/button-h100.c
@@ -39,7 +39,7 @@ bool button_hold(void)
return (GPIO1_READ & 0x00000002)?true:false;
}
-bool remote_button_hold_only(void)
+static bool remote_button_hold_only(void)
{
if(remote_type() == REMOTETYPE_H300_NONLCD)
return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */
diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c
index 43f5250191..74c14fb144 100644
--- a/firmware/target/coldfire/iriver/h300/button-h300.c
+++ b/firmware/target/coldfire/iriver/h300/button-h300.c
@@ -55,7 +55,7 @@ bool button_hold(void)
return (GPIO1_READ & 0x00000002)?true:false;
}
-bool remote_button_hold_only(void)
+static bool remote_button_hold_only(void)
{
if(remote_type() == REMOTETYPE_H300_NONLCD)
return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */
diff --git a/firmware/target/coldfire/mpio/hd200/button-target.h b/firmware/target/coldfire/mpio/hd200/button-target.h
index b7c31f8c59..3370935a45 100644
--- a/firmware/target/coldfire/mpio/hd200/button-target.h
+++ b/firmware/target/coldfire/mpio/hd200/button-target.h
@@ -21,17 +21,9 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#include <stdbool.h>
-#include "config.h"
-
#define HAS_BUTTON_HOLD
#define HAS_REMOTE_BUTTON_HOLD
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
-
/* HD200 specific button codes */
/* Main unit's buttons - flags as in original firmware*/
#define BUTTON_PLAY 0x00000001
diff --git a/firmware/target/coldfire/mpio/hd300/button-target.h b/firmware/target/coldfire/mpio/hd300/button-target.h
index 5cb2ae8bf2..7f902b0ecf 100644
--- a/firmware/target/coldfire/mpio/hd300/button-target.h
+++ b/firmware/target/coldfire/mpio/hd300/button-target.h
@@ -21,15 +21,7 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#include <stdbool.h>
-#include "config.h"
-
#define HAS_BUTTON_HOLD
-#define BUTTON_REMOTE 0
-
-bool button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
/* HD300 specific button codes */
#define BUTTON_PLAY 0x00000001