The Onda VX777 has only one button, add it to the keymap.

Also fix a typo that erroneously enabled button_hold in button-target.h

Flyspray: FS#10732
Author: Yann Muller

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23383 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-10-28 21:16:45 +00:00
parent 48430bfabd
commit e415395c5b
3 changed files with 12 additions and 3 deletions

View file

@ -39,11 +39,13 @@
*/ */
static const struct button_mapping button_context_standard[] = { static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_standard */ }; /* button_context_standard */
static const struct button_mapping button_context_wps[] = { static const struct button_mapping button_context_wps[] = {
{ ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_wps */ }; /* button_context_wps */
@ -64,7 +66,7 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[
}; };
static const struct button_mapping button_context_settings[] = { static const struct button_mapping button_context_settings[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_settings */ }; /* button_context_settings */
static const struct button_mapping button_context_settings_right_is_inc[] = { static const struct button_mapping button_context_settings_right_is_inc[] = {
@ -90,7 +92,7 @@ static const struct button_mapping button_context_bmark[] = {
}; /* button_context_bmark */ }; /* button_context_bmark */
static const struct button_mapping button_context_time[] = { static const struct button_mapping button_context_time[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
}; /* button_context_time */ }; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = { static const struct button_mapping button_context_quickscreen[] = {
@ -99,10 +101,14 @@ static const struct button_mapping button_context_quickscreen[] = {
}; /* button_context_quickscreen */ }; /* button_context_quickscreen */
static const struct button_mapping button_context_pitchscreen[] = { static const struct button_mapping button_context_pitchscreen[] = {
{ ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_pitchcreen */ }; /* button_context_pitchcreen */
/** FM Radio Screen **/ /** FM Radio Screen **/
static const struct button_mapping button_context_radio[] = { static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */ }; /* button_context_radio */
@ -112,6 +118,8 @@ static const struct button_mapping button_context_keyboard[] = {
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
static const struct button_mapping button_context_usb_hid[] = { static const struct button_mapping button_context_usb_hid[] = {
{ ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER },
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_usb_hid */ }; /* button_context_usb_hid */
#endif #endif

View file

@ -501,6 +501,7 @@ Jonas Aaberg
Junio C Hamano Junio C Hamano
Bob Cousins Bob Cousins
Christophe Nicolas Christophe Nicolas
Yann Muller
The libmad team The libmad team
The wavpack team The wavpack team

View file

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#ifndef VX777 #ifndef ONDA_VX777
#define HAS_BUTTON_HOLD #define HAS_BUTTON_HOLD
#endif #endif