Set svn props and add Id to headers that were missing it.

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

15 files changed, 513 insertions, 505 deletions

diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index 47729d25a6..e528b9f311 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org>
  *
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c
index 64f162482e..70cb17ae1a 100755..100644
--- a/apps/keymaps/keymap-c100.c
+++ b/apps/keymaps/keymap-c100.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2007 Mark Arigo
  *
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 92d08177ab..2e412458e1 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id
+ * $Id$
  *
  * Copyright (C) 2008 Rob Purchase
  *
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c
index 12637f39f6..c66d19c5fa 100644
--- a/apps/keymaps/keymap-creativezv.c
+++ b/apps/keymaps/keymap-creativezv.c
@@ -1,256 +1,256 @@
-/***************************************************************************

- *             __________               __   ___.

- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___

- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /

- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <

- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \

- *                     \/            \/     \/    \/            \/

- * $Id$

- *

- * Copyright (C) 2008 by Maurus Cuelenaere

- *

+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 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 Creative Zen Vision target */

-/* Copied from ZVM target for now... */

-#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

- */

-

-/* CONTEXT_CUSTOM's used in this file...

-

-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)

-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens

-                                  i.e where up/down is inc/dec

-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec

-

-*/

-

-static const struct button_mapping button_context_standard[]  = {

-    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },

-

-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },

-    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },

-

-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },

-

-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },

-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },

-

-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },

-    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },

-

-    LAST_ITEM_IN_LIST

-}; /* button_context_standard */

-

-

-static const struct button_mapping button_context_wps[]  = {

-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },

-

-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },

-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },

-

-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },

-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },

-

-    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },

-    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },

-    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },

-

-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },

-

-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },

-

-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },

-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },

-    { ACTION_WPS_MENU,          BUTTON_POWER,                   BUTTON_NONE },

-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },

-

-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },

-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },

-    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[]  = {

-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },

-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },

-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)

-}; /* button_context_tree */

-

-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {

-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },

-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },

-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },

-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },

-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },

-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },

-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),

-};

-

-static const struct button_mapping button_context_settings[]  = {

-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },

-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },

-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },

-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },

-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },

-    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                    BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settings */

-

-static const struct button_mapping button_context_settings_right_is_inc[]  = {

-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },

-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },

-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },

-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settingsgraphical */

-

-static const struct button_mapping button_context_yesno[]  = {

-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settings_yesno */

-

-static const struct button_mapping button_context_colorchooser[]  = {

-    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

-}; /* button_context_colorchooser */

-

-static const struct button_mapping button_context_eq[]  = {

-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

-}; /* button_context_eq */

-

-/** Bookmark Screen **/

-static const struct button_mapping button_context_bmark[]  = {

-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },

-    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[]  = {

-    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },

-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },

-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },

-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },

-    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[]  = {

-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },

-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },

-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },

-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },

-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },

-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },

-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },

-    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },

-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },

-    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },

-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },

-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },

-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },

-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },

-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },

-    LAST_ITEM_IN_LIST

-}; /* button_context_keyboard */

-

-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:

-            return button_context_listtree_scroll_without_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;

-}

+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for the Creative Zen Vision target */
+/* Copied from ZVM target for now... */
+#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
+ */
+
+/* CONTEXT_CUSTOM's used in this file...
+
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
+                                  i.e where up/down is inc/dec
+               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
+
+*/
+
+static const struct button_mapping button_context_standard[]  = {
+    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },
+
+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },
+
+    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },
+
+    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
+
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },
+    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+
+static const struct button_mapping button_context_wps[]  = {
+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
+
+    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+
+    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
+
+    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },
+    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },
+    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },
+
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
+
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },
+
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
+    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
+    { ACTION_WPS_MENU,          BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
+
+    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
+    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[]  = {
+    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
+static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_settings[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                    BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_settings_right_is_inc[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settingsgraphical */
+
+static const struct button_mapping button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping button_context_colorchooser[]  = {
+    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
+
+static const struct button_mapping button_context_eq[]  = {
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
+    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[]  = {
+    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
+    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[]  = {
+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },
+    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+
+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:
+            return button_context_listtree_scroll_without_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/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c
index 16a3b8a778..4b0618e15d 100644
--- a/apps/keymaps/keymap-creativezvm.c
+++ b/apps/keymaps/keymap-creativezvm.c
@@ -1,255 +1,255 @@
-/***************************************************************************

- *             __________               __   ___.

- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___

- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /

- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <

- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \

- *                     \/            \/     \/    \/            \/

- * $Id$

- *

- * Copyright (C) 2008 by Maurus Cuelenaere

- *

+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 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 Creative Zen Vision:M 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

- */

-

-/* CONTEXT_CUSTOM's used in this file...

-

-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)

-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens

-                                  i.e where up/down is inc/dec

-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec

-

-*/

-

-static const struct button_mapping button_context_standard[]  = {

-    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },

-

-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },

-    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },

-

-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },

-

-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },

-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },

-

-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },

-    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },

