diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-12-12 07:55:17 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-12-12 07:55:17 +0000 |
commit | a0f311355cef06c593ed4f0c93a93f256c7eeff0 (patch) | |
tree | fcada56f9f99c2cb8a8b1ba35b228b81a00de67a /apps/keymaps/keymap-e200.c | |
parent | f51df0de210476d0fbd90a9f0e1fcd9054f275f5 (diff) | |
download | rockbox-a0f311355cef06c593ed4f0c93a93f256c7eeff0.tar.gz rockbox-a0f311355cef06c593ed4f0c93a93f256c7eeff0.zip |
Action code: Made all private functions & variables static. Better module separation, and it saves a bit of binary size. * Added a few missing 'const's.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11730 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-e200.c')
-rw-r--r-- | apps/keymaps/keymap-e200.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index a1e4b82384..f738abd9a0 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * if there's no need to check the previous button's value, use BUTTON_NONE | 30 | * if there's no need to check the previous button's value, use BUTTON_NONE |
31 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 31 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
32 | */ | 32 | */ |
33 | const struct button_mapping button_context_standard[] = { | 33 | static const struct button_mapping button_context_standard[] = { |
34 | { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, | 34 | { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, |
35 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 35 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
36 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, | 36 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, |
@@ -48,7 +48,7 @@ const struct button_mapping button_context_standard[] = { | |||
48 | LAST_ITEM_IN_LIST | 48 | LAST_ITEM_IN_LIST |
49 | }; /* button_context_standard */ | 49 | }; /* button_context_standard */ |
50 | 50 | ||
51 | const struct button_mapping button_context_wps[] = { | 51 | static const struct button_mapping button_context_wps[] = { |
52 | { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 52 | { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
53 | { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 53 | { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
54 | 54 | ||
@@ -82,7 +82,7 @@ const struct button_mapping button_context_wps[] = { | |||
82 | LAST_ITEM_IN_LIST | 82 | LAST_ITEM_IN_LIST |
83 | }; /* button_context_wps */ | 83 | }; /* button_context_wps */ |
84 | 84 | ||
85 | const struct button_mapping button_context_settings[] = { | 85 | static const struct button_mapping button_context_settings[] = { |
86 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 86 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, |
87 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 88 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
@@ -97,21 +97,21 @@ const struct button_mapping button_context_settings[] = { | |||
97 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 97 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
98 | }; /* button_context_settings */ | 98 | }; /* button_context_settings */ |
99 | 99 | ||
100 | const struct button_mapping button_context_list[] = { | 100 | static const struct button_mapping button_context_list[] = { |
101 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, | 101 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, |
102 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, | 102 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, |
103 | 103 | ||
104 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 104 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
105 | }; /* button_context_list */ | 105 | }; /* button_context_list */ |
106 | 106 | ||
107 | const struct button_mapping button_context_tree[] = { | 107 | static const struct button_mapping button_context_tree[] = { |
108 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 108 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
109 | { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 109 | { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
110 | 110 | ||
111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
112 | }; /* button_context_tree */ | 112 | }; /* button_context_tree */ |
113 | 113 | ||
114 | const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 114 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
115 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 115 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
116 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 116 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
117 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 117 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
@@ -125,7 +125,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = { | |||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
126 | }; /* button_context_listtree_scroll_without_combo */ | 126 | }; /* button_context_listtree_scroll_without_combo */ |
127 | 127 | ||
128 | const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 128 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
129 | { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
130 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, | 130 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, |
131 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 131 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -135,13 +135,13 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = { | |||
135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
136 | }; /* button_context_listtree_scroll_with_combo */ | 136 | }; /* button_context_listtree_scroll_with_combo */ |
137 | 137 | ||
138 | const struct button_mapping button_context_yesno[] = { | 138 | static const struct button_mapping button_context_yesno[] = { |
139 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 139 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
140 | 140 | ||
141 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 141 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
142 | }; /* button_context_settings_yesno */ | 142 | }; /* button_context_settings_yesno */ |
143 | 143 | ||
144 | const struct button_mapping button_context_quickscreen[] = { | 144 | static const struct button_mapping button_context_quickscreen[] = { |
145 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | 145 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, |
146 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, | 146 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
147 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 147 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -155,7 +155,7 @@ const struct button_mapping button_context_quickscreen[] = { | |||
155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
156 | }; /* button_context_quickscreen */ | 156 | }; /* button_context_quickscreen */ |
157 | 157 | ||
158 | const struct button_mapping button_context_settings_right_is_inc[] = { | 158 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
159 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, | 159 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, |
160 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 160 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
161 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, | 161 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, |
@@ -174,7 +174,7 @@ const struct button_mapping button_context_settings_right_is_inc[] = { | |||
174 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 174 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
175 | }; /* button_context_settings_right_is_inc */ | 175 | }; /* button_context_settings_right_is_inc */ |
176 | 176 | ||
177 | const struct button_mapping button_context_pitchscreen[] = { | 177 | static const struct button_mapping button_context_pitchscreen[] = { |
178 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 178 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
179 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 179 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
180 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 180 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
@@ -189,7 +189,7 @@ const struct button_mapping button_context_pitchscreen[] = { | |||
189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
190 | }; /* button_context_pitchscreen */ | 190 | }; /* button_context_pitchscreen */ |
191 | 191 | ||
192 | const struct button_mapping button_context_keyboard[] = { | 192 | static const struct button_mapping button_context_keyboard[] = { |
193 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 193 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
194 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 194 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
195 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 195 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
@@ -214,7 +214,7 @@ const struct button_mapping button_context_keyboard[] = { | |||
214 | LAST_ITEM_IN_LIST | 214 | LAST_ITEM_IN_LIST |
215 | }; /* button_context_keyboard */ | 215 | }; /* button_context_keyboard */ |
216 | 216 | ||
217 | const struct button_mapping button_context_bmark[] = { | 217 | static const struct button_mapping button_context_bmark[] = { |
218 | { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE }, | 218 | { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE }, |
219 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 219 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
220 | { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE }, | 220 | { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE }, |