Initial Cowon D2 commit:

* bootloader test program (basic LCD & button drivers, reads touchscreen)
* work-in-progress stubs for main build


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

5 files changed, 206 insertions, 1 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 38192316a6..c93c5bcc1f 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -164,4 +164,6 @@ keymaps/keymap-av300.c
 keymaps/keymap-mr500.c
 #elif CONFIG_KEYPAD == MROBE100_PAD
 keymaps/keymap-mr100.c
+#elif CONFIG_KEYPAD == COWOND2_PAD
+keymaps/keymap-cowond2.c
 #endif
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
new file mode 100644
index 0000000000..ab4216e9cf
--- /dev/null
+++ b/apps/keymaps/keymap-cowond2.c
@@ -0,0 +1,177 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id
+ *
+ * Copyright (C) 2008 Rob Purchase
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for the Cowon D2 target */
+/* Some of these mappings are rather 'creative', given it only has 3 buttons! */
+
+#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[]  = {
+    { ACTION_STD_PREV,        BUTTON_MINUS,               BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_PLUS,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_PLUS|BUTTON_REPEAT,  BUTTON_NONE },
+
+    { ACTION_STD_OK,          BUTTON_MENU|BUTTON_REL,     BUTTON_NONE },
+    //{ ACTION_STD_OK,          BUTTON_RIGHT,               BUTTON_NONE },
+    //{ ACTION_STD_OK,          BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+
+    { ACTION_STD_MENU,        BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
+   // { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CONTEXT,     BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_POWER,               BUTTON_NONE },
+//    { ACTION_STD_CANCEL,      BUTTON_LEFT,                BUTTON_NONE },
+//    { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+
+static const struct button_mapping button_context_wps[]  = {
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+static const struct button_mapping button_context_list[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+
+static const struct button_mapping button_context_tree[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
+static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_settings[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_PLUS,                  BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_PLUS|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_MINUS,                 BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_MINUS|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_OK,                BUTTON_MENU,                  BUTTON_NONE },
+    { 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[]  = {
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settingsgraphical */
+
+static const struct button_mapping button_context_yesno[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping button_context_colorchooser[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
+
+static const struct button_mapping button_context_eq[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
+
+static const struct button_mapping button_context_time[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+}; /* button_context_time */
+
+static const struct button_mapping button_context_quickscreen[]  = {
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
+
+static const struct button_mapping button_context_pitchscreen[]  = {
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchcreen */
+
+static const struct button_mapping button_context_keyboard[]  = {
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+
+extern int current_tick;
+const struct button_mapping* get_context_mapping(int context)
+{
+    switch (context&(~CONTEXT_REMOTE))
+    {
+        case CONTEXT_STD:
+            return button_context_standard;
+        case CONTEXT_WPS:
+            return button_context_wps;
+
+        case CONTEXT_LIST:
+            return button_context_list;
+        case CONTEXT_MAINMENU:
+        case CONTEXT_TREE:
+            if (global_settings.hold_lr_for_scroll_in_list)
+                return button_context_listtree_scroll_without_combo;
+            else
+                return button_context_listtree_scroll_with_combo;
+        case CONTEXT_CUSTOM|CONTEXT_TREE:
+            return button_context_tree;
+
+        case CONTEXT_SETTINGS:
+            return button_context_settings;
+        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+            return button_context_settings_right_is_inc;
+
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+            return button_context_colorchooser;
+        case CONTEXT_SETTINGS_EQ:
+            return button_context_eq;
+
+        case CONTEXT_SETTINGS_TIME:
+            return button_context_time;
+
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesno;
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
+        case CONTEXT_KEYBOARD:
+            return button_context_keyboard;
+    }
+    return button_context_standard;
+}
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 392544dbbf..4444934e36 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,4 +1,4 @@
-#ifndef OLYMPUS_MROBE_100
+#if !defined(OLYMPUS_MROBE_100)
 
 /* plugins common to all models */
 battery_bench.c
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index d277fe6d0d..e74ffc0315 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -130,6 +130,15 @@ const struct button_mapping generic_directions[] =
     { PLA_DOWN_REPEAT,       BUTTON_RC_DOWN|BUTTON_REPEAT,      BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE},
+#elif (CONFIG_KEYPAD == COWOND2_PAD)
+    { PLA_UP,                BUTTON_UP,                         BUTTON_NONE},
+    { PLA_DOWN,              BUTTON_DOWN,                       BUTTON_NONE},
+    { PLA_LEFT,              BUTTON_UP,                         BUTTON_MENU},
+    { PLA_RIGHT,             BUTTON_DOWN,                       BUTTON_MENU},
+    { PLA_UP_REPEAT,         BUTTON_UP|BUTTON_REPEAT,           BUTTON_NONE},
+    { PLA_DOWN_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_UP|BUTTON_REPEAT,           BUTTON_MENU},
+    { PLA_RIGHT_REPEAT,      BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_MENU},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
@@ -209,6 +218,13 @@ const struct button_mapping generic_left_right_fire[] =
     { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE},
     { PLA_FIRE,              BUTTON_RC_HEART,                   BUTTON_NONE},
     { PLA_FIRE_REPEAT,       BUTTON_RC_HEART|BUTTON_REPEAT,     BUTTON_NONE},
+#elif (CONFIG_KEYPAD == COWOND2_PAD)
+    { PLA_LEFT,              BUTTON_UP,                         BUTTON_NONE},
+    { PLA_RIGHT,             BUTTON_DOWN,                       BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_UP|BUTTON_REPEAT,           BUTTON_NONE},
+    { PLA_RIGHT_REPEAT,      BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE},
+    { PLA_FIRE,              BUTTON_MENU,                       BUTTON_NONE},
+    { PLA_FIRE_REPEAT,       BUTTON_MENU|BUTTON_REPEAT,         BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
@@ -307,6 +323,12 @@ const struct button_mapping generic_actions[] =
     {PLA_MENU,          BUTTON_RC_MODE,                     BUTTON_NONE},
     {PLA_FIRE,          BUTTON_RC_HEART,                    BUTTON_NONE},
     {PLA_FIRE_REPEAT,   BUTTON_RC_HEART|BUTTON_REPEAT,      BUTTON_NONE},
+#elif (CONFIG_KEYPAD == COWOND2_PAD)
+    {PLA_QUIT,          BUTTON_POWER,                       BUTTON_NONE},
+    {PLA_START,         BUTTON_UP,                          BUTTON_NONE},
+    {PLA_MENU,          BUTTON_DOWN,                        BUTTON_NONE},
+    {PLA_FIRE,          BUTTON_MENU,                        BUTTON_NONE},
+    {PLA_FIRE_REPEAT,   BUTTON_MENU|BUTTON_REPEAT,          BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index e877811365..a08a4a8a54 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -60,6 +60,10 @@ OUTPUT_FORMAT(elf32-sh)
 #define IRAMORIG DRAMORIG
 #define IRAMSIZE 0x4000
 #define IRAM DRAM
+#elif defined(CPU_TCC780X)
+#define DRAMORIG 0x20000000
+#define IRAMORIG 0x1000c000
+#define IRAMSIZE 0xc000
 #else
 #define DRAMORIG 0x09000000 + STUBOFFSET
 #endif