From a0f311355cef06c593ed4f0c93a93f256c7eeff0 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 12 Dec 2006 07:55:17 +0000 Subject: 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 --- apps/keymaps/keymap-e200.c | 26 +++++----- apps/keymaps/keymap-gigabeat.c | 32 ++++++------- apps/keymaps/keymap-h10.c | 42 ++++++++-------- apps/keymaps/keymap-h1x0_h3x0.c | 104 ++++++++++++++++++++-------------------- apps/keymaps/keymap-ifp7xx.c | 18 +++---- apps/keymaps/keymap-ipod.c | 20 ++++---- apps/keymaps/keymap-newtarget.c | 4 +- apps/keymaps/keymap-ondio.c | 24 +++++----- apps/keymaps/keymap-player.c | 2 +- apps/keymaps/keymap-recorder.c | 8 ++-- apps/keymaps/keymap-x5.c | 44 ++++++++--------- 11 files changed, 163 insertions(+), 161 deletions(-) (limited to 'apps/keymaps') 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 @@ * if there's no need to check the previous button's value, use BUTTON_NONE * Insert LAST_ITEM_IN_LIST at the end of each mapping */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, @@ -48,7 +48,7 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, @@ -82,7 +82,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -97,21 +97,21 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings */ -const struct button_mapping button_context_list[] = { +static const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ -const struct button_mapping button_context_listtree_scroll_without_combo[] = { +static const struct button_mapping button_context_listtree_scroll_without_combo[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -125,7 +125,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_without_combo */ -const struct button_mapping button_context_listtree_scroll_with_combo[] = { +static const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, { 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[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_with_combo */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_yesno */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, @@ -155,7 +155,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_quickscreen */ -const struct button_mapping button_context_settings_right_is_inc[] = { +static const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE }, @@ -174,7 +174,7 @@ const struct button_mapping button_context_settings_right_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_right_is_inc */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -189,7 +189,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_pitchscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -214,7 +214,7 @@ const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE }, { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index e248e2c4db..f630da025b 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c @@ -44,7 +44,7 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, @@ -65,7 +65,7 @@ const struct button_mapping button_context_standard[] = { }; /* button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -92,7 +92,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping button_context_list[] = { +static const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_POWER|BUTTON_UP }, { ACTION_LISTTREE_PGUP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, @@ -102,7 +102,7 @@ const struct button_mapping button_context_list[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_A, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_A|BUTTON_REL, BUTTON_A }, @@ -111,7 +111,7 @@ const struct button_mapping button_context_tree[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ -const struct button_mapping button_context_listtree_scroll_with_combo[] = { +static const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_PGLEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_POWER|BUTTON_LEFT }, @@ -125,7 +125,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_listtree_scroll_without_combo[] = { +static const struct button_mapping button_context_listtree_scroll_without_combo[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -138,7 +138,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, @@ -152,7 +152,7 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -const struct button_mapping button_context_settings_right_is_inc[] = { +static const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -166,34 +166,34 @@ const struct button_mapping button_context_settings_right_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ -const struct button_mapping button_context_colorchooser[] = { +static const struct button_mapping button_context_colorchooser[] = { { ACTION_STD_OK, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_eq[] = { +static const struct button_mapping button_context_eq[] = { { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_POWER, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_time[] = { +static const struct button_mapping button_context_time[] = { { ACTION_STD_CANCEL, BUTTON_A, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, @@ -207,7 +207,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -223,7 +223,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index b1355568ec..33bcb13269 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c @@ -31,7 +31,7 @@ * if there's no need to check the previous button's value, use BUTTON_NONE * Insert LAST_ITEM_IN_LIST at the end of each mapping */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -52,7 +52,7 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping remote_button_context_standard[] = { +static const struct button_mapping remote_button_context_standard[] = { { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -61,7 +61,7 @@ const struct button_mapping remote_button_context_standard[] = { LAST_ITEM_IN_LIST }; /* remote_button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, @@ -90,7 +90,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping remote_button_context_wps[] = { +static const struct button_mapping remote_button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW}, @@ -111,7 +111,7 @@ const struct button_mapping remote_button_context_wps[] = { LAST_ITEM_IN_LIST }; /* remote_button_context_wps */ -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -125,49 +125,49 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings */ -const struct button_mapping button_context_list[] = { +static const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW }, { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REL, BUTTON_FF }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ -const struct button_mapping remote_button_context_list[] = { +static const struct button_mapping remote_button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ -const struct button_mapping remote_button_context_tree[] = { +static const struct button_mapping remote_button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ -const struct button_mapping button_context_listtree_scroll_without_combo[] = { +static const struct button_mapping button_context_listtree_scroll_without_combo[] = { { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGRIGHT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_without_combo */ -const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = { +static const struct button_mapping remote_button_context_listtree_scroll_without_combo[] = { { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_without_combo */ -const struct button_mapping button_context_listtree_scroll_with_combo[] = { +static const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, { ACTION_LISTTREE_PGDOWN, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF }, { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_PLAY, BUTTON_PLAY }, @@ -182,7 +182,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_with_combo */ -const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = { +static const struct button_mapping remote_button_context_listtree_scroll_with_combo[] = { { ACTION_LISTTREE_PGUP, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, { ACTION_LISTTREE_PGDOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_RC_PLAY, BUTTON_RC_PLAY }, @@ -197,12 +197,12 @@ const struct button_mapping remote_button_context_listtree_scroll_with_combo[] LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; /* button_context_listtree_scroll_with_combo */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_yesno */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -215,7 +215,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_quickscreen */ -const struct button_mapping remote_button_context_quickscreen[] = { +static const struct button_mapping remote_button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -228,7 +228,7 @@ const struct button_mapping remote_button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_quickscreen */ -const struct button_mapping button_context_settings_right_is_inc[] = { +static const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -245,7 +245,7 @@ const struct button_mapping button_context_settings_right_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_right_is_inc */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -261,7 +261,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_pitchscreen */ -const struct button_mapping remote_button_context_pitchscreen[] = { +static const struct button_mapping remote_button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -275,7 +275,7 @@ const struct button_mapping remote_button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_pitchscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -291,7 +291,7 @@ const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE }, { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_LEFT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 9de24e3fb5..823e07178a 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c @@ -45,7 +45,7 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, @@ -66,7 +66,7 @@ const struct button_mapping button_context_standard[] = { }; /* button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -93,7 +93,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping button_context_list[] = { +static const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, @@ -104,7 +104,7 @@ const struct button_mapping button_context_list[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, @@ -113,7 +113,7 @@ const struct button_mapping button_context_tree[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ -const struct button_mapping button_context_listtree_scroll_with_combo[] = { +static const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, { ACTION_TREE_PGLEFT, BUTTON_ON|BUTTON_LEFT, BUTTON_ON }, { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_ON|BUTTON_LEFT }, @@ -127,7 +127,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_listtree_scroll_without_combo[] = { +static const struct button_mapping button_context_listtree_scroll_without_combo[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -140,7 +140,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, @@ -154,7 +154,7 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -const struct button_mapping button_context_settings_right_is_inc[] = { +static const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -168,17 +168,17 @@ const struct button_mapping button_context_settings_right_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ -const struct button_mapping button_context_colorchooser[] = { +static const struct button_mapping button_context_colorchooser[] = { { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_eq[] = { +static const struct button_mapping button_context_eq[] = { { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, { ACTION_NONE, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, { ACTION_SETTINGS_INCBIGSTEP, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON }, @@ -190,20 +190,20 @@ const struct button_mapping button_context_eq[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_time[] = { +static const struct button_mapping button_context_time[] = { { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, @@ -217,7 +217,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -234,7 +234,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ -const struct button_mapping button_context_recscreen[] = { +static const struct button_mapping button_context_recscreen[] = { { ACTION_REC_PAUSE, BUTTON_ON, BUTTON_NONE }, { ACTION_REC_NEWFILE, BUTTON_REC, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, @@ -245,7 +245,7 @@ const struct button_mapping button_context_recscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -270,7 +270,7 @@ const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ -const struct button_mapping button_context_radio[] = { +static const struct button_mapping button_context_radio[] = { { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, { ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE }, @@ -287,7 +287,7 @@ const struct button_mapping button_context_radio[] = { *****************************************************************************/ -const struct button_mapping button_context_standard_h100remote[] = { +static const struct button_mapping button_context_standard_h100remote[] = { { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, @@ -304,7 +304,7 @@ const struct button_mapping button_context_standard_h100remote[] = { LAST_ITEM_IN_LIST }; /* button_context_standard_h100lcdremote */ -const struct button_mapping button_context_standard_h300lcdremote[] = { +static const struct button_mapping button_context_standard_h300lcdremote[] = { { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -322,7 +322,7 @@ const struct button_mapping button_context_standard_h300lcdremote[] = { }; -const struct button_mapping button_context_wps_remotescommon[] = { +static const struct button_mapping button_context_wps_remotescommon[] = { { ACTION_WPS_PLAY, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, @@ -349,18 +349,18 @@ const struct button_mapping button_context_wps_remotescommon[] = { }; -const struct button_mapping button_context_wps_h100remote[] = { +static const struct button_mapping button_context_wps_h100remote[] = { { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping button_context_wps_h300lcdremote[] = { +static const struct button_mapping button_context_wps_h300lcdremote[] = { { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping button_context_list_h100remote[] = { +static const struct button_mapping button_context_list_h100remote[] = { { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE }, { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, @@ -368,24 +368,24 @@ const struct button_mapping button_context_list_h100remote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping *button_context_list_h300lcdremote = +static const struct button_mapping *button_context_list_h300lcdremote = button_context_list_h100remote; -const struct button_mapping button_context_tree_h100remote[] = { +static const struct button_mapping button_context_tree_h100remote[] = { { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) }; /* button_context_tree_h100remote */ -const struct button_mapping button_context_tree_h300lcdremote[] = { +static const struct button_mapping button_context_tree_h300lcdremote[] = { { ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE }, { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) }; /* button_context_tree_h300lcdremote */ -const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = { +static const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = { { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON }, { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW }, { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL }, @@ -401,7 +401,7 @@ const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), }; -const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = { +static const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = { { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU }, { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE }, { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL }, @@ -414,7 +414,7 @@ const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), }; -const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = { +static const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = { { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_TREE_ROOT_INIT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_RC_VOL_DOWN }, { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, @@ -423,7 +423,7 @@ const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), }; -const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = { +static const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = { { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, { ACTION_TREE_ROOT_INIT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, @@ -436,7 +436,7 @@ const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), }; -const struct button_mapping button_context_settings_h100remote[] = { +static const struct button_mapping button_context_settings_h100remote[] = { { ACTION_SETTINGS_INC, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE }, @@ -448,7 +448,7 @@ const struct button_mapping button_context_settings_h100remote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -const struct button_mapping button_context_settings_h300lcdremote[] = { +static const struct button_mapping button_context_settings_h300lcdremote[] = { { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -461,7 +461,7 @@ const struct button_mapping button_context_settings_h300lcdremote[] = { -const struct button_mapping button_context_settingsgraphical_h100remote[] = { +static const struct button_mapping button_context_settingsgraphical_h100remote[] = { { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, @@ -474,7 +474,7 @@ const struct button_mapping button_context_settingsgraphical_h100remote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical_h100remote */ -const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { +static const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, @@ -487,25 +487,25 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical_h300remote */ -const struct button_mapping button_context_yesno_h100remote[] = { +static const struct button_mapping button_context_yesno_h100remote[] = { { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ -const struct button_mapping *button_context_yesno_h300lcdremote = +static const struct button_mapping *button_context_yesno_h300lcdremote = button_context_yesno_h100remote; -const struct button_mapping button_context_bmark_h100remote[] = { +static const struct button_mapping button_context_bmark_h100remote[] = { { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE }, { ACTION_BMS_SELECT, BUTTON_RC_MENU, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_bmark */ -const struct button_mapping *button_context_bmark_h300lcdremote = +static const struct button_mapping *button_context_bmark_h300lcdremote = button_context_bmark_h100remote; -const struct button_mapping button_context_quickscreen_nonlcdremote[] = { +static const struct button_mapping button_context_quickscreen_nonlcdremote[] = { { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -519,7 +519,7 @@ const struct button_mapping button_context_quickscreen_nonlcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_quickscreen_h100lcdremote[] = { +static const struct button_mapping button_context_quickscreen_h100lcdremote[] = { { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -537,7 +537,7 @@ const struct button_mapping button_context_quickscreen_h100lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_quickscreen_h300lcdremote[] = { +static const struct button_mapping button_context_quickscreen_h300lcdremote[] = { { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -551,7 +551,7 @@ const struct button_mapping button_context_quickscreen_h300lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_pitchscreen_nonlcdremote[] = { +static const struct button_mapping button_context_pitchscreen_nonlcdremote[] = { { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -567,7 +567,7 @@ const struct button_mapping button_context_pitchscreen_nonlcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ -const struct button_mapping button_context_pitchscreen_h100lcdremote[] = { +static const struct button_mapping button_context_pitchscreen_h100lcdremote[] = { { ACTION_PS_INC_SMALL, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_RC_REW, BUTTON_NONE }, @@ -583,7 +583,7 @@ const struct button_mapping button_context_pitchscreen_h100lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { +static const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -599,7 +599,7 @@ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping button_context_recscreen_h100remote[] = { +static const struct button_mapping button_context_recscreen_h100remote[] = { { ACTION_REC_LCD, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE }, @@ -611,7 +611,7 @@ const struct button_mapping button_context_recscreen_h100remote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen_h100remote */ -const struct button_mapping button_context_recscreen_h300lcdremote[] = { +static const struct button_mapping button_context_recscreen_h300lcdremote[] = { { ACTION_REC_LCD, BUTTON_RC_SOURCE, BUTTON_NONE }, { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE }, @@ -623,7 +623,7 @@ const struct button_mapping button_context_recscreen_h300lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen_h300lcdremote */ -const struct button_mapping button_context_keyboard_h100remote[] = { +static const struct button_mapping button_context_keyboard_h100remote[] = { { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, @@ -652,7 +652,7 @@ const struct button_mapping button_context_keyboard_h100remote[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard_h100remote */ -const struct button_mapping button_context_keyboard_h300lcdremote[] = { +static const struct button_mapping button_context_keyboard_h300lcdremote[] = { { ACTION_KBD_LEFT, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, @@ -677,7 +677,7 @@ const struct button_mapping button_context_keyboard_h300lcdremote[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard_h300lcdremote */ -const struct button_mapping button_context_radio_h100remote[] = { +static const struct button_mapping button_context_radio_h100remote[] = { { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU }, { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE }, @@ -698,7 +698,7 @@ const struct button_mapping button_context_radio_h100remote[] = { LAST_ITEM_IN_LIST }; -const struct button_mapping button_context_radio_h300lcdremote[] = { +static const struct button_mapping button_context_radio_h300lcdremote[] = { { ACTION_FM_MENU, BUTTON_RC_MENU | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_PRESET, BUTTON_RC_MENU | BUTTON_REL, BUTTON_RC_MENU }, { ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE }, @@ -857,7 +857,7 @@ static void remap_remote(void) } -const struct button_mapping* get_context_mapping_remote(int context) +static const struct button_mapping* get_context_mapping_remote(int context) { if(remote_type() != _remote_type) remap_remote(); diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c index b5d0fd7df0..6f12ac14c8 100644 --- a/apps/keymaps/keymap-ifp7xx.c +++ b/apps/keymaps/keymap-ifp7xx.c @@ -28,7 +28,7 @@ * if there's no need to check the previous button's value, use BUTTON_NONE * Insert LAST_ITEM_IN_LIST at the end of each mapping */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, @@ -46,7 +46,7 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -71,7 +71,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, @@ -82,7 +82,7 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -const struct button_mapping button_context_settings_r_is_inc[] = { +static const struct button_mapping button_context_settings_r_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -95,18 +95,18 @@ const struct button_mapping button_context_settings_r_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, @@ -119,7 +119,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -134,7 +134,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 0e0c02b6aa..26189d95fe 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -38,7 +38,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, @@ -54,14 +54,14 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ -const struct button_mapping button_context_tree_scroll_lr[] = { +static const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -74,7 +74,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -95,7 +95,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST, }; /* button_context_wps */ -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, @@ -110,19 +110,19 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settings_yesno */ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_PLAY, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, @@ -134,7 +134,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, @@ -150,7 +150,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c index ab1e157937..69da4efc44 100644 --- a/apps/keymaps/keymap-newtarget.c +++ b/apps/keymaps/keymap-newtarget.c @@ -42,12 +42,12 @@ * if there's no need to check the previous button's value, use BUTTON_NONE * Insert LAST_ITEM_IN_LIST at the end of each mapping */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index bc92fc47ba..4274afc29e 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c @@ -32,7 +32,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions */ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, @@ -47,7 +47,7 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -68,7 +68,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, @@ -79,13 +79,15 @@ const struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -const struct button_mapping button_context_tree[] = { + +static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_listtree */ -const struct button_mapping button_context_tree_scroll_lr[] = { + +static const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_PGLEFT, BUTTON_MENU|BUTTON_LEFT, BUTTON_NONE }, @@ -101,13 +103,13 @@ const struct button_mapping button_context_tree_scroll_lr[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; -const struct button_mapping button_context_yesno[] = { +static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; -struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, { ACTION_BMS_EXIT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -116,7 +118,7 @@ struct button_mapping button_context_bmark[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_bmark */ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -132,7 +134,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping button_context_recscreen[] = { +static const struct button_mapping button_context_recscreen[] = { { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, @@ -142,7 +144,7 @@ const struct button_mapping button_context_recscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -158,7 +160,7 @@ const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ -const struct button_mapping button_context_radio[] = { +static const struct button_mapping button_context_radio[] = { { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_RECORD_DBLPRE, BUTTON_MENU, BUTTON_NONE}, { ACTION_FM_RECORD, BUTTON_MENU | BUTTON_REL, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 29e45a1d33..82508b5c48 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c @@ -84,7 +84,7 @@ static const struct button_mapping button_context_yesno[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ -struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, { ACTION_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index c51bde9a4b..03f26a32be 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c @@ -157,7 +157,7 @@ static const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ -const struct button_mapping button_context_recscreen[] = { +static const struct button_mapping button_context_recscreen[] = { { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE }, { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE }, @@ -169,7 +169,7 @@ const struct button_mapping button_context_recscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -192,7 +192,7 @@ const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ -struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE }, @@ -202,7 +202,7 @@ struct button_mapping button_context_bmark[] = { }; /* button_context_settings_bmark */ -const struct button_mapping button_context_radio[] = { +static const struct button_mapping button_context_radio[] = { { ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE }, { ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE }, { ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 0bc4833077..82cfd27c5d 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c @@ -40,7 +40,7 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions **/ /** Standard Button Contexts **/ -const struct button_mapping button_context_standard[] = { +static const struct button_mapping button_context_standard[] = { { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, @@ -58,7 +58,7 @@ const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -const struct button_mapping remote_button_context_standard[] = { +static const struct button_mapping remote_button_context_standard[] = { { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, @@ -74,7 +74,7 @@ const struct button_mapping remote_button_context_standard[] = { }; /* remote_button_context_standard */ /** Bookmark Screen **/ -const struct button_mapping button_context_bmark[] = { +static const struct button_mapping button_context_bmark[] = { { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, @@ -83,7 +83,7 @@ const struct button_mapping button_context_bmark[] = { }; /* button_context_settings_bmark */ /** FM Radio Screen **/ -const struct button_mapping button_context_radio[] = { +static const struct button_mapping button_context_radio[] = { { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE }, @@ -98,7 +98,7 @@ const struct button_mapping button_context_radio[] = { }; /* button_context_radio */ /** Keyboard **/ -const struct button_mapping button_context_keyboard[] = { +static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -115,13 +115,13 @@ const struct button_mapping button_context_keyboard[] = { }; /* button_context_keyboard */ /* Main Menu Context Menu **/ -const struct button_mapping button_context_mainmenu[] = { +static const struct button_mapping button_context_mainmenu[] = { { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_mainmenu */ -const struct button_mapping remote_button_context_mainmenu[] = { +static const struct button_mapping remote_button_context_mainmenu[] = { { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, @@ -129,7 +129,7 @@ const struct button_mapping remote_button_context_mainmenu[] = { }; /* remote_button_context_mainmenu */ /** Pitchscreen **/ -const struct button_mapping button_context_pitchscreen[] = { +static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, @@ -145,7 +145,7 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchscreen */ -const struct button_mapping remote_button_context_pitchscreen[] = { +static const struct button_mapping remote_button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -161,7 +161,7 @@ const struct button_mapping remote_button_context_pitchscreen[] = { }; /* remote_button_context_pitchscreen */ /** Quickscreen **/ -const struct button_mapping button_context_quickscreen[] = { +static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, @@ -175,7 +175,7 @@ const struct button_mapping button_context_quickscreen[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -const struct button_mapping remote_button_context_quickscreen[] = { +static const struct button_mapping remote_button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -189,7 +189,7 @@ const struct button_mapping remote_button_context_quickscreen[] = { }; /* remote_button_context_quickscreen */ /** Recording Screen **/ -const struct button_mapping button_context_recscreen[] = { +static const struct button_mapping button_context_recscreen[] = { { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, @@ -203,7 +203,7 @@ const struct button_mapping button_context_recscreen[] = { }; /* button_context_recscreen */ /** Settings - General Mappings **/ -const struct button_mapping button_context_settings[] = { +static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, @@ -215,7 +215,7 @@ const struct button_mapping button_context_settings[] = { }; /* button_context_settings */ /** Settings - Using Sliders **/ -const struct button_mapping button_context_settings_r_is_inc[] = { +static const struct button_mapping button_context_settings_r_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -229,7 +229,7 @@ const struct button_mapping button_context_settings_r_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_r_is_inc */ -const struct button_mapping remote_button_context_settings_r_is_inc[] = { +static const struct button_mapping remote_button_context_settings_r_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, @@ -243,7 +243,7 @@ const struct button_mapping remote_button_context_settings_r_is_inc[] = { }; /* remote_button_context_settings_r_is_inc */ /** Settings - Time/Date **/ -const struct button_mapping button_context_settings_time[] = { +static const struct button_mapping button_context_settings_time[] = { { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, @@ -252,7 +252,7 @@ const struct button_mapping button_context_settings_time[] = { }; /* button_context_settings */ /** Tree **/ -const struct button_mapping button_context_tree[] = { +static const struct button_mapping button_context_tree[] = { { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, @@ -260,7 +260,7 @@ const struct button_mapping button_context_tree[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ -const struct button_mapping remote_button_context_tree[] = { +static const struct button_mapping remote_button_context_tree[] = { { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_NONE, BUTTON_RC_MODE, BUTTON_NONE }, @@ -269,7 +269,7 @@ const struct button_mapping remote_button_context_tree[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* remote_button_context_tree */ -const struct button_mapping button_context_tree_scroll_lr[] = { +static const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -284,7 +284,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { }; /* button_context_tree_scroll_lr */ /** While-Playing Screen (WPS) **/ -const struct button_mapping button_context_wps[] = { +static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -307,7 +307,7 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping remote_button_context_wps[] = { +static const struct button_mapping remote_button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, @@ -331,7 +331,7 @@ const struct button_mapping remote_button_context_wps[] = { }; /* remote_button_context_wps */ /** Yes/No Screen **/ -const struct button_mapping button_context_yesnoscreen[] = { +static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settings_yesnoscreen */ -- cgit v1.2.3