From 95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 8 Jan 2012 00:07:19 +0000 Subject: 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 --- firmware/target/arm/as3525/button-clip.c | 2 +- firmware/target/arm/as3525/button-e200v2-fuze.c | 2 +- firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c | 1 - firmware/target/arm/as3525/sansa-c200v2/button-target.h | 10 ---------- firmware/target/arm/as3525/sansa-clip/button-target.h | 9 --------- firmware/target/arm/as3525/sansa-clipplus/button-clip.c | 2 +- firmware/target/arm/as3525/sansa-clipplus/button-target.h | 8 -------- firmware/target/arm/as3525/sansa-clipv2/button-target.h | 9 --------- firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c | 2 +- firmware/target/arm/as3525/sansa-clipzip/button-target.h | 7 ------- firmware/target/arm/as3525/sansa-e200v2/button-target.h | 9 --------- firmware/target/arm/as3525/sansa-fuze/button-target.h | 9 --------- firmware/target/arm/as3525/sansa-fuzev2/button-target.h | 9 --------- firmware/target/arm/as3525/sansa-m200v4/button-target.h | 9 --------- firmware/target/arm/as3525/system-as3525.c | 2 +- 15 files changed, 5 insertions(+), 85 deletions(-) (limited to 'firmware/target/arm/as3525') diff --git a/firmware/target/arm/as3525/button-clip.c b/firmware/target/arm/as3525/button-clip.c index 04be8450fd..18bac8aa01 100644 --- a/firmware/target/arm/as3525/button-clip.c +++ b/firmware/target/arm/as3525/button-clip.c @@ -21,7 +21,7 @@ * ****************************************************************************/ #include "system.h" -#include "button-target.h" +#include "button.h" #include "as3525v2.h" #ifndef BOOTLOADER #include "backlight.h" diff --git a/firmware/target/arm/as3525/button-e200v2-fuze.c b/firmware/target/arm/as3525/button-e200v2-fuze.c index 2cbdcf5130..13bd461bb6 100644 --- a/firmware/target/arm/as3525/button-e200v2-fuze.c +++ b/firmware/target/arm/as3525/button-e200v2-fuze.c @@ -23,7 +23,7 @@ #include "config.h" #include "system.h" #include "button.h" -#include "button-target.h" +#include "button.h" #include "backlight.h" #include "dbop-as3525.h" diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c index 378b3131f2..36ef43d32b 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c @@ -21,7 +21,6 @@ #include "config.h" #include "system.h" -#include "button-target.h" #include "button.h" #include "backlight.h" #include "dbop-as3525.h" diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-target.h b/firmware/target/arm/as3525/sansa-c200v2/button-target.h index 5f3c72521e..d5b22583c4 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/button-target.h +++ b/firmware/target/arm/as3525/sansa-c200v2/button-target.h @@ -22,15 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -bool button_hold(void); -void button_init_device(void); -int button_read_device(void); - /* Sandisk Sansa c200 button codes */ /* Main unit's buttons */ @@ -46,9 +39,6 @@ int button_read_device(void); #define BUTTON_MAIN 0x00000fff -/* No Remote control */ -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h index 238fd1dee5..85d5a477e1 100644 --- a/firmware/target/arm/as3525/sansa-clip/button-target.h +++ b/firmware/target/arm/as3525/sansa-clip/button-target.h @@ -22,15 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -void button_init_device(void); -int button_read_device(void); -bool button_hold(void); - /* Main unit's buttons */ #define BUTTON_HOME 0x00000001 @@ -50,8 +43,6 @@ bool button_hold(void); |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |BUTTON_SELECT|BUTTON_POWER) -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c index 6514346654..60b8c8f7a3 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c +++ b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c @@ -19,7 +19,7 @@ * KIND, either express or implied. * ****************************************************************************/ -#include "button-target.h" +#include "button.h" #include "as3525v2.h" #include "kernel.h" diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-target.h b/firmware/target/arm/as3525/sansa-clipplus/button-target.h index c341a94220..8176382ba2 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipplus/button-target.h @@ -22,12 +22,6 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - -void button_init_device(void); -int button_read_device(void); - /* Main unit's buttons */ #define BUTTON_HOME 0x00000001 @@ -47,8 +41,6 @@ int button_read_device(void); |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |BUTTON_SELECT|BUTTON_POWER) -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-clipv2/button-target.h b/firmware/target/arm/as3525/sansa-clipv2/button-target.h index 238fd1dee5..85d5a477e1 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipv2/button-target.h @@ -22,15 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -void button_init_device(void); -int button_read_device(void); -bool button_hold(void); - /* Main unit's buttons */ #define BUTTON_HOME 0x00000001 @@ -50,8 +43,6 @@ bool button_hold(void); |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |BUTTON_SELECT|BUTTON_POWER) -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c index c22c5e24e9..4fdb87fc1d 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c @@ -21,7 +21,7 @@ ****************************************************************************/ #include "config.h" -#include "button-target.h" +#include "button.h" #include "as3525v2.h" #include "system.h" #include "kernel.h" diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-target.h b/firmware/target/arm/as3525/sansa-clipzip/button-target.h index 8a93d45daa..8176382ba2 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipzip/button-target.h @@ -22,11 +22,6 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include "config.h" - -void button_init_device(void); -int button_read_device(void); - /* Main unit's buttons */ #define BUTTON_HOME 0x00000001 @@ -46,8 +41,6 @@ int button_read_device(void); |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |BUTTON_SELECT|BUTTON_POWER) -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-target.h b/firmware/target/arm/as3525/sansa-e200v2/button-target.h index 7a0e9e50f1..4c41a4b6df 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/button-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/button-target.h @@ -22,14 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -bool button_hold(void); -void button_init_device(void); -int button_read_device(void); unsigned short button_read_dbop(void); #define get_scrollwheel button_read_dbop @@ -54,9 +48,6 @@ unsigned short button_read_dbop(void); #define BUTTON_MAIN 0x00000fff -/* No Remote control */ -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h index 2cee93723e..1bcc739413 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h @@ -22,14 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -void button_init_device(void); -bool button_hold(void); -int button_read_device(void); unsigned short button_read_dbop(void); #define get_scrollwheel button_read_dbop @@ -61,9 +55,6 @@ unsigned short button_read_dbop(void); |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |BUTTON_HOLD) -/* No Remote control */ -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h index 596ac01262..6ea1a9616e 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h @@ -22,14 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -void button_init_device(void); -bool button_hold(void); -int button_read_device(void); /* Sandisk Sansa Fuze button codes */ /* Main unit's buttons - mapped for optimal reading */ @@ -52,9 +46,6 @@ int button_read_device(void); |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |BUTTON_HOLD) -/* No Remote control */ -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-target.h b/firmware/target/arm/as3525/sansa-m200v4/button-target.h index 49a7409a6b..00876c4a3d 100644 --- a/firmware/target/arm/as3525/sansa-m200v4/button-target.h +++ b/firmware/target/arm/as3525/sansa-m200v4/button-target.h @@ -22,15 +22,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - #define HAS_BUTTON_HOLD -void button_init_device(void); -int button_read_device(void); -bool button_hold(void); - /* Main unit's buttons */ #define BUTTON_POWER 0x00000001 #define BUTTON_VOL_UP 0x00000002 @@ -46,8 +39,6 @@ bool button_hold(void); |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\ |BUTTON_RIGHT|BUTTON_SELECT|BUTTON_HOLD) -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 40 diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 965030ecc3..89a07939b6 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c @@ -29,7 +29,7 @@ #include "dma-target.h" #include "clock-target.h" #include "fmradio_i2c.h" -#include "button-target.h" +#include "button.h" #include "backlight-target.h" #include "lcd.h" -- cgit v1.2.3