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/hosted/android/app/button-target.h | 7 ------- firmware/target/hosted/sdl/app/button-target.h | 18 ------------------ firmware/target/hosted/ypr0/button-target.h | 10 ---------- 3 files changed, 35 deletions(-) (limited to 'firmware/target/hosted') diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h index b532c94f47..326d65872d 100644 --- a/firmware/target/hosted/android/app/button-target.h +++ b/firmware/target/hosted/android/app/button-target.h @@ -23,11 +23,7 @@ #define _BUTTON_TARGET_H_ #include -#include "config.h" -#undef button_init_device -void button_init_device(void); -int button_read_device(int *data); unsigned multimedia_to_button(int keyboard_key); unsigned dpad_to_button(int keyboard_key); void android_ignore_back_button(bool yes); @@ -61,8 +57,5 @@ void android_ignore_back_button(bool yes); #define BUTTON_BOTTOMRIGHT 0x00100000 #define BUTTON_FORCE_REDRAW 0x00200000 - -/* No remote */ -#define BUTTON_REMOTE 0 #endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/hosted/sdl/app/button-target.h b/firmware/target/hosted/sdl/app/button-target.h index d4396fd0d5..26d0fedcc5 100644 --- a/firmware/target/hosted/sdl/app/button-target.h +++ b/firmware/target/hosted/sdl/app/button-target.h @@ -22,21 +22,6 @@ #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); -#ifdef HAVE_BUTTON_DATA -int button_read_device(int *data); -#else -int button_read_device(void); -#endif - /* Main unit's buttons */ #define BUTTON_UP 0x00000001 #define BUTTON_DOWN 0x00000002 @@ -61,9 +46,6 @@ int button_read_device(void); #define BUTTON_MAIN 0x1FFF -/* No remote */ -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 diff --git a/firmware/target/hosted/ypr0/button-target.h b/firmware/target/hosted/ypr0/button-target.h index beddc66c67..d7b95de785 100644 --- a/firmware/target/hosted/ypr0/button-target.h +++ b/firmware/target/hosted/ypr0/button-target.h @@ -22,14 +22,7 @@ #ifndef _BUTTON_TARGET_H_ #define _BUTTON_TARGET_H_ -#include -#include "config.h" - -bool headphones_inserted(void); - -void button_init_device(void); void button_close_device(void); -int button_read_device(void); /* Logical buttons key codes */ #define BUTTON_UP 0x00000001 @@ -44,9 +37,6 @@ int button_read_device(void); #define BUTTON_MAIN 0x1FF /* all buttons */ -/* No remote */ -#define BUTTON_REMOTE 0 - /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER /* About 3 seconds */ -- cgit v1.2.3