Make Onda VX767 compile + restructure firmware/SOURCES a bit (wrt Jz4740 specific files)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20297 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 126 insertions, 8 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 567839fce5..6b60365694 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -223,4 +223,6 @@ keymaps/keymap-logikdax.c
 keymaps/keymap-fuze.c
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 keymaps/keymap-ondavx747.c
+#elif CONFIG_KEYPAD == ONDAVX767_PAD
+keymaps/keymap-ondavx767.c
 #endif
diff --git a/apps/keymaps/keymap-ondavx767.c b/apps/keymaps/keymap-ondavx767.c
new file mode 100644
index 0000000000..7dd7435348
--- /dev/null
+++ b/apps/keymaps/keymap-ondavx767.c
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Maurus Cuelenaere
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for the Onda VX767 target */
+/* This needs from someone with the actual target! */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/* 
+ * The format of the list is as follows
+ * { Action Code,   Button code,    Prereq button code } 
+ * 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 
+ */
+static const struct button_mapping button_context_standard[]  = {
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+static const struct button_mapping button_context_wps[]  = {
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+
+
+/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
+const struct button_mapping* get_context_mapping(int context)
+{
+    switch (context)
+    {
+        case CONTEXT_STD:
+            return button_context_standard;
+        case CONTEXT_WPS:
+            return button_context_wps;
+            
+        case CONTEXT_TREE:
+        case CONTEXT_LIST:
+        case CONTEXT_MAINMENU:
+            
+        case CONTEXT_SETTINGS:
+        case CONTEXT_SETTINGS|CONTEXT_REMOTE:
+        default:
+            return button_context_standard;
+    } 
+    return button_context_standard;
+}
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 98569c4896..29ee03d040 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1225,7 +1225,8 @@ drivers/qt1106.c
 #endif /* SIMULATOR */
 #endif /* MEIZU_M3 */
 
-#if CONFIG_CPU==JZ4732 && !defined(SIMULATOR)
+#ifndef SIMULATOR
+#if CONFIG_CPU == JZ4732
 target/mips/ingenic_jz47xx/ata-nand-jz4740.c
 target/mips/ingenic_jz47xx/ata-sd-jz4740.c
 target/mips/ingenic_jz47xx/debug-jz4740.c
@@ -1237,21 +1238,23 @@ target/mips/ingenic_jz47xx/usb-jz4740.c
 #ifndef BOOTLOADER
 target/mips/ingenic_jz47xx/codec-jz4740.c
 target/mips/ingenic_jz47xx/pcm-jz4740.c
-#endif
+#endif /* BOOTLOADER */
 drivers/nand_id.c
-#endif
+#endif /* CONFIG_CPU == JZ4732 */
 
-#if (defined(ONDA_VX747) || defined(ONDA_VX747P)) && !defined(SIMULATOR)
+#if defined(ONDA_VX747) || defined(ONDA_VX747P)
 target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c
 target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c
-target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
 target/mips/ingenic_jz47xx/onda_vx747/power-onda_vx747.c
+target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
 target/mips/ingenic_jz47xx/onda_vx747/speaker-onda_vx747.c
-#endif
+#endif /* ONDA_VX747 || ONDA_VX747P */
 
-#if defined(ONDA_VX767) && !defined(SIMULATOR)
+#ifdef ONDA_VX767
 target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx7X7.c
 target/mips/ingenic_jz47xx/onda_vx767/button-onda_vx767.c
 target/mips/ingenic_jz47xx/onda_vx767/lcd-onda_vx767.c
+target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
 target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c
-#endif
+#endif /* ONDA_VX767 */
+#endif /* SIMULATOR */
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
new file mode 100644
index 0000000000..8d007e292a
--- /dev/null
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/power-onda_vx767.c
@@ -0,0 +1,41 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Maurus Cuelenaere
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "power.h"
+#include "jz4740.h"
+
+/* TODO! */
+
+/* Detect which power sources are present. */
+unsigned int power_input_status(void)
+{
+    return 0;
+}
+
+void power_init(void)
+{
+}
+
+bool charging_state(void)
+{
+    return false;
+}