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/s5l8700/ipodnano2g/button-target.h | 7 ------- firmware/target/arm/s5l8700/meizu-m3/button-target.h | 8 -------- firmware/target/arm/s5l8700/meizu-m6sl/button-target.h | 9 --------- firmware/target/arm/s5l8700/meizu-m6sp/button-target.h | 9 --------- firmware/target/arm/s5l8700/yps3/button-target.h | 9 --------- 5 files changed, 42 deletions(-) (limited to 'firmware/target/arm/s5l8700') diff --git a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h index 67bdc72955..82f600d302 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h +++ b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h @@ -21,15 +21,10 @@ #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); - void ipod_mini_button_int(void); void ipod_3g_button_int(void); void ipod_4g_button_int(void); @@ -63,8 +58,6 @@ void ipod_4g_button_int(void); #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) -#else -#define BUTTON_REMOTE 0 #endif /* This is for later diff --git a/firmware/target/arm/s5l8700/meizu-m3/button-target.h b/firmware/target/arm/s5l8700/meizu-m3/button-target.h index 8aaca17a54..93f102c410 100644 --- a/firmware/target/arm/s5l8700/meizu-m3/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m3/button-target.h @@ -21,14 +21,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include - #define HAS_BUTTON_HOLD -bool button_hold(void); -void button_init_device(void); -int button_read_device(void); - /* Meizu M3 specific button codes */ #define BUTTON_PREVNEXT 0x00000001 #define BUTTON_MENU 0x00000002 @@ -40,8 +34,6 @@ int button_read_device(void); #define BUTTON_MAIN (BUTTON_PREVNEXT|BUTTON_MENU|BUTTON_PLAY) -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_PLAY #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h b/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h index 7fab9c4d64..022a0b61f1 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h @@ -21,15 +21,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); - /* Toshiba Gigabeat specific button codes */ #define BUTTON_LEFT 0x00000001 @@ -46,8 +39,6 @@ int button_read_device(void); #define BUTTON_MAIN (BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT|BUTTON_PLAY) -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_PLAY #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h b/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h index db6445fe30..58d19d177c 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h @@ -21,15 +21,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); - /* Meizu M6 specific button codes */ #define BUTTON_LEFT 0x00000001 @@ -43,8 +36,6 @@ int button_read_device(void); #define BUTTON_MAIN (BUTTON_LEFT|BUTTON_RIGHT|BUTTON_PLAY|BUTTON_MENU\ |BUTTON_SELECT|BUTTON_ENTER) -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_PLAY #define POWEROFF_COUNT 10 diff --git a/firmware/target/arm/s5l8700/yps3/button-target.h b/firmware/target/arm/s5l8700/yps3/button-target.h index 86e8488857..4b3ffa4a76 100644 --- a/firmware/target/arm/s5l8700/yps3/button-target.h +++ b/firmware/target/arm/s5l8700/yps3/button-target.h @@ -21,14 +21,8 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include - #define HAS_BUTTON_HOLD -bool button_hold(void); -void button_init_device(void); -int button_read_device(void); - #define BUTTON_BACK 0x00000001 #define BUTTON_MENU 0x00000002 #define BUTTON_UP 0x00000004 @@ -41,10 +35,7 @@ int button_read_device(void); #define BUTTON_MAIN (BUTTON_BACK|BUTTON_MENU|BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|\ BUTTON_RIGHT|BUTTON_SELECT) -#define BUTTON_REMOTE 0 - #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 #endif /* _BUTTON_TARGET_H_ */ - -- cgit v1.2.3