-

-    LAST_ITEM_IN_LIST

-}; /* button_context_standard */

-

-

-static const struct button_mapping button_context_wps[]  = {

-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },

-

-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },

-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },

-

-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },

-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },

-

-    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },

-    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },

-    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },

-

-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },

-

-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },

-

-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },

-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },

-    { ACTION_WPS_MENU,          BUTTON_POWER,                   BUTTON_NONE },

-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },

-

-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },

-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },

-    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[]  = {

-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },

-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },

-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)

-}; /* button_context_tree */

-

-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {

-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },

-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },

-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },

-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },

-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },

-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },

-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),

-};

-

-static const struct button_mapping button_context_settings[]  = {

-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },

-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },

-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },

-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },

-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },

-    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                    BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settings */

-

-static const struct button_mapping button_context_settings_right_is_inc[]  = {

-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },

-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },

-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },

-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },

-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },

-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },

-    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settingsgraphical */

-

-static const struct button_mapping button_context_yesno[]  = {

-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

-}; /* button_context_settings_yesno */

-

-static const struct button_mapping button_context_colorchooser[]  = {

-    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

-}; /* button_context_colorchooser */

-

-static const struct button_mapping button_context_eq[]  = {

-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

-}; /* button_context_eq */

-

-/** Bookmark Screen **/

-static const struct button_mapping button_context_bmark[]  = {

-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },

-    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[]  = {

-    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },

-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },

-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },

-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },

-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },

-    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[]  = {

-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },

-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },

-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },

-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },

-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },

-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },

-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },

-    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },

-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },

-    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },

-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },

-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },

-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },

-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },

-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },

-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },

-    LAST_ITEM_IN_LIST

-}; /* button_context_keyboard */

-

-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:

-            return button_context_listtree_scroll_without_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;

-}

+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for the Creative Zen Vision:M 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
+ */
+
+/* CONTEXT_CUSTOM's used in this file...
+
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
+                                  i.e where up/down is inc/dec
+               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
+
+*/
+
+static const struct button_mapping button_context_standard[]  = {
+    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },
+
+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },
+
+    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },
+
+    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
+
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },
+    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+
+static const struct button_mapping button_context_wps[]  = {
+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
+
+    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+
+    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
+
+    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },
+    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },
+    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },
+
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
+
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },
+
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
+    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
+    { ACTION_WPS_MENU,          BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
+
+    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
+    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[]  = {
+    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
+static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_settings[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                    BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_settings_right_is_inc[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settingsgraphical */
+
+static const struct button_mapping button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping button_context_colorchooser[]  = {
+    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
+
+static const struct button_mapping button_context_eq[]  = {
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
+    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[]  = {
+    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
+    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[]  = {
+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },
+    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+
+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:
+            return button_context_listtree_scroll_without_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/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index efd377f8fd..b90870a158 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) Barry Wardell 2006
  *
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c
index e4a74cba0e..e4a74cba0e 100755..100644
--- a/apps/keymaps/keymap-hdd1630.c
+++ b/apps/keymaps/keymap-hdd1630.c
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index e24e0dc798..06631438bc 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2006 Tomasz Malesinski
  *
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index baf3917cbe..7d3c7216d9 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id $
+ * $Id$
  * 
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index 7ed2e5f3ae..7ed2e5f3ae 100755..100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c
index f9af353e67..6c09184931 100644
--- a/apps/keymaps/keymap-newtarget.c
+++ b/apps/keymaps/keymap-newtarget.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 200
  *
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index f6459a285c..39a8b55a1f 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 8bbdba9153..45fb2ebfbb 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 5787665b85..040aed65ac 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id$
  *
  * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org>
  *
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c
index 478eea3bfe..478eea3bfe 100755..100644
--- a/apps/keymaps/keymap-sa9200.c
+++ b/apps/keymaps/keymap-sa9200.c