diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-10-28 21:16:45 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-10-28 21:16:45 +0000 |
commit | e415395c5b789918383802d536ad51123e338daf (patch) | |
tree | 190f50caf7192f3b84458e9b52b7bbc387d42933 | |
parent | 48430bfabd5148bb3b27576f3e58b1b3350beac6 (diff) | |
download | rockbox-e415395c5b789918383802d536ad51123e338daf.tar.gz rockbox-e415395c5b789918383802d536ad51123e338daf.zip |
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
-rw-r--r-- | apps/keymaps/keymap-ondavx777.c | 12 | ||||
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-ondavx777.c b/apps/keymaps/keymap-ondavx777.c index f492a1964f..b9cf5c2a1e 100644 --- a/apps/keymaps/keymap-ondavx777.c +++ b/apps/keymaps/keymap-ondavx777.c | |||
@@ -39,11 +39,13 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | static const struct button_mapping button_context_standard[] = { | 41 | static const struct button_mapping button_context_standard[] = { |
42 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
42 | LAST_ITEM_IN_LIST | 43 | LAST_ITEM_IN_LIST |
43 | }; /* button_context_standard */ | 44 | }; /* button_context_standard */ |
44 | 45 | ||
45 | 46 | ||
46 | static const struct button_mapping button_context_wps[] = { | 47 | static const struct button_mapping button_context_wps[] = { |
48 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | ||
47 | LAST_ITEM_IN_LIST | 49 | LAST_ITEM_IN_LIST |
48 | }; /* button_context_wps */ | 50 | }; /* button_context_wps */ |
49 | 51 | ||
@@ -64,7 +66,7 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ | |||
64 | }; | 66 | }; |
65 | 67 | ||
66 | static const struct button_mapping button_context_settings[] = { | 68 | static const struct button_mapping button_context_settings[] = { |
67 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 69 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
68 | }; /* button_context_settings */ | 70 | }; /* button_context_settings */ |
69 | 71 | ||
70 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 72 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
@@ -90,7 +92,7 @@ static const struct button_mapping button_context_bmark[] = { | |||
90 | }; /* button_context_bmark */ | 92 | }; /* button_context_bmark */ |
91 | 93 | ||
92 | static const struct button_mapping button_context_time[] = { | 94 | static const struct button_mapping button_context_time[] = { |
93 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 95 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
94 | }; /* button_context_time */ | 96 | }; /* button_context_time */ |
95 | 97 | ||
96 | static const struct button_mapping button_context_quickscreen[] = { | 98 | static const struct button_mapping button_context_quickscreen[] = { |
@@ -99,10 +101,14 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
99 | }; /* button_context_quickscreen */ | 101 | }; /* button_context_quickscreen */ |
100 | 102 | ||
101 | static const struct button_mapping button_context_pitchscreen[] = { | 103 | static const struct button_mapping button_context_pitchscreen[] = { |
104 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
105 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
102 | }; /* button_context_pitchcreen */ | 106 | }; /* button_context_pitchcreen */ |
103 | 107 | ||
104 | /** FM Radio Screen **/ | 108 | /** FM Radio Screen **/ |
105 | static const struct button_mapping button_context_radio[] = { | 109 | static const struct button_mapping button_context_radio[] = { |
110 | { ACTION_FM_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
111 | { ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | ||
106 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
107 | }; /* button_context_radio */ | 113 | }; /* button_context_radio */ |
108 | 114 | ||
@@ -112,6 +118,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
112 | 118 | ||
113 | #ifdef USB_ENABLE_HID | 119 | #ifdef USB_ENABLE_HID |
114 | static const struct button_mapping button_context_usb_hid[] = { | 120 | static const struct button_mapping button_context_usb_hid[] = { |
121 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
122 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
115 | LAST_ITEM_IN_LIST | 123 | LAST_ITEM_IN_LIST |
116 | }; /* button_context_usb_hid */ | 124 | }; /* button_context_usb_hid */ |
117 | #endif | 125 | #endif |
diff --git a/docs/CREDITS b/docs/CREDITS index 42169f05c7..3ae87a5ae0 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -501,6 +501,7 @@ Jonas Aaberg | |||
501 | Junio C Hamano | 501 | Junio C Hamano |
502 | Bob Cousins | 502 | Bob Cousins |
503 | Christophe Nicolas | 503 | Christophe Nicolas |
504 | Yann Muller | ||
504 | 505 | ||
505 | The libmad team | 506 | The libmad team |
506 | The wavpack team | 507 | The wavpack team |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h index cadf4cc032..47982a0ba9 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include "config.h" | 24 | #include "config.h" |
25 | 25 | ||
26 | #ifndef VX777 | 26 | #ifndef ONDA_VX777 |
27 | #define HAS_BUTTON_HOLD | 27 | #define HAS_BUTTON_HOLD |
28 | #endif | 28 | #endif |
29 | 29 | ||