From e415395c5b789918383802d536ad51123e338daf Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Wed, 28 Oct 2009 21:16:45 +0000
Subject: [PATCH] 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
---
 apps/keymaps/keymap-ondavx777.c                      | 12 ++++++++++--
 docs/CREDITS                                         |  1 +
 .../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 @@
  */
 
 static const struct button_mapping button_context_standard[]  = {
+    { ACTION_STD_CANCEL,      BUTTON_POWER,                  BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
 
 static const struct button_mapping button_context_wps[]  = {
+    { ACTION_STD_KEYLOCK,  BUTTON_POWER,    BUTTON_NONE  },
     LAST_ITEM_IN_LIST
 }; /* 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[]  = {
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    { ACTION_STD_CANCEL,            BUTTON_POWER,               BUTTON_NONE },    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings */
 
 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 */
 
 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 */
 
 static const struct button_mapping button_context_quickscreen[]  = {
@@ -99,10 +101,14 @@ static const struct button_mapping button_context_quickscreen[]  = {
 }; /* button_context_quickscreen */
 
 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 */
 
 /** FM Radio Screen **/
 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)
 }; /* button_context_radio */
 
@@ -112,6 +118,8 @@ static const struct button_mapping button_context_keyboard[]  = {
 
 #ifdef USB_ENABLE_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
 }; /* button_context_usb_hid */
 #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
 Junio C Hamano
 Bob Cousins
 Christophe Nicolas
+Yann Muller
 
 The libmad team
 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 @@
 
 #include "config.h"
 
-#ifndef VX777
+#ifndef ONDA_VX777
 #define HAS_BUTTON_HOLD
 #endif