diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 11:31:58 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-26 07:42:58 -0400 |
commit | 7d0d32dbc65a8332a49aeed3a97e24cb109958b2 (patch) | |
tree | 36ce03b1b8564bedfd8e3df0ec088a0fc6bdc06f /apps | |
parent | 3ba2f6e5c7383c5d7a6f8a1c38b6b5403a8a5dcb (diff) | |
download | rockbox-7d0d32dbc65a8332a49aeed3a97e24cb109958b2.tar.gz rockbox-7d0d32dbc65a8332a49aeed3a97e24cb109958b2.zip |
Nuke the never-functional iriver ifp-7xx port
It never worked, and hasn't compiled in something like a decade, Given
the HW capabilities (limited onboard flash, no expandability) there's
really no point in trying to fix/complete it.
Change-Id: I7d175089840396f8891645bd10010d730dd5bfdc
Diffstat (limited to 'apps')
-rw-r--r-- | apps/SOURCES | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-ifp7xx.c | 185 | ||||
-rw-r--r-- | apps/lang/english.lang | 3 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 7 | ||||
-rw-r--r-- | apps/plugins/blackjack.c | 16 | ||||
-rw-r--r-- | apps/plugins/calendar.c | 10 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 14 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 10 | ||||
-rw-r--r-- | apps/plugins/cube.c | 10 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal.h | 14 | ||||
-rw-r--r-- | apps/plugins/greyscale.c | 8 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 10 | ||||
-rw-r--r-- | apps/plugins/lib/grey_core.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 7 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 17 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 11 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 10 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 8 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_button.h | 11 | ||||
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 8 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 11 |
22 files changed, 0 insertions, 375 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 6c13945904..5c49f0bbbc 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -197,8 +197,6 @@ keymaps/keymap-gigabeat.c | |||
197 | keymaps/keymap-gigabeat-s.c | 197 | keymaps/keymap-gigabeat-s.c |
198 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 198 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
199 | keymaps/keymap-h10.c | 199 | keymaps/keymap-h10.c |
200 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
201 | keymaps/keymap-ifp7xx.c | ||
202 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 200 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
203 | keymaps/keymap-e200.c | 201 | keymaps/keymap-e200.c |
204 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 202 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c deleted file mode 100644 index c89b60e747..0000000000 --- a/apps/keymaps/keymap-ifp7xx.c +++ /dev/null | |||
@@ -1,185 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 Tomasz Malesinski | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | /* Button Code Definitions for iriver iFP7xx target */ | ||
23 | |||
24 | #include "config.h" | ||
25 | #include "action.h" | ||
26 | #include "button.h" | ||
27 | |||
28 | /* | ||
29 | * The format of the list is as follows | ||
30 | * { Action Code, Button code, Prereq button code } | ||
31 | * if there's no need to check the previous button's value, use BUTTON_NONE | ||
32 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | ||
33 | */ | ||
34 | static const struct button_mapping button_context_standard[] = { | ||
35 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | ||
36 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
37 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | ||
38 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
39 | |||
40 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | ||
41 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | ||
42 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, | ||
43 | |||
44 | { ACTION_STD_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, | ||
45 | { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, | ||
46 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
47 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | ||
48 | |||
49 | LAST_ITEM_IN_LIST | ||
50 | }; /* button_context_standard */ | ||
51 | |||
52 | static const struct button_mapping button_context_wps[] = { | ||
53 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
54 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
55 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
56 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
57 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
58 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | ||
59 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | ||
60 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | ||
61 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | ||
62 | { ACTION_WPS_STOP, BUTTON_EQ, BUTTON_NONE }, | ||
63 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
64 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
65 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
66 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | ||
67 | { ACTION_WPS_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, | ||
68 | { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, | ||
69 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
70 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
71 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, | ||
72 | { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, | ||
73 | |||
74 | LAST_ITEM_IN_LIST | ||
75 | }; /* button_context_wps */ | ||
76 | |||
77 | static const struct button_mapping button_context_settings[] = { | ||
78 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | ||
79 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
80 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
81 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
82 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
83 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | ||
84 | |||
85 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
86 | }; /* button_context_settings */ | ||
87 | |||
88 | static const struct button_mapping button_context_settings_r_is_inc[] = { | ||
89 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
90 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
91 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
92 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
93 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | ||
94 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
95 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | ||
96 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
97 | |||
98 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
99 | }; /* button_context_settingsgraphical */ | ||
100 | |||
101 | static const struct button_mapping button_context_yesno[] = { | ||
102 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | ||
103 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
104 | }; /* button_context_settings_yesno */ | ||
105 | |||
106 | static const struct button_mapping button_context_bmark[] = { | ||
107 | { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE }, | ||
108 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | ||
109 | }; /* button_context_settings_bmark */ | ||
110 | |||
111 | static const struct button_mapping button_context_quickscreen[] = { | ||
112 | { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, | ||
113 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
114 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
115 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
116 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
117 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
118 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
119 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
120 | |||
121 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
122 | }; /* button_context_quickscreen */ | ||
123 | |||
124 | static const struct button_mapping button_context_pitchscreen[] = { | ||
125 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | ||
126 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
127 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | ||
128 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
129 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
130 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
131 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
132 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | ||
133 | { ACTION_PS_RESET, BUTTON_MODE, BUTTON_NONE }, | ||
134 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | ||
135 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
136 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
137 | |||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
139 | }; /* button_context_pitchcreen */ | ||
140 | |||
141 | static const struct button_mapping button_context_keyboard[] = { | ||
142 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
143 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
144 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
145 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
146 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
147 | { ACTION_KBD_DONE, BUTTON_MODE, BUTTON_NONE }, | ||
148 | { ACTION_KBD_ABORT, BUTTON_PLAY, BUTTON_NONE }, | ||
149 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | ||
150 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
151 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
152 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
153 | |||
154 | LAST_ITEM_IN_LIST | ||
155 | }; /* button_context_keyboard */ | ||
156 | |||
157 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | ||
158 | const struct button_mapping* get_context_mapping(int context) | ||
159 | { | ||
160 | switch (context) | ||
161 | { | ||
162 | case CONTEXT_STD: | ||
163 | return button_context_standard; | ||
164 | case CONTEXT_WPS: | ||
165 | return button_context_wps; | ||
166 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | ||
167 | case CONTEXT_SETTINGS_EQ: | ||
168 | case CONTEXT_SETTINGS_COLOURCHOOSER: | ||
169 | case CONTEXT_SETTINGS_TIME: | ||
170 | return button_context_settings_r_is_inc; | ||
171 | case CONTEXT_SETTINGS: | ||
172 | return button_context_settings; | ||
173 | case CONTEXT_YESNOSCREEN: | ||
174 | return button_context_yesno; | ||
175 | case CONTEXT_BOOKMARKSCREEN: | ||
176 | return button_context_bmark; | ||
177 | case CONTEXT_QUICKSCREEN: | ||
178 | return button_context_quickscreen; | ||
179 | case CONTEXT_PITCHSCREEN: | ||
180 | return button_context_pitchscreen; | ||
181 | case CONTEXT_KEYBOARD: | ||
182 | return button_context_keyboard; | ||
183 | } | ||
184 | return button_context_standard; | ||
185 | } | ||
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index fd90817130..9cd31363c9 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -57,7 +57,6 @@ | |||
57 | # H120/H140 iriverh120 | 57 | # H120/H140 iriverh120 |
58 | # H320/H340 iriverh300 | 58 | # H320/H340 iriverh300 |
59 | # H10 iriverh10 | 59 | # H10 iriverh10 |
60 | # IFP 7XX iriverifp7xx | ||
61 | # iaudio/Cowon | 60 | # iaudio/Cowon |
62 | # X5 iaudiox5 | 61 | # X5 iaudiox5 |
63 | # M5 iaudiom5 | 62 | # M5 iaudiom5 |
@@ -6069,12 +6068,10 @@ | |||
6069 | <source> | 6068 | <source> |
6070 | *: "Battery: %d%% %dh %dm" | 6069 | *: "Battery: %d%% %dh %dm" |
6071 | ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" | 6070 | ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" |
6072 | iriverifp7xx: "%d%% %dh %dm" | ||
6073 | </source> | 6071 | </source> |
6074 | <dest> | 6072 | <dest> |
6075 | *: "Battery: %d%% %dh %dm" | 6073 | *: "Battery: %d%% %dh %dm" |
6076 | ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" | 6074 | ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" |
6077 | iriverifp7xx: "%d%% %dh %dm" | ||
6078 | </dest> | 6075 | </dest> |
6079 | <voice> | 6076 | <voice> |
6080 | *: "Battery level" | 6077 | *: "Battery level" |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index d9c5eae516..2534e3bebe 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -61,13 +61,6 @@ | |||
61 | #define BATTERY_ON_TXT "SELECT - start" | 61 | #define BATTERY_ON_TXT "SELECT - start" |
62 | #define BATTERY_OFF_TXT "POWER" | 62 | #define BATTERY_OFF_TXT "POWER" |
63 | 63 | ||
64 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
65 | |||
66 | #define BATTERY_ON BUTTON_SELECT | ||
67 | #define BATTERY_OFF BUTTON_PLAY | ||
68 | #define BATTERY_ON_TXT "SELECT - start" | ||
69 | #define BATTERY_OFF_TXT "PLAY" | ||
70 | |||
71 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 64 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 65 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 66 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 650eaf412a..4242f5a89f 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -104,22 +104,6 @@ enum { | |||
104 | #define BJACK_RIGHT BUTTON_RIGHT | 104 | #define BJACK_RIGHT BUTTON_RIGHT |
105 | #define BJACK_LEFT BUTTON_LEFT | 105 | #define BJACK_LEFT BUTTON_LEFT |
106 | 106 | ||
107 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
108 | #define BJACK_SELECT_NAME "MODE" | ||
109 | #define BJACK_STAY_NAME "MODE" | ||
110 | #define BJACK_QUIT_NAME "PLAY" | ||
111 | #define BJACK_DOUBLE_NAME "SELECT" | ||
112 | #define BJACK_SELECT BUTTON_MODE | ||
113 | #define BJACK_QUIT BUTTON_PLAY | ||
114 | #define BJACK_MAX (BUTTON_EQ|BUTTON_UP) | ||
115 | #define BJACK_MIN (BUTTON_EQ|BUTTON_DOWN) | ||
116 | #define BJACK_STAY BUTTON_MODE | ||
117 | #define BJACK_DOUBLEDOWN BUTTON_SELECT | ||
118 | #define BJACK_UP BUTTON_UP | ||
119 | #define BJACK_DOWN BUTTON_DOWN | ||
120 | #define BJACK_RIGHT BUTTON_RIGHT | ||
121 | #define BJACK_LEFT BUTTON_LEFT | ||
122 | |||
123 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 107 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
124 | #define BJACK_SELECT_NAME "SELECT" | 108 | #define BJACK_SELECT_NAME "SELECT" |
125 | #define BJACK_STAY_NAME "VOL-" | 109 | #define BJACK_STAY_NAME "VOL-" |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 54173fde1c..e7f221a3c9 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -68,16 +68,6 @@ | |||
68 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN | 68 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN |
69 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP | 69 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP |
70 | 70 | ||
71 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
72 | #define CALENDAR_QUIT BUTTON_PLAY | ||
73 | #define CALENDAR_SELECT BUTTON_SELECT | ||
74 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
75 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
76 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
77 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
78 | #define CALENDAR_NEXT_MONTH BUTTON_MODE | ||
79 | #define CALENDAR_PREV_MONTH BUTTON_EQ | ||
80 | |||
81 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 71 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
82 | #define CALENDAR_QUIT BUTTON_POWER | 72 | #define CALENDAR_QUIT BUTTON_POWER |
83 | #define CALENDAR_SELECT BUTTON_SELECT | 73 | #define CALENDAR_SELECT BUTTON_SELECT |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 5bfce10ec5..827f045a4b 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -70,20 +70,6 @@ | |||
70 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 70 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
71 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 71 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
72 | 72 | ||
73 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
74 | #define CB_SELECT BUTTON_SELECT | ||
75 | #define CB_UP BUTTON_UP | ||
76 | #define CB_DOWN BUTTON_DOWN | ||
77 | #define CB_LEFT BUTTON_LEFT | ||
78 | #define CB_RIGHT BUTTON_RIGHT | ||
79 | #define CB_PLAY BUTTON_PLAY | ||
80 | #define CB_LEVEL BUTTON_EQ | ||
81 | #define CB_MENU BUTTON_MODE | ||
82 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
83 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
84 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
85 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
86 | |||
87 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 73 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
88 | #define CB_SELECT BUTTON_SELECT | 74 | #define CB_SELECT BUTTON_SELECT |
89 | #define CB_UP BUTTON_UP | 75 | #define CB_UP BUTTON_UP |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 79daf0987c..91b04e713a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -46,16 +46,6 @@ | |||
46 | #define CHC_SETTINGS_OK BUTTON_SELECT | 46 | #define CHC_SETTINGS_OK BUTTON_SELECT |
47 | #define CHC_SETTINGS_CANCEL BUTTON_MENU | 47 | #define CHC_SETTINGS_CANCEL BUTTON_MENU |
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
50 | #define CHC_QUIT BUTTON_PLAY | ||
51 | #define CHC_STARTSTOP BUTTON_MODE | ||
52 | #define CHC_RESET BUTTON_EQ | ||
53 | #define CHC_MENU BUTTON_SELECT | ||
54 | #define CHC_SETTINGS_INC BUTTON_RIGHT | ||
55 | #define CHC_SETTINGS_DEC BUTTON_LEFT | ||
56 | #define CHC_SETTINGS_OK BUTTON_SELECT | ||
57 | #define CHC_SETTINGS_CANCEL BUTTON_PLAY | ||
58 | |||
59 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 49 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
60 | #define CHC_QUIT BUTTON_REC | 50 | #define CHC_QUIT BUTTON_REC |
61 | #define CHC_STARTSTOP BUTTON_PLAY | 51 | #define CHC_STARTSTOP BUTTON_PLAY |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index cb9d67ec35..857f2415d4 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -62,16 +62,6 @@ | |||
62 | #define CUBE_HIGHSPEED_PRE BUTTON_SELECT | 62 | #define CUBE_HIGHSPEED_PRE BUTTON_SELECT |
63 | #define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL) | 63 | #define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL) |
64 | 64 | ||
65 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
66 | #define CUBE_QUIT BUTTON_PLAY | ||
67 | #define CUBE_NEXT BUTTON_RIGHT | ||
68 | #define CUBE_PREV BUTTON_LEFT | ||
69 | #define CUBE_INC BUTTON_UP | ||
70 | #define CUBE_DEC BUTTON_DOWN | ||
71 | #define CUBE_MODE BUTTON_MODE | ||
72 | #define CUBE_PAUSE BUTTON_SELECT | ||
73 | #define CUBE_HIGHSPEED BUTTON_EQ | ||
74 | |||
75 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 65 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
76 | #define CUBE_QUIT BUTTON_POWER | 66 | #define CUBE_QUIT BUTTON_POWER |
77 | #define CUBE_NEXT BUTTON_RIGHT | 67 | #define CUBE_NEXT BUTTON_RIGHT |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 28172aed9f..b64bf942fe 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -155,20 +155,6 @@ | |||
155 | #define FRACTAL_PRECISION_DEC BUTTON_REW | 155 | #define FRACTAL_PRECISION_DEC BUTTON_REW |
156 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REW) | 156 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REW) |
157 | 157 | ||
158 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
159 | #define FRACTAL_QUIT BUTTON_EQ | ||
160 | #define FRACTAL_UP BUTTON_UP | ||
161 | #define FRACTAL_DOWN BUTTON_DOWN | ||
162 | #define FRACTAL_LEFT BUTTON_LEFT | ||
163 | #define FRACTAL_RIGHT BUTTON_RIGHT | ||
164 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT | ||
165 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | ||
166 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT | ||
167 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | ||
168 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_RIGHT) | ||
169 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_LEFT) | ||
170 | #define FRACTAL_RESET BUTTON_MODE | ||
171 | |||
172 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 158 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
173 | #define FRACTAL_QUIT BUTTON_BACK | 159 | #define FRACTAL_QUIT BUTTON_BACK |
174 | #define FRACTAL_UP BUTTON_UP | 160 | #define FRACTAL_UP BUTTON_UP |
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index c44b1f77c0..d9cb7436de 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c | |||
@@ -57,14 +57,6 @@ | |||
57 | #define GREYSCALE_RIGHT BUTTON_RIGHT | 57 | #define GREYSCALE_RIGHT BUTTON_RIGHT |
58 | #define GREYSCALE_OFF BUTTON_MENU | 58 | #define GREYSCALE_OFF BUTTON_MENU |
59 | 59 | ||
60 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
61 | #define GREYSCALE_SHIFT BUTTON_PLAY | ||
62 | #define GREYSCALE_UP BUTTON_UP | ||
63 | #define GREYSCALE_DOWN BUTTON_DOWN | ||
64 | #define GREYSCALE_LEFT BUTTON_LEFT | ||
65 | #define GREYSCALE_RIGHT BUTTON_RIGHT | ||
66 | #define GREYSCALE_OFF BUTTON_EQ | ||
67 | |||
68 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 60 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
69 | #define GREYSCALE_SHIFT BUTTON_RC_PLAY /* somewhat dangerous... */ | 61 | #define GREYSCALE_SHIFT BUTTON_RC_PLAY /* somewhat dangerous... */ |
70 | #define GREYSCALE_UP BUTTON_RC_VOL_UP | 62 | #define GREYSCALE_UP BUTTON_RC_VOL_UP |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index af0189e9db..7f7965b07d 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -63,16 +63,6 @@ | |||
63 | #define HK_SELECT "SELECT" | 63 | #define HK_SELECT "SELECT" |
64 | #define HK_CANCEL "MENU" | 64 | #define HK_CANCEL "MENU" |
65 | 65 | ||
66 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
67 | #define JEWELS_UP BUTTON_UP | ||
68 | #define JEWELS_DOWN BUTTON_DOWN | ||
69 | #define JEWELS_LEFT BUTTON_LEFT | ||
70 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
71 | #define JEWELS_SELECT BUTTON_SELECT | ||
72 | #define JEWELS_CANCEL BUTTON_PLAY | ||
73 | #define HK_SELECT "SELECT" | ||
74 | #define HK_CANCEL "PLAY" | ||
75 | |||
76 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 66 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
77 | #define JEWELS_UP BUTTON_UP | 67 | #define JEWELS_UP BUTTON_UP |
78 | #define JEWELS_DOWN BUTTON_DOWN | 68 | #define JEWELS_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index e3543aeba2..b025ef8eaa 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -294,7 +294,6 @@ static const unsigned char lcdlinear[256] = { | |||
294 | #define LCD_SCANRATE 73 /* Hz */ | 294 | #define LCD_SCANRATE 73 /* Hz */ |
295 | 295 | ||
296 | #else /* not yet calibrated targets - generic linear mapping */ | 296 | #else /* not yet calibrated targets - generic linear mapping */ |
297 | /* TODO: calibrate iFP7xx */ | ||
298 | static const unsigned char lcdlinear[256] = { | 297 | static const unsigned char lcdlinear[256] = { |
299 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | 298 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, |
300 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, | 299 | 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 907cb3ee42..028472d9a8 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -91,7 +91,6 @@ const struct button_mapping pla_main_ctx[] = | |||
91 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 91 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
92 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 92 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
93 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 93 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
94 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | ||
95 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ | 94 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ |
96 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ | 95 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
97 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 96 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
@@ -348,12 +347,6 @@ const struct button_mapping pla_main_ctx[] = | |||
348 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 347 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
349 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 348 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
350 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 349 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
351 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | ||
352 | {PLA_CANCEL, BUTTON_EQ|BUTTON_REL, BUTTON_EQ}, | ||
353 | {PLA_EXIT, BUTTON_EQ|BUTTON_REPEAT, BUTTON_NONE}, | ||
354 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | ||
355 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | ||
356 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
357 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 350 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
358 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 351 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
359 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, | 352 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 498aa36357..f089c38023 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -95,23 +95,6 @@ | |||
95 | #define LVL_UP_TEXT "PLAY" | 95 | #define LVL_UP_TEXT "PLAY" |
96 | #define LVL_DOWN_TEXT "-" | 96 | #define LVL_DOWN_TEXT "-" |
97 | 97 | ||
98 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
99 | #define PEGBOX_SELECT BUTTON_MODE | ||
100 | #define PEGBOX_QUIT BUTTON_PLAY | ||
101 | #define PEGBOX_RESTART (BUTTON_EQ|BUTTON_MODE) | ||
102 | #define PEGBOX_LVL_UP (BUTTON_EQ|BUTTON_UP) | ||
103 | #define PEGBOX_LVL_DOWN (BUTTON_EQ|BUTTON_DOWN) | ||
104 | #define PEGBOX_UP BUTTON_UP | ||
105 | #define PEGBOX_DOWN BUTTON_DOWN | ||
106 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
107 | #define PEGBOX_LEFT BUTTON_LEFT | ||
108 | |||
109 | #define SELECT_TEXT "MODE" | ||
110 | #define QUIT_TEXT "PLAY" | ||
111 | #define RESTART_TEXT "EQ+MODE" | ||
112 | #define LVL_UP_TEXT "EQ+UP" | ||
113 | #define LVL_DOWN_TEXT "EQ+DOWN" | ||
114 | |||
115 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 98 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
116 | #define PEGBOX_SELECT BUTTON_PLAY | 99 | #define PEGBOX_SELECT BUTTON_PLAY |
117 | #define PEGBOX_QUIT BUTTON_POWER | 100 | #define PEGBOX_QUIT BUTTON_POWER |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 8f59695127..9faf53661e 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -128,8 +128,6 @@ const struct button_mapping pf_context_buttons[] = | |||
128 | #endif | 128 | #endif |
129 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 129 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
130 | {PF_QUIT, BUTTON_POWER, BUTTON_NONE}, | 130 | {PF_QUIT, BUTTON_POWER, BUTTON_NONE}, |
131 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
132 | {PF_QUIT, BUTTON_EQ, BUTTON_NONE}, | ||
133 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 131 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
134 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 132 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
135 | || (CONFIG_KEYPAD == IPOD_4G_PAD) \ | 133 | || (CONFIG_KEYPAD == IPOD_4G_PAD) \ |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index e85c6a5eab..07a15bfb62 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -152,17 +152,6 @@ | |||
152 | #define ROCKBLOX_DROP BUTTON_SELECT | 152 | #define ROCKBLOX_DROP BUTTON_SELECT |
153 | #define ROCKBLOX_RESTART BUTTON_A | 153 | #define ROCKBLOX_RESTART BUTTON_A |
154 | 154 | ||
155 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
156 | |||
157 | #define ROCKBLOX_OFF BUTTON_PLAY | ||
158 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | ||
159 | #define ROCKBLOX_ROTATE_CW BUTTON_SELECT | ||
160 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
161 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
162 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
163 | #define ROCKBLOX_DROP BUTTON_MODE | ||
164 | #define ROCKBLOX_RESTART BUTTON_EQ | ||
165 | |||
166 | #elif CONFIG_KEYPAD == MROBE500_PAD | 155 | #elif CONFIG_KEYPAD == MROBE500_PAD |
167 | #define ROCKBLOX_OFF BUTTON_POWER | 156 | #define ROCKBLOX_OFF BUTTON_POWER |
168 | 157 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 6dd010961e..d2c56ff6cc 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -122,16 +122,6 @@ static void setoptions (void) | |||
122 | options.SELECT = BUTTON_NONE; | 122 | options.SELECT = BUTTON_NONE; |
123 | options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); | 123 | options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); |
124 | 124 | ||
125 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
126 | options.UP = BUTTON_UP; | ||
127 | options.DOWN = BUTTON_DOWN; | ||
128 | |||
129 | options.A = BUTTON_PLAY; | ||
130 | options.B = BUTTON_EQ; | ||
131 | options.START = BUTTON_MODE; | ||
132 | options.SELECT = (BUTTON_SELECT | BUTTON_REL); | ||
133 | options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); | ||
134 | |||
135 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 125 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
136 | options.UP = BUTTON_UP; | 126 | options.UP = BUTTON_UP; |
137 | options.DOWN = BUTTON_DOWN; | 127 | options.DOWN = BUTTON_DOWN; |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index c5ecfd7a8a..bb96b8a44b 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -51,14 +51,6 @@ | |||
51 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_FWD | 51 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_FWD |
52 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_BACK | 52 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_BACK |
53 | 53 | ||
54 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
55 | #define STOPWATCH_QUIT BUTTON_PLAY | ||
56 | #define STOPWATCH_START_STOP BUTTON_MODE | ||
57 | #define STOPWATCH_RESET_TIMER BUTTON_EQ | ||
58 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | ||
59 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
60 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
61 | |||
62 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 54 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
63 | #define STOPWATCH_QUIT BUTTON_POWER | 55 | #define STOPWATCH_QUIT BUTTON_POWER |
64 | #define STOPWATCH_START_STOP BUTTON_PLAY | 56 | #define STOPWATCH_START_STOP BUTTON_PLAY |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index 26bfb7a464..d9a57d114f 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -75,17 +75,6 @@ | |||
75 | #define TV_AUTOSCROLL BUTTON_PLAY | 75 | #define TV_AUTOSCROLL BUTTON_PLAY |
76 | #define TV_BOOKMARK BUTTON_SELECT | 76 | #define TV_BOOKMARK BUTTON_SELECT |
77 | 77 | ||
78 | /* iFP7xx keys */ | ||
79 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
80 | #define TV_QUIT BUTTON_PLAY | ||
81 | #define TV_SCROLL_UP BUTTON_UP | ||
82 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
83 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
84 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
85 | #define TV_MENU BUTTON_MODE | ||
86 | #define TV_AUTOSCROLL BUTTON_SELECT | ||
87 | #define TV_BOOKMARK (BUTTON_LEFT|BUTTON_SELECT) | ||
88 | |||
89 | /* iAudio X5/M5 keys */ | 78 | /* iAudio X5/M5 keys */ |
90 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 79 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
91 | #define TV_QUIT BUTTON_POWER | 80 | #define TV_QUIT BUTTON_POWER |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 1dcb9c9034..e9316a301b 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -47,14 +47,6 @@ | |||
47 | #define ZX_SELECT BUTTON_SELECT | 47 | #define ZX_SELECT BUTTON_SELECT |
48 | #define ZX_MENU BUTTON_PLAY | 48 | #define ZX_MENU BUTTON_PLAY |
49 | 49 | ||
50 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
51 | #define ZX_SELECT BUTTON_SELECT | ||
52 | #define ZX_MENU BUTTON_PLAY | ||
53 | #define ZX_LEFT BUTTON_LEFT | ||
54 | #define ZX_RIGHT BUTTON_RIGHT | ||
55 | #define ZX_UP BUTTON_UP | ||
56 | #define ZX_DOWN BUTTON_DOWN | ||
57 | |||
58 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 50 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
59 | #define ZX_SELECT BUTTON_REW | 51 | #define ZX_SELECT BUTTON_REW |
60 | #define ZX_MENU BUTTON_FF | 52 | #define ZX_MENU BUTTON_FF |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 1028836351..6e0997c339 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -32,17 +32,6 @@ | |||
32 | #define KBD_UP BUTTON_SCROLL_BACK | 32 | #define KBD_UP BUTTON_SCROLL_BACK |
33 | #define KBD_DOWN BUTTON_SCROLL_FWD | 33 | #define KBD_DOWN BUTTON_SCROLL_FWD |
34 | 34 | ||
35 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
36 | |||
37 | /* TODO: Check keyboard mappings */ | ||
38 | |||
39 | #define KBD_SELECT BUTTON_SELECT | ||
40 | #define KBD_ABORT BUTTON_PLAY | ||
41 | #define KBD_LEFT BUTTON_LEFT | ||
42 | #define KBD_RIGHT BUTTON_RIGHT | ||
43 | #define KBD_UP BUTTON_UP | ||
44 | #define KBD_DOWN BUTTON_DOWN | ||
45 | |||
46 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 35 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
47 | 36 | ||
48 | /* TODO: Check keyboard mappings */ | 37 | /* TODO: Check keyboard mappings */ |