forked from len0rd/rockbox
rgnano: Proper keylock support
Can use the advanced keylock menu options now. Change-Id: If59b16ef5649c328558a74dd0601bc2f272c37b7
This commit is contained in:
parent
8418fc9078
commit
268a282da6
4 changed files with 3 additions and 5 deletions
|
@ -47,6 +47,7 @@ static const struct button_mapping button_context_standard[] = {
|
||||||
{ ACTION_STD_MENU, BUTTON_Y|BUTTON_REL, BUTTON_Y },
|
{ ACTION_STD_MENU, BUTTON_Y|BUTTON_REL, BUTTON_Y },
|
||||||
{ ACTION_STD_CONTEXT, BUTTON_START|BUTTON_REL, BUTTON_START },
|
{ ACTION_STD_CONTEXT, BUTTON_START|BUTTON_REL, BUTTON_START },
|
||||||
{ ACTION_STD_QUICKSCREEN, BUTTON_R|BUTTON_REL, BUTTON_R },
|
{ ACTION_STD_QUICKSCREEN, BUTTON_R|BUTTON_REL, BUTTON_R },
|
||||||
|
{ ACTION_STD_KEYLOCK, BUTTON_FN|BUTTON_START, BUTTON_NONE },
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_standard */
|
}; /* button_context_standard */
|
||||||
|
@ -76,6 +77,7 @@ static const struct button_mapping button_context_wps[] = {
|
||||||
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_A|BUTTON_RIGHT, BUTTON_A },
|
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_A|BUTTON_RIGHT, BUTTON_A },
|
||||||
{ ACTION_WPS_ABRESET, BUTTON_A|BUTTON_UP, BUTTON_A },
|
{ ACTION_WPS_ABRESET, BUTTON_A|BUTTON_UP, BUTTON_A },
|
||||||
{ ACTION_WPS_ABRESET, BUTTON_A|BUTTON_DOWN, BUTTON_A },
|
{ ACTION_WPS_ABRESET, BUTTON_A|BUTTON_DOWN, BUTTON_A },
|
||||||
|
{ ACTION_STD_KEYLOCK, BUTTON_FN|BUTTON_START, BUTTON_NONE },
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_wps */
|
}; /* button_context_wps */
|
||||||
|
@ -223,7 +225,7 @@ static const struct button_mapping button_context_radio[] = {
|
||||||
|
|
||||||
const struct button_mapping* get_context_mapping(int context)
|
const struct button_mapping* get_context_mapping(int context)
|
||||||
{
|
{
|
||||||
switch (context)
|
switch (context & ~CONTEXT_LOCKED)
|
||||||
{
|
{
|
||||||
case CONTEXT_STD:
|
case CONTEXT_STD:
|
||||||
return button_context_standard;
|
return button_context_standard;
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
|
|
||||||
/* define this to indicate your device's keypad */
|
/* define this to indicate your device's keypad */
|
||||||
#define HAVE_BUTTON_DATA
|
#define HAVE_BUTTON_DATA
|
||||||
#define HAS_BUTTON_HOLD
|
|
||||||
#define HAVE_VOLUME_IN_LIST
|
#define HAVE_VOLUME_IN_LIST
|
||||||
|
|
||||||
/* define this if you have a real-time clock */
|
/* define this if you have a real-time clock */
|
||||||
|
|
|
@ -85,8 +85,6 @@ your WPS (While Playing Screen).
|
||||||
\opt{RG_NANO_PAD}{\ButtonStart+\ButtonFN}
|
\opt{RG_NANO_PAD}{\ButtonStart+\ButtonFN}
|
||||||
& Key lock (software hold switch) on/off.\\
|
& Key lock (software hold switch) on/off.\\
|
||||||
}%
|
}%
|
||||||
\opt{RG_NANO_PAD}{\ButtonStart+\ButtonFN}
|
|
||||||
& Key lock (software hold switch) on/off.\\
|
|
||||||
% We explicitly list all the appropriate targets here and do no condition
|
% We explicitly list all the appropriate targets here and do no condition
|
||||||
% on the 'pitchscreen' feature since some players have the feature but do
|
% on the 'pitchscreen' feature since some players have the feature but do
|
||||||
% not have the button to go from the WPS to the pitch screen.
|
% not have the button to go from the WPS to the pitch screen.
|
||||||
|
|
|
@ -2,4 +2,3 @@ UNMAP FN+Y
|
||||||
UNMAP FN+A
|
UNMAP FN+A
|
||||||
UNMAP FN+B
|
UNMAP FN+B
|
||||||
UNMAP FN+X
|
UNMAP FN+X
|
||||||
MAP START+FN TO KEY KEY_H
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue