95 files changed, 4408 insertions, 523 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index a84c01977f..67fe678287 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -311,6 +311,10 @@ keymaps/keymap-nwza860.c
 keymaps/keymap-ypz5.c
 #elif CONFIG_KEYPAD == IHIFI_PAD
 keymaps/keymap-ihifi.c
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+keymaps/keymap-ihifi770.c
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+keymaps/keymap-ihifi800.c
 #elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD
 keymaps/keymap-ypr1.c
 #elif CONFIG_KEYPAD == DX50_PAD
diff --git a/apps/keymaps/keymap-ihifi770.c b/apps/keymaps/keymap-ihifi770.c
new file mode 100644
index 0000000000..c5671bd650
--- /dev/null
+++ b/apps/keymaps/keymap-ihifi770.c
@@ -0,0 +1,203 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 IHIFI 770/770C targets */
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+/* {Action Code,    Button code,    Prereq button code } */
+/*
+ * 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_PREV,                      BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_STD_CONTEXT,     BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_HOME,                      BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+static const struct button_mapping button_context_wps[] = {
+    { ACTION_WPS_SKIPPREV,    BUTTON_PREV|BUTTON_REL,           BUTTON_PREV },
+    { ACTION_WPS_SEEKBACK,    BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_PREV|BUTTON_REL,           BUTTON_PREV|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,    BUTTON_NEXT|BUTTON_REL,           BUTTON_NEXT },
+    { ACTION_WPS_SEEKFWD,     BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_NEXT|BUTTON_REL,           BUTTON_NEXT|BUTTON_REPEAT },
+    { ACTION_WPS_VOLUP,       BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,       BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_PLAY,        BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_WPS_CONTEXT,     BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_MENU,        BUTTON_HOME|BUTTON_REL,           BUTTON_HOME },
+    { ACTION_WPS_BROWSE,      BUTTON_HOME|BUTTON_REPEAT,        BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+static const struct button_mapping button_context_list[] = {
+    { ACTION_LIST_VOLUP,      BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_LIST_VOLUP,      BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[] = {
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_bmark */
+/** Keyboard **/
+static const struct button_mapping button_context_keyboard[] = {
+    { ACTION_KBD_LEFT,        BUTTON_HOME,                      BUTTON_NONE },
+    { ACTION_KBD_LEFT,        BUTTON_HOME|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_RIGHT,       BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_KBD_RIGHT,       BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_KBD_UP,          BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_KBD_UP,          BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_DOWN,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_KBD_DOWN,        BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,   BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,   BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_SELECT,      BUTTON_PLAY,                      BUTTON_NONE },
+    { ACTION_KBD_DONE,        BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    { ACTION_KBD_ABORT,       BUTTON_POWER,                     BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+/** Pitchscreen **/
+static const struct button_mapping button_context_pitchscreen[] = {
+    { ACTION_PS_INC_SMALL,    BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_PS_INC_BIG,      BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,    BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,      BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,   BUTTON_HOME,                      BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF, BUTTON_HOME|BUTTON_REL,          BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,  BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_VOL_DOWN|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_RESET,        BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,  BUTTON_PLAY,                      BUTTON_NONE },
+    { ACTION_PS_EXIT,         BUTTON_POWER,                     BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchscreen */
+/** Quickscreen **/
+static const struct button_mapping button_context_quickscreen[] = {
+    { ACTION_QS_TOP,          BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_QS_TOP,          BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_DOWN,         BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_QS_DOWN,         BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_LEFT,         BUTTON_HOME,                      BUTTON_NONE },
+    { ACTION_QS_LEFT,         BUTTON_HOME|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_RIGHT,        BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_QS_RIGHT,        BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_POWER,                     BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
+/** Settings - General Mappings **/
+static const struct button_mapping button_context_settings[] = {
+    { ACTION_STD_PREV,        BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_SETTINGS_RESET,  BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+static const struct button_mapping button_context_settings_vol_is_inc[] = {
+    { ACTION_SETTINGS_INC,    BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,    BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_right_is_inc */
+/** Tree **/
+static const struct button_mapping button_context_tree[] = {
+    { ACTION_TREE_WPS,        BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+/** Yes/No Screen **/
+static const struct button_mapping button_context_yesnoscreen[] = {
+    { ACTION_YESNO_ACCEPT,    BUTTON_PLAY,                      BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesnoscreen */
+/* 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_LIST:
+            return button_context_list;
+        case CONTEXT_STD:
+            return button_context_standard;
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+        case CONTEXT_KEYBOARD:
+            return button_context_keyboard;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+        case CONTEXT_SETTINGS:
+            return button_context_settings;
+        case CONTEXT_SETTINGS_TIME:
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+        case CONTEXT_SETTINGS_EQ:
+        case CONTEXT_SETTINGS_RECTRIGGER:
+            return button_context_settings_vol_is_inc;
+        case CONTEXT_TREE:
+        case CONTEXT_MAINMENU:
+            return button_context_tree;
+        case CONTEXT_WPS:
+            return button_context_wps;
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesnoscreen;
+    }
+    return button_context_standard;
+}
diff --git a/apps/keymaps/keymap-ihifi800.c b/apps/keymaps/keymap-ihifi800.c
new file mode 100644
index 0000000000..b56bd018eb
--- /dev/null
+++ b/apps/keymaps/keymap-ihifi800.c
@@ -0,0 +1,207 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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.
+ *
+ ****************************************************************************/
+/* TODO */
+/* Button Code Definitions for IHIFI 800 targets */
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+/* {Action Code,    Button code,    Prereq button code } */
+/*
+ * 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_PREV,                      BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_STD_OK,          BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_STD_CONTEXT,     BUTTON_POWER|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_HOME,                      BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+static const struct button_mapping button_context_wps[] = {
+    { ACTION_WPS_SKIPPREV,    BUTTON_PREV|BUTTON_REL,           BUTTON_PREV },
+    { ACTION_WPS_SEEKBACK,    BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_PREV|BUTTON_REL,           BUTTON_PREV|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,    BUTTON_NEXT|BUTTON_REL,           BUTTON_NEXT },
+    { ACTION_WPS_SEEKFWD,     BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_NEXT|BUTTON_REL,           BUTTON_NEXT|BUTTON_REPEAT },
+    { ACTION_WPS_VOLUP,       BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,       BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_PLAY,        BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_WPS_QUICKSCREEN, BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    { ACTION_WPS_CONTEXT,     BUTTON_POWER|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_WPS_MENU,        BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_WPS_BROWSE,      BUTTON_HOME|BUTTON_REL,           BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+static const struct button_mapping button_context_list[] = {
+    { ACTION_LIST_VOLUP,      BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_LIST_VOLUP,      BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[] = {
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_bmark */
+/** Keyboard **/
+static const struct button_mapping button_context_keyboard[] = {
+    { ACTION_KBD_ABORT,       BUTTON_HOME,                      BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,   BUTTON_HOME|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_LEFT,        BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_KBD_LEFT,        BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_KBD_UP,          BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_KBD_UP,          BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_DOWN,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_KBD_DOWN,        BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_RIGHT,       BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_KBD_RIGHT,       BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_SELECT,      BUTTON_PLAY,                      BUTTON_NONE },
+    { ACTION_KBD_DONE,        BUTTON_POWER,                     BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+/** Pitchscreen **/
+static const struct button_mapping button_context_pitchscreen[] = {
+    { ACTION_PS_INC_SMALL,    BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_PS_INC_BIG,      BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,    BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,      BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,   BUTTON_HOME,                      BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF, BUTTON_HOME|BUTTON_REL,          BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,  BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_VOL_DOWN|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_RESET,        BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,  BUTTON_PLAY,                      BUTTON_NONE },
+    { ACTION_PS_EXIT,         BUTTON_POWER,                     BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchscreen */
+/** Quickscreen **/
+static const struct button_mapping button_context_quickscreen[] = {
+    { ACTION_QS_TOP,          BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_QS_TOP,          BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_DOWN,         BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_QS_DOWN,         BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_LEFT,         BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_QS_LEFT,         BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_QS_RIGHT,        BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_QS_RIGHT,        BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_HOME,                      BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
+/** Settings - General Mappings **/
+static const struct button_mapping button_context_settings[] = {
+    { ACTION_STD_PREV,        BUTTON_PREV,                      BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_PREV|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_NEXT,                      BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_NEXT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_STD_OK,          BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_SETTINGS_RESET,  BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+static const struct button_mapping button_context_settings_vol_is_inc[] = {
+    { ACTION_SETTINGS_INC,    BUTTON_VOL_UP,                    BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,    BUTTON_VOL_DOWN,                  BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_right_is_inc */
+/** Tree **/
+static const struct button_mapping button_context_tree[] = {
+    { ACTION_TREE_WPS,        BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+/** Yes/No Screen **/
+static const struct button_mapping button_context_yesnoscreen[] = {
+    { ACTION_YESNO_ACCEPT,    BUTTON_PLAY,                      BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesnoscreen */
+/* 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_LIST:
+            return button_context_list;
+        case CONTEXT_STD:
+            return button_context_standard;
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+        case CONTEXT_KEYBOARD:
+            return button_context_keyboard;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+        case CONTEXT_SETTINGS:
+            return button_context_settings;
+        case CONTEXT_SETTINGS_TIME:
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+        case CONTEXT_SETTINGS_EQ:
+        case CONTEXT_SETTINGS_RECTRIGGER:
+            return button_context_settings_vol_is_inc;
+        case CONTEXT_TREE:
+        case CONTEXT_MAINMENU:
+            return button_context_tree;
+        case CONTEXT_WPS:
+            return button_context_wps;
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesnoscreen;
+    }
+    return button_context_standard;
+}
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index a2a23d0627..ed1cadfb9e 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13230,6 +13230,34 @@
  </voice>
 </phrase>
 <phrase>
+  id: LANG_FILTER_SHORT
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Short"
+  </source>
+  <dest>
+    *: "Short"
+  </dest>
+  <voice>
+    *: "Short"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BYPASS
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Bypass"
+  </source>
+  <dest>
+    *: "Bypass"
+  </dest>
+  <voice>
+    *: "Bypass"
+  </voice>
+</phrase>
+<phrase>
  id: LANG_VOLUME_LIMIT
  desc: in sound_settings
  user: core
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 42551ae26e..e744542e1c 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -13138,6 +13138,34 @@
  </voice>
 </phrase>
 <phrase>
+  id: LANG_FILTER_SHORT
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Short"
+  </source>
+  <dest>
+    *: "Short"
+  </dest>
+  <voice>
+    *: "Short"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BYPASS
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Bypass"
+  </source>
+  <dest>
+    *: "Bypass"
+  </dest>
+  <voice>
+    *: "Bypass"
+  </voice>
+</phrase>
+<phrase>
  id: LANG_COMPRESSOR_ATTACK
  desc: in sound settings
  user: core
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 9a48ef2fdb..13f01d7867 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -285,6 +285,18 @@
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "POWER"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define BATTERY_ON      BUTTON_PLAY
+#define BATTERY_OFF     BUTTON_POWER
+#define BATTERY_ON_TXT  "PLAY - start"
+#define BATTERY_OFF_TXT "POWER"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define BATTERY_ON      BUTTON_PLAY
+#define BATTERY_OFF     BUTTON_POWER
+#define BATTERY_ON_TXT  "PLAY - start"
+#define BATTERY_OFF_TXT "POWER"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 6c3e487bf2..27881bf6e9 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -589,6 +589,38 @@ enum {
 #define BJACK_RIGHT         BUTTON_NEXT
 #define BJACK_LEFT          BUTTON_PREV
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define BJACK_SELECT_NAME   "PLAY"
+#define BJACK_STAY_NAME     "NEXT"
+#define BJACK_QUIT_NAME     "POWER"
+#define BJACK_DOUBLE_NAME   "PREV"
+#define BJACK_SELECT        BUTTON_PLAY
+#define BJACK_QUIT          BUTTON_POWER
+#define BJACK_MAX           BUTTON_VOL_UP
+#define BJACK_MIN           BUTTON_VOL_DOWN
+#define BJACK_STAY          BUTTON_NEXT
+#define BJACK_DOUBLEDOWN    BUTTON_PREV
+#define BJACK_UP            BUTTON_HOME
+#define BJACK_DOWN          (BUTTON_POWER | BUTTON_HOME)
+#define BJACK_RIGHT         BUTTON_NEXT
+#define BJACK_LEFT          BUTTON_PREV
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define BJACK_SELECT_NAME   "PLAY"
+#define BJACK_STAY_NAME     "NEXT"
+#define BJACK_QUIT_NAME     "POWER"
+#define BJACK_DOUBLE_NAME   "PREV"
+#define BJACK_SELECT        BUTTON_PLAY
+#define BJACK_QUIT          BUTTON_POWER
+#define BJACK_MAX           BUTTON_VOL_UP
+#define BJACK_MIN           BUTTON_VOL_DOWN
+#define BJACK_STAY          BUTTON_NEXT
+#define BJACK_DOUBLEDOWN    BUTTON_PREV
+#define BJACK_UP            BUTTON_HOME
+#define BJACK_DOWN          (BUTTON_POWER | BUTTON_HOME)
+#define BJACK_RIGHT         BUTTON_NEXT
+#define BJACK_LEFT          BUTTON_PREV
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 24c6fab613..f7c9f9adf2 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -342,6 +342,26 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_HOME
 #define DOWN      BUTTON_OPTION
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define QUIT      BUTTON_POWER
+#define LEFT      BUTTON_HOME
+#define RIGHT     BUTTON_VOL_DOWN
+#define ALTLEFT   (BUTTON_POWER | BUTTON_HOME)
+#define ALTRIGHT  (BUTTON_POWER | BUTTON_VOL_UP)
+#define SELECT    BUTTON_PLAY
+#define UP        BUTTON_PREV
+#define DOWN      BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define QUIT      BUTTON_POWER
+#define LEFT      BUTTON_HOME
+#define RIGHT     BUTTON_VOL_DOWN
+#define ALTLEFT   (BUTTON_POWER | BUTTON_HOME)
+#define ALTRIGHT  (BUTTON_POWER | BUTTON_VOL_UP)
+#define SELECT    BUTTON_PLAY
+#define UP        BUTTON_PREV
+#define DOWN      BUTTON_NEXT
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index f10bca66ec..a4a29ff6ac 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -536,6 +536,28 @@ F3: equal to "="
 #define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
 #define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CALCULATOR_LEFT      BUTTON_HOME
+#define CALCULATOR_RIGHT     BUTTON_VOL_DOWN
+#define CALCULATOR_UP        BUTTON_PREV
+#define CALCULATOR_DOWN      BUTTON_NEXT
+#define CALCULATOR_QUIT      BUTTON_POWER
+#define CALCULATOR_INPUT_CALC_PRE (BUTTON_HOME|BUTTON_REPEAT)
+#define CALCULATOR_INPUT     (BUTTON_PLAY|BUTTON_REL)
+#define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
+#define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CALCULATOR_LEFT      BUTTON_HOME
+#define CALCULATOR_RIGHT     BUTTON_VOL_DOWN
+#define CALCULATOR_UP        BUTTON_PREV
+#define CALCULATOR_DOWN      BUTTON_NEXT
+#define CALCULATOR_QUIT      BUTTON_POWER
+#define CALCULATOR_INPUT_CALC_PRE (BUTTON_HOME|BUTTON_REPEAT)
+#define CALCULATOR_INPUT     (BUTTON_PLAY|BUTTON_REL)
+#define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
+#define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 74ee49904b..56f9bde193 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -423,6 +423,26 @@
 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
 #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CALENDAR_QUIT       BUTTON_POWER
+#define CALENDAR_SELECT     BUTTON_PLAY
+#define CALENDAR_NEXT_WEEK  (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define CALENDAR_PREV_WEEK  (BUTTON_POWER | BUTTON_VOL_UP)
+#define CALENDAR_NEXT_DAY   BUTTON_NEXT
+#define CALENDAR_PREV_DAY   BUTTON_PREV
+#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN
+#define CALENDAR_PREV_MONTH BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CALENDAR_QUIT       BUTTON_POWER
+#define CALENDAR_SELECT     BUTTON_PLAY
+#define CALENDAR_NEXT_WEEK  (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define CALENDAR_PREV_WEEK  (BUTTON_POWER | BUTTON_VOL_UP)
+#define CALENDAR_NEXT_DAY   BUTTON_NEXT
+#define CALENDAR_PREV_DAY   BUTTON_PREV
+#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN
+#define CALENDAR_PREV_MONTH BUTTON_VOL_UP
 #else
 #error "No keypad setting."
 #endif
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 8f3032fe15..1159d0c7d1 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -572,6 +572,34 @@
 #define CB_SCROLL_LEFT   (BUTTON_PREV|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_NEXT|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CB_SELECT  BUTTON_PLAY
+#define CB_UP      BUTTON_PREV
+#define CB_DOWN    BUTTON_NEXT
+#define CB_LEFT    BUTTON_HOME
+#define CB_RIGHT   BUTTON_VOL_DOWN
+#define CB_PLAY    BUTTON_VOL_UP
+#define CB_LEVEL   (BUTTON_PLAY|BUTTON_REPEAT)
+#define CB_MENU    BUTTON_POWER
+#define CB_SCROLL_UP     (BUTTON_PREV|BUTTON_REPEAT)
+#define CB_SCROLL_DOWN   (BUTTON_NEXT|BUTTON_REPEAT)
+#define CB_SCROLL_LEFT   (BUTTON_HOME|BUTTON_REPEAT)
+#define CB_SCROLL_RIGHT  (BUTTON_VOL_UP|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CB_SELECT  BUTTON_PLAY
+#define CB_UP      BUTTON_PREV
+#define CB_DOWN    BUTTON_NEXT
+#define CB_LEFT    BUTTON_HOME
+#define CB_RIGHT   BUTTON_VOL_DOWN
+#define CB_PLAY    BUTTON_VOL_UP
+#define CB_LEVEL   (BUTTON_PLAY|BUTTON_REPEAT)
+#define CB_MENU    BUTTON_POWER
+#define CB_SCROLL_UP     (BUTTON_PREV|BUTTON_REPEAT)
+#define CB_SCROLL_DOWN   (BUTTON_NEXT|BUTTON_REPEAT)
+#define CB_SCROLL_LEFT   (BUTTON_HOME|BUTTON_REPEAT)
+#define CB_SCROLL_RIGHT  (BUTTON_VOL_UP|BUTTON_REPEAT)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index ae7889ed95..6b07e1bab5 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -422,6 +422,26 @@
 #define CHC_SETTINGS_OK     BUTTON_PLAY
 #define CHC_SETTINGS_CANCEL BUTTON_POWER
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CHC_QUIT            BUTTON_POWER
+#define CHC_STARTSTOP       BUTTON_PLAY
+#define CHC_RESET           (BUTTON_PLAY|BUTTON_REPEAT)
+#define CHC_MENU            BUTTON_HOME
+#define CHC_SETTINGS_INC    BUTTON_VOL_UP
+#define CHC_SETTINGS_DEC    BUTTON_VOL_DOWN
+#define CHC_SETTINGS_OK     BUTTON_PLAY
+#define CHC_SETTINGS_CANCEL BUTTON_HOME
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CHC_QUIT            BUTTON_POWER
+#define CHC_STARTSTOP       BUTTON_PLAY
+#define CHC_RESET           (BUTTON_PLAY|BUTTON_REPEAT)
+#define CHC_MENU            BUTTON_HOME
+#define CHC_SETTINGS_INC    BUTTON_VOL_UP
+#define CHC_SETTINGS_DEC    BUTTON_VOL_DOWN
+#define CHC_SETTINGS_OK     BUTTON_PLAY
+#define CHC_SETTINGS_CANCEL BUTTON_HOME
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 153558667e..58d80a2ccf 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1291,6 +1291,22 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define CHIP8_KEY6 BUTTON_NEXT
 #define CHIP8_KEY8 BUTTON_OPTION
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CHIP8_OFF  BUTTON_POWER
+#define CHIP8_KEY2 BUTTON_NEXT
+#define CHIP8_KEY4 BUTTON_HOME
+#define CHIP8_KEY5 BUTTON_VOL_UP
+#define CHIP8_KEY6 BUTTON_VOL_DOWN
+#define CHIP8_KEY8 BUTTON_PREV
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CHIP8_OFF  BUTTON_POWER
+#define CHIP8_KEY2 BUTTON_NEXT
+#define CHIP8_KEY4 BUTTON_HOME
+#define CHIP8_KEY5 BUTTON_VOL_UP
+#define CHIP8_KEY6 BUTTON_VOL_DOWN
+#define CHIP8_KEY8 BUTTON_PREV
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 1732a16ecb..249cfe9715 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -214,6 +214,16 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define ACTION     BUTTON_PLAY
 #define ACTIONTEXT "PLAY"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define QUIT       BUTTON_POWER
+#define ACTION     BUTTON_PLAY
+#define ACTIONTEXT "PLAY"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define QUIT       BUTTON_POWER
+#define ACTION     BUTTON_PLAY
+#define ACTIONTEXT "PLAY"
 #elif !defined(HAVE_TOUCHSCREEN)
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index b2580a1630..c6364b14b4 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -284,6 +284,22 @@
 #define CLIX_BUTTON_RIGHT         BUTTON_NEXT
 #define CLIX_BUTTON_CLICK         BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define CLIX_BUTTON_QUIT          BUTTON_POWER
+#define CLIX_BUTTON_UP            BUTTON_PREV
+#define CLIX_BUTTON_DOWN          BUTTON_NEXT
+#define CLIX_BUTTON_LEFT          BUTTON_HOME
+#define CLIX_BUTTON_RIGHT         BUTTON_VOL_DOWN
+#define CLIX_BUTTON_CLICK         BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define CLIX_BUTTON_QUIT          BUTTON_POWER
+#define CLIX_BUTTON_UP            BUTTON_PREV
+#define CLIX_BUTTON_DOWN          BUTTON_NEXT
+#define CLIX_BUTTON_LEFT          BUTTON_HOME
+#define CLIX_BUTTON_RIGHT         BUTTON_VOL_DOWN
+#define CLIX_BUTTON_CLICK         BUTTON_VOL_UP
 #else
 #error "no keymap"
 #endif
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 9a67c337d1..cad57f9ed6 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -423,6 +423,26 @@
 #define CUBE_PAUSE         BUTTON_HOME
 #define CUBE_HIGHSPEED     BUTTON_PLAY
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define CUBE_QUIT          BUTTON_POWER
+#define CUBE_NEXT          BUTTON_NEXT
+#define CUBE_PREV          BUTTON_PREV
+#define CUBE_INC           BUTTON_VOL_UP
+#define CUBE_DEC           BUTTON_VOL_DOWN
+#define CUBE_MODE          (BUTTON_HOME | BUTTON_POWER)
+#define CUBE_PAUSE         BUTTON_HOME
+#define CUBE_HIGHSPEED     BUTTON_PLAY
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define CUBE_QUIT          BUTTON_POWER
+#define CUBE_NEXT          BUTTON_NEXT
+#define CUBE_PREV          BUTTON_PREV
+#define CUBE_INC           BUTTON_VOL_UP
+#define CUBE_DEC           BUTTON_VOL_DOWN
+#define CUBE_MODE          (BUTTON_HOME | BUTTON_POWER)
+#define CUBE_PAUSE         BUTTON_HOME
+#define CUBE_HIGHSPEED     BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index d734e1e12b..41194670bf 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -566,6 +566,30 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define DOOMBUTTON_UP      BUTTON_PREV
+#define DOOMBUTTON_DOWN    BUTTON_NEXT
+#define DOOMBUTTON_LEFT    BUTTON_HOME
+#define DOOMBUTTON_RIGHT   BUTTON_VOL_DOWN
+#define DOOMBUTTON_OPEN    BUTTON_PLAY
+#define DOOMBUTTON_ESC     BUTTON_POWER
+#define DOOMBUTTON_ENTER   BUTTON_VOL_UP
+#define DOOMBUTTON_SHOOT   BUTTON_VOL_UP
+#define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
+#define DOOMBUTTON_MAP     (BUTTON_POWER|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define DOOMBUTTON_UP      BUTTON_PREV
+#define DOOMBUTTON_DOWN    BUTTON_NEXT
+#define DOOMBUTTON_LEFT    BUTTON_HOME
+#define DOOMBUTTON_RIGHT   BUTTON_VOL_DOWN
+#define DOOMBUTTON_OPEN    BUTTON_PLAY
+#define DOOMBUTTON_ESC     BUTTON_POWER
+#define DOOMBUTTON_ENTER   BUTTON_VOL_UP
+#define DOOMBUTTON_SHOOT   BUTTON_VOL_UP
+#define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
+#define DOOMBUTTON_MAP     (BUTTON_POWER|BUTTON_REPEAT)
 #else
 #error Keymap not defined!
 #endif
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index e5750c109a..d56e37f9e2 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -343,6 +343,24 @@ GREY_INFO_STRUCT
 #   define FFT_AMP_SCALE    BUTTON_PLAY
 #   define FFT_QUIT         BUTTON_POWER
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#   define FFT_PREV_GRAPH   BUTTON_PREV
+#   define FFT_NEXT_GRAPH   BUTTON_NEXT
+#   define FFT_ORIENTATION  BUTTON_HOME
+#   define FFT_FREQ_SCALE   BUTTON_VOL_UP
+#   define FFT_WINDOW       BUTTON_VOL_DOWN
+#   define FFT_AMP_SCALE    BUTTON_PLAY
+#   define FFT_QUIT         BUTTON_POWER
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#   define FFT_PREV_GRAPH   BUTTON_PREV
+#   define FFT_NEXT_GRAPH   BUTTON_NEXT
+#   define FFT_ORIENTATION  BUTTON_HOME
+#   define FFT_FREQ_SCALE   BUTTON_VOL_UP
+#   define FFT_WINDOW       BUTTON_VOL_DOWN
+#   define FFT_AMP_SCALE    BUTTON_PLAY
+#   define FFT_QUIT         BUTTON_POWER
 #elif !defined(HAVE_TOUCHSCREEN)
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index b089974aef..c108939a95 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -494,6 +494,30 @@
 #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY)
 #define FLIPIT_TOGGLE       BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define FLIPIT_LEFT         BUTTON_HOME
+#define FLIPIT_RIGHT        BUTTON_VOL_DOWN
+#define FLIPIT_UP           BUTTON_PREV
+#define FLIPIT_DOWN         BUTTON_NEXT
+#define FLIPIT_QUIT         BUTTON_POWER
+#define FLIPIT_SHUFFLE      (BUTTON_POWER | BUTTON_PREV)
+#define FLIPIT_SOLVE        (BUTTON_POWER | BUTTON_NEXT)
+#define FLIPIT_STEP_BY_STEP (BUTTON_POWER | BUTTON_PLAY)
+#define FLIPIT_TOGGLE       BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define FLIPIT_LEFT         BUTTON_HOME
+#define FLIPIT_RIGHT        BUTTON_VOL_DOWN
+#define FLIPIT_UP           BUTTON_PREV
+#define FLIPIT_DOWN         BUTTON_NEXT
+#define FLIPIT_QUIT         BUTTON_POWER
+#define FLIPIT_SHUFFLE      (BUTTON_POWER | BUTTON_PREV)
+#define FLIPIT_SOLVE        (BUTTON_POWER | BUTTON_NEXT)
+#define FLIPIT_STEP_BY_STEP (BUTTON_POWER | BUTTON_PLAY)
+#define FLIPIT_TOGGLE       BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index ed6be31695..5a56a39b13 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -496,6 +496,30 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_PREV)
 #define FRACTAL_RESET           (BUTTON_HOME | BUTTON_POWER)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define FRACTAL_QUIT            BUTTON_POWER
+#define FRACTAL_UP              BUTTON_PREV
+#define FRACTAL_DOWN            BUTTON_NEXT
+#define FRACTAL_LEFT            BUTTON_HOME
+#define FRACTAL_RIGHT           BUTTON_VOL_DOWN
+#define FRACTAL_ZOOM_IN         (BUTTON_POWER | BUTTON_VOL_UP)
+#define FRACTAL_ZOOM_OUT        (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define FRACTAL_PRECISION_INC   (BUTTON_POWER | BUTTON_NEXT)
+#define FRACTAL_PRECISION_DEC   (BUTTON_POWER | BUTTON_PREV)
+#define FRACTAL_RESET           (BUTTON_POWER | BUTTON_HOME)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define FRACTAL_QUIT            BUTTON_POWER
+#define FRACTAL_UP              BUTTON_PREV
+#define FRACTAL_DOWN            BUTTON_NEXT
+#define FRACTAL_LEFT            BUTTON_HOME
+#define FRACTAL_RIGHT           BUTTON_VOL_DOWN
+#define FRACTAL_ZOOM_IN         (BUTTON_POWER | BUTTON_VOL_UP)
+#define FRACTAL_ZOOM_OUT        (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define FRACTAL_PRECISION_INC   (BUTTON_POWER | BUTTON_NEXT)
+#define FRACTAL_PRECISION_DEC   (BUTTON_POWER | BUTTON_PREV)
+#define FRACTAL_RESET           (BUTTON_POWER | BUTTON_HOME)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index d1d66e3535..9f03937078 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -464,6 +464,32 @@
 #define  GBN_BUTTON_CONTEXT            BUTTON_PLAY | BUTTON_REPEAT
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_HOME | BUTTON_POWER
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_PREV
+#define  GBN_BUTTON_DOWN               BUTTON_NEXT
+#define  GBN_BUTTON_LEFT               BUTTON_HOME
+#define  GBN_BUTTON_RIGHT              BUTTON_VOL_DOWN
+#define  GBN_BUTTON_RETREAT            BUTTON_POWER | BUTTON_VOL_DOWN
+#define  GBN_BUTTON_ADVANCE            BUTTON_POWER | BUTTON_VOL_UP
+#define  GBN_BUTTON_MENU               BUTTON_POWER
+#define  GBN_BUTTON_PLAY               BUTTON_PLAY | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_PLAY | BUTTON_REPEAT
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_POWER | BUTTON_HOME
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_PREV
+#define  GBN_BUTTON_DOWN               BUTTON_NEXT
+#define  GBN_BUTTON_LEFT               BUTTON_HOME
+#define  GBN_BUTTON_RIGHT              BUTTON_VOL_DOWN
+#define  GBN_BUTTON_RETREAT            BUTTON_POWER | BUTTON_VOL_DOWN
+#define  GBN_BUTTON_ADVANCE            BUTTON_POWER | BUTTON_VOL_UP
+#define  GBN_BUTTON_MENU               BUTTON_POWER
+#define  GBN_BUTTON_PLAY               BUTTON_PLAY | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_PLAY | BUTTON_REPEAT
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_POWER | BUTTON_HOME
 #else
 #error Unsupported keypad
 #endif
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 2f349b1a24..5ffef12a62 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -510,6 +510,36 @@
 #define IMGVIEW_MENU        BUTTON_POWER
 #define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
+#define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
+#define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
+#define IMGVIEW_UP          BUTTON_PREV
+#define IMGVIEW_DOWN        BUTTON_NEXT
+#define IMGVIEW_LEFT        BUTTON_HOME
+#define IMGVIEW_RIGHT       (BUTTON_PLAY|BUTTON_POWER)
+#define IMGVIEW_NEXT        BUTTON_VOL_UP
+#define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT)
+#define IMGVIEW_PREVIOUS    BUTTON_VOL_DOWN
+#define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
+#define IMGVIEW_MENU        BUTTON_POWER
+#define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
+#define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
+#define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
+#define IMGVIEW_UP          BUTTON_PREV
+#define IMGVIEW_DOWN        BUTTON_NEXT
+#define IMGVIEW_LEFT        BUTTON_HOME
+#define IMGVIEW_RIGHT       (BUTTON_PLAY|BUTTON_POWER)
+#define IMGVIEW_NEXT        BUTTON_VOL_UP
+#define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT)
+#define IMGVIEW_PREVIOUS    BUTTON_VOL_DOWN
+#define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
+#define IMGVIEW_MENU        BUTTON_POWER
+#define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 72c3b57338..8ef674a74a 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -272,6 +272,22 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define QUIT  BUTTON_POWER
 #define FIRE  BUTTON_MENU
+#elif CONFIG_KEYPAD == IHIFI2_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define QUIT  BUTTON_POWER
+#define LEFT  BUTTON_HOME
+#define RIGHT BUTTON_VOL_DOWN
+#define FIRE  BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define QUIT  BUTTON_POWER
+#define LEFT  BUTTON_HOME
+#define RIGHT BUTTON_VOL_DOWN
+#define FIRE  BUTTON_VOL_UP
 #else
    #error INVADROX: Unsupported keypad
 #endif
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index e4a22830a1..bc0bc73183 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -387,6 +387,26 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define HK_SELECT "PLAY"
 #define HK_CANCEL "POWER"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define JEWELS_UP     BUTTON_PREV
+#define JEWELS_DOWN   BUTTON_NEXT
+#define JEWELS_LEFT   BUTTON_HOME
+#define JEWELS_RIGHT  BUTTON_VOL_DOWN
+#define JEWELS_SELECT BUTTON_PLAY
+#define JEWELS_CANCEL BUTTON_POWER
+#define HK_SELECT "PLAY"
+#define HK_CANCEL "POWER"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define JEWELS_UP     BUTTON_PREV
+#define JEWELS_DOWN   BUTTON_NEXT
+#define JEWELS_LEFT   BUTTON_HOME
+#define JEWELS_RIGHT  BUTTON_VOL_DOWN
+#define JEWELS_SELECT BUTTON_PLAY
+#define JEWELS_CANCEL BUTTON_POWER
+#define HK_SELECT "PLAY"
+#define HK_CANCEL "POWER"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index 5fab361620..e240a0989e 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -216,12 +216,28 @@
 #define BTN_PAUSE      BUTTON_POWER
 #elif (CONFIG_KEYPAD == XDUOO_X3_PAD)
-#define BTN_UP         BUTTON_VOL_UP
+#define BTN_UP           BUTTON_VOL_UP
-#define BTN_DOWN       BUTTON_VOL_DOWN
+#define BTN_DOWN         BUTTON_VOL_DOWN
-#define BTN_LEFT       BUTTON_PREV
+#define BTN_LEFT         BUTTON_PREV
-#define BTN_RIGHT      BUTTON_NEXT
+#define BTN_RIGHT        BUTTON_NEXT
-#define BTN_FIRE       BUTTON_PLAY
+#define BTN_FIRE         BUTTON_PLAY
-#define BTN_PAUSE      BUTTON_OPTION
+#define BTN_PAUSE        BUTTON_POWER
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define BTN_UP           BUTTON_PREV
+#define BTN_DOWN         BUTTON_NEXT
+#define BTN_LEFT         BUTTON_HOME
+#define BTN_RIGHT        BUTTON_VOL_DOWN
+#define BTN_FIRE         BUTTON_PLAY
+#define BTN_PAUSE        BUTTON_POWER
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define BTN_UP           BUTTON_PREV
+#define BTN_DOWN         BUTTON_NEXT
+#define BTN_LEFT         BUTTON_HOME
+#define BTN_RIGHT        BUTTON_VOL_DOWN
+#define BTN_FIRE         BUTTON_PLAY
+#define BTN_PAUSE        BUTTON_POWER
 #else
 #error Unsupported keypad
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 2c5fb773ba..97b5a1e1bf 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -237,6 +237,24 @@ const struct button_mapping pla_main_ctx[] =
    { PLA_DOWN_REPEAT,      BUTTON_OPTION|BUTTON_REPEAT,        BUTTON_NONE },
    { PLA_LEFT_REPEAT,      BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
    { PLA_RIGHT_REPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+    { PLA_UP,               BUTTON_PREV,                        BUTTON_NONE },
+    { PLA_DOWN,             BUTTON_NEXT,                        BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_HOME,                        BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_VOL_DOWN,                    BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_DOWN_REPEAT,      BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_LEFT_REPEAT,      BUTTON_HOME|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_RIGHT_REPEAT,     BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+    { PLA_UP,               BUTTON_PREV,                        BUTTON_NONE },
+    { PLA_DOWN,             BUTTON_NEXT,                        BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_HOME,                        BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_VOL_DOWN,                    BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_DOWN_REPEAT,      BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_LEFT_REPEAT,      BUTTON_HOME|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_RIGHT_REPEAT,     BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
 #else
 #   ifndef HAVE_TOUCHSCREEN
 #       error pluginlib_actions: No directions defined
@@ -462,7 +480,18 @@ const struct button_mapping pla_main_ctx[] =
    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+    {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
+    {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+    {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
+    {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
 #else
 #   ifndef HAVE_TOUCHSCREEN
 #       error pluginlib_actions: No actions defined
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index de6310dcd8..bef13b649d 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -301,6 +301,22 @@
 #define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
 #define MIDI_PLAYPAUSE    BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define MIDI_QUIT       BUTTON_POWER
+#define MIDI_FFWD       BUTTON_VOL_DOWN
+#define MIDI_REWIND     BUTTON_HOME
+#define MIDI_VOL_UP     BUTTON_PREV
+#define MIDI_VOL_DOWN   BUTTON_NEXT
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define MIDI_QUIT        BUTTON_POWER
+#define MIDI_FFWD        BUTTON_VOL_DOWN
+#define MIDI_REWIND      BUTTON_HOME
+#define MIDI_VOL_UP      BUTTON_PREV
+#define MIDI_VOL_DOWN    BUTTON_NEXT
+#define MIDI_PLAYPAUSE   BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 2a3b5f78e9..956ba128d5 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -417,6 +417,32 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER2  BUTTON_VOL_UP
 #   define MINESWP_INFO       (BUTTON_PLAY | BUTTON_OPTION)
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#   define MINESWP_LEFT       BUTTON_HOME
+#   define MINESWP_RIGHT      BUTTON_VOL_DOWN
+#   define MINESWP_UP         BUTTON_PREV
+#   define MINESWP_DOWN       BUTTON_NEXT
+#   define MINESWP_QUIT       BUTTON_POWER
+#   define MINESWP_TOGGLE_PRE BUTTON_PLAY
+#   define MINESWP_TOGGLE     (BUTTON_POWER | BUTTON_PREV)
+#   define MINESWP_TOGGLE2    (BUTTON_POWER | BUTTON_NEXT)
+#   define MINESWP_DISCOVER   (BUTTON_POWER | BUTTON_VOL_UP)
+#   define MINESWP_DISCOVER2  (BUTTON_POWER | BUTTON_VOL_DOWN)
+#   define MINESWP_INFO       (BUTTON_POWER | BUTTON_HOME)
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#   define MINESWP_LEFT       BUTTON_HOME
+#   define MINESWP_RIGHT      BUTTON_VOL_DOWN
+#   define MINESWP_UP         BUTTON_PREV
+#   define MINESWP_DOWN       BUTTON_NEXT
+#   define MINESWP_QUIT       BUTTON_POWER
+#   define MINESWP_TOGGLE_PRE BUTTON_PLAY
+#   define MINESWP_TOGGLE     (BUTTON_POWER | BUTTON_PREV)
+#   define MINESWP_TOGGLE2    (BUTTON_POWER | BUTTON_NEXT)
+#   define MINESWP_DISCOVER   (BUTTON_POWER | BUTTON_VOL_UP)
+#   define MINESWP_DISCOVER2  (BUTTON_POWER | BUTTON_VOL_DOWN)
+#   define MINESWP_INFO       (BUTTON_POWER | BUTTON_HOME)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 9e09135385..d147120cd4 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2562,6 +2562,18 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define MP3ENC_DONE    BUTTON_POWER
 #define MP3ENC_SELECT  BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define MP3ENC_PREV    BUTTON_PREV
+#define MP3ENC_NEXT    BUTTON_NEXT
+#define MP3ENC_DONE    BUTTON_POWER
+#define MP3ENC_SELECT  BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define MP3ENC_PREV    BUTTON_PREV
+#define MP3ENC_NEXT    BUTTON_NEXT
+#define MP3ENC_DONE    BUTTON_POWER
+#define MP3ENC_SELECT  BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 7976f5f542..d6b4fd4b84 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -316,6 +316,26 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_RIGHT2      BUTTON_VOL_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define MPEG_START_TIME_SELECT      BUTTON_PLAY
+#define MPEG_START_TIME_LEFT        BUTTON_HOME
+#define MPEG_START_TIME_RIGHT       BUTTON_VOL_DOWN
+#define MPEG_START_TIME_UP          BUTTON_PREV
+#define MPEG_START_TIME_DOWN        BUTTON_NEXT
+#define MPEG_START_TIME_LEFT2       (BUTTON_POWER + BUTTON_HOME)
+#define MPEG_START_TIME_RIGHT2      (BUTTON_POWER + BUTTON_VOL_DOWN)
+#define MPEG_START_TIME_EXIT        BUTTON_POWER
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define MPEG_START_TIME_SELECT      BUTTON_PLAY
+#define MPEG_START_TIME_LEFT        BUTTON_HOME
+#define MPEG_START_TIME_RIGHT       BUTTON_VOL_DOWN
+#define MPEG_START_TIME_UP          BUTTON_PREV
+#define MPEG_START_TIME_DOWN        BUTTON_NEXT
+#define MPEG_START_TIME_LEFT2       (BUTTON_POWER + BUTTON_HOME)
+#define MPEG_START_TIME_RIGHT2      (BUTTON_POWER + BUTTON_VOL_DOWN)
+#define MPEG_START_TIME_EXIT        BUTTON_POWER
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index fd3e8d8cd5..6a33a544db 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -450,6 +450,24 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_RW         BUTTON_PREV
 #define MPEG_FF         BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define MPEG_MENU       BUTTON_PLAY
+#define MPEG_STOP       BUTTON_POWER
+#define MPEG_PAUSE      BUTTON_HOME
+#define MPEG_VOLDOWN    BUTTON_VOL_DOWN
+#define MPEG_VOLUP      BUTTON_VOL_UP
+#define MPEG_RW         BUTTON_PREV
+#define MPEG_FF         BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define MPEG_MENU       BUTTON_PLAY
+#define MPEG_STOP       BUTTON_POWER
+#define MPEG_PAUSE      BUTTON_HOME
+#define MPEG_VOLDOWN    BUTTON_VOL_DOWN
+#define MPEG_VOLUP      BUTTON_VOL_UP
+#define MPEG_RW         BUTTON_PREV
+#define MPEG_FF         BUTTON_NEXT
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 4534684293..f4711d4e0e 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -518,6 +518,34 @@
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
 #define NEED_LASTBUTTON
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define OSCILLOSCOPE_QUIT            BUTTON_POWER
+#define OSCILLOSCOPE_DRAWMODE_PRE    BUTTON_PLAY
+#define OSCILLOSCOPE_DRAWMODE        (BUTTON_PLAY | BUTTON_REL)
+#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_PLAY
+#define OSCILLOSCOPE_ORIENTATION     (BUTTON_PLAY | BUTTON_REPEAT)
+#define OSCILLOSCOPE_ADVMODE         BUTTON_HOME
+#define OSCILLOSCOPE_PAUSE           (BUTTON_HOME | BUTTON_REPEAT)
+#define OSCILLOSCOPE_SPEED_UP        BUTTON_NEXT
+#define OSCILLOSCOPE_SPEED_DOWN      BUTTON_PREV
+#define OSCILLOSCOPE_VOL_UP          BUTTON_VOL_UP
+#define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
+#define NEED_LASTBUTTON
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define OSCILLOSCOPE_QUIT            BUTTON_POWER
+#define OSCILLOSCOPE_DRAWMODE_PRE    BUTTON_PLAY
+#define OSCILLOSCOPE_DRAWMODE        (BUTTON_PLAY | BUTTON_REL)
+#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_PLAY
+#define OSCILLOSCOPE_ORIENTATION     (BUTTON_PLAY | BUTTON_REPEAT)
+#define OSCILLOSCOPE_ADVMODE         BUTTON_HOME
+#define OSCILLOSCOPE_PAUSE           (BUTTON_HOME | BUTTON_REPEAT)
+#define OSCILLOSCOPE_SPEED_UP        BUTTON_NEXT
+#define OSCILLOSCOPE_SPEED_DOWN      BUTTON_PREV
+#define OSCILLOSCOPE_VOL_UP          BUTTON_VOL_UP
+#define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
+#define NEED_LASTBUTTON
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 3461bd62c7..eb97d828e2 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -363,6 +363,27 @@
 #define PACMAN_1UP      BUTTON_VOLUP
 #define PACMAN_COIN     BUTTON_VOLDOWN
+#elif CONFIG_KEYPAD == IHIFI2_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define PACMAN_UP       BUTTON_PREV
+#define PACMAN_DOWN     BUTTON_NEXT
+#define PACMAN_LEFT     BUTTON_HOME
+#define PACMAN_RIGHT    BUTTON_VOL_DOWN
+#define PACMAN_MENU     BUTTON_POWER
+#define PACMAN_1UP      BUTTON_VOL_UP
+#define PACMAN_COIN     BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define PACMAN_UP       BUTTON_PREV
+#define PACMAN_DOWN     BUTTON_NEXT
+#define PACMAN_LEFT     BUTTON_HOME
+#define PACMAN_RIGHT    BUTTON_VOL_DOWN
+#define PACMAN_MENU     BUTTON_POWER
+#define PACMAN_1UP      BUTTON_VOL_UP
+#define PACMAN_COIN     BUTTON_PLAY
 #else
 #error Keymap not defined!
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 922359cd32..cc2e8e3f23 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -660,6 +660,40 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LVL_UP_TEXT "VOL+"
 #define LVL_DOWN_TEXT "VOL-"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define PEGBOX_SELECT   BUTTON_PLAY
+#define PEGBOX_QUIT     BUTTON_POWER
+#define PEGBOX_RESTART  (BUTTON_POWER | BUTTON_HOME)
+#define PEGBOX_LVL_UP   (BUTTON_POWER | BUTTON_VOL_UP)
+#define PEGBOX_LVL_DOWN (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define PEGBOX_UP       BUTTON_PREV
+#define PEGBOX_DOWN     BUTTON_NEXT
+#define PEGBOX_RIGHT    BUTTON_HOME
+#define PEGBOX_LEFT     BUTTON_VOL_DOWN
+#define SELECT_TEXT "PLAY"
+#define QUIT_TEXT "POWER"
+#define RESTART_TEXT "HOME"
+#define LVL_UP_TEXT "VOL+"
+#define LVL_DOWN_TEXT "VOL-"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define PEGBOX_SELECT   BUTTON_PLAY
+#define PEGBOX_QUIT     BUTTON_POWER
+#define PEGBOX_RESTART  (BUTTON_POWER | BUTTON_HOME)
+#define PEGBOX_LVL_UP   (BUTTON_POWER | BUTTON_VOL_UP)
+#define PEGBOX_LVL_DOWN (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define PEGBOX_UP       BUTTON_PREV
+#define PEGBOX_DOWN     BUTTON_NEXT
+#define PEGBOX_RIGHT    BUTTON_HOME
+#define PEGBOX_LEFT     BUTTON_VOL_DOWN
+#define SELECT_TEXT "PLAY"
+#define QUIT_TEXT "POWER"
+#define RESTART_TEXT "HOME"
+#define LVL_UP_TEXT "VOL+"
+#define LVL_DOWN_TEXT "VOL-"
 #else
 #error Unsupported keymap!
 #endif
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index d65134e5d2..cb3006d7c4 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -317,6 +317,22 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_UP    BUTTON_HOME
 #define PONG_RIGHT_DOWN  BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define PONG_QUIT        BUTTON_POWER
+#define PONG_PAUSE       BUTTON_PREV
+#define PONG_LEFT_UP     BUTTON_PLAY
+#define PONG_LEFT_DOWN   BUTTON_HOME
+#define PONG_RIGHT_UP    BUTTON_VOL_UP
+#define PONG_RIGHT_DOWN  BUTTON_VOL_DOWN
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define PONG_QUIT        BUTTON_POWER
+#define PONG_PAUSE       BUTTON_PREV
+#define PONG_LEFT_UP     BUTTON_PLAY
+#define PONG_LEFT_DOWN   BUTTON_HOME
+#define PONG_RIGHT_UP    BUTTON_VOL_UP
+#define PONG_RIGHT_DOWN  BUTTON_VOL_DOWN
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 1dc1dedbed..cba34d2814 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -339,6 +339,28 @@
 #define REVERSI_BUTTON_MENU        BUTTON_PLAY
 #define REVERSI_BUTTON_MENU_LONGPRESS
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define REVERSI_BUTTON_QUIT        BUTTON_POWER
+#define REVERSI_BUTTON_UP          BUTTON_PREV
+#define REVERSI_BUTTON_DOWN        BUTTON_NEXT
+#define REVERSI_BUTTON_LEFT        BUTTON_PREV
+#define REVERSI_BUTTON_RIGHT       BUTTON_VOL_DOWN
+#define REVERSI_BUTTON_MAKE_MOVE   BUTTON_PLAY
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MENU        BUTTON_PLAY
+#define REVERSI_BUTTON_MENU_LONGPRESS 
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define REVERSI_BUTTON_QUIT        BUTTON_POWER
+#define REVERSI_BUTTON_UP          BUTTON_PREV
+#define REVERSI_BUTTON_DOWN        BUTTON_NEXT
+#define REVERSI_BUTTON_LEFT        BUTTON_PREV
+#define REVERSI_BUTTON_RIGHT       BUTTON_VOL_DOWN
+#define REVERSI_BUTTON_MAKE_MOVE   BUTTON_PLAY
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MENU        BUTTON_PLAY
+#define REVERSI_BUTTON_MENU_LONGPRESS 
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index b204ed87da..13eb593775 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -492,6 +492,30 @@
 #define ROCKBLOX_DROP          (BUTTON_PLAY|BUTTON_REL)
 #define ROCKBLOX_RESTART       (BUTTON_PLAY|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define ROCKBLOX_OFF           BUTTON_POWER
+#define ROCKBLOX_ROTATE_CCW    BUTTON_HOME
+#define ROCKBLOX_ROTATE_CCW2   BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW     BUTTON_VOL_UP
+#define ROCKBLOX_DOWN          BUTTON_PLAY
+#define ROCKBLOX_LEFT          BUTTON_PREV
+#define ROCKBLOX_RIGHT         BUTTON_NEXT
+#define ROCKBLOX_DROP          (BUTTON_POWER|BUTTON_PLAY)
+#define ROCKBLOX_RESTART       (BUTTON_POWER|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define ROCKBLOX_OFF           BUTTON_POWER
+#define ROCKBLOX_ROTATE_CCW    BUTTON_HOME
+#define ROCKBLOX_ROTATE_CCW2   BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW     BUTTON_VOL_UP
+#define ROCKBLOX_DOWN          BUTTON_PLAY
+#define ROCKBLOX_LEFT          BUTTON_PREV
+#define ROCKBLOX_RIGHT         BUTTON_NEXT
+#define ROCKBLOX_DROP          (BUTTON_POWER|BUTTON_PLAY)
+#define ROCKBLOX_RESTART       (BUTTON_POWER|BUTTON_REPEAT)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 7425fc2550..8886793ab7 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -433,6 +433,26 @@ static void setoptions (void)
        options.SELECT  = BUTTON_VOL_UP;
        options.MENU    = BUTTON_POWER;
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+        options.UP      = BUTTON_PREV;
+        options.DOWN    = BUTTON_NEXT;
+        options.A       = BUTTON_VOL_UP;
+        options.B       = BUTTON_VOL_DOWN;
+        options.START   = BUTTON_PLAY;
+        options.SELECT  = BUTTON_HOME;
+        options.MENU    = BUTTON_POWER;
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+        options.UP      = BUTTON_PREV;
+        options.DOWN    = BUTTON_NEXT;
+        options.A       = BUTTON_VOL_UP;
+        options.B       = BUTTON_VOL_DOWN;
+        options.START   = BUTTON_PLAY;
+        options.SELECT  = BUTTON_HOME;
+        options.MENU    = BUTTON_POWER;
 #else
 #error No Keymap Defined!
 #endif
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index d0f9f7235c..3759489fe1 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -338,6 +338,28 @@
 #define ROCKPAINT_LEFT        BUTTON_PREV
 #define ROCKPAINT_RIGHT       BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define ROCKPAINT_QUIT        BUTTON_POWER
+#define ROCKPAINT_DRAW        BUTTON_PLAY
+#define ROCKPAINT_MENU        (BUTTON_HOME | BUTTON_POWER)
+#define ROCKPAINT_TOOLBAR     BUTTON_VOL_UP
+#define ROCKPAINT_TOOLBAR2    (BUTTON_VOL_UP | BUTTON_POWER)
+#define ROCKPAINT_UP          BUTTON_PREV
+#define ROCKPAINT_DOWN        BUTTON_NEXT
+#define ROCKPAINT_LEFT        BUTTON_HOME
+#define ROCKPAINT_RIGHT       BUTTON_VOL_DOWN
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define ROCKPAINT_QUIT        BUTTON_POWER
+#define ROCKPAINT_DRAW        BUTTON_PLAY
+#define ROCKPAINT_MENU        (BUTTON_HOME | BUTTON_POWER)
+#define ROCKPAINT_TOOLBAR     BUTTON_VOL_UP
+#define ROCKPAINT_TOOLBAR2    (BUTTON_VOL_UP | BUTTON_POWER)
+#define ROCKPAINT_UP          BUTTON_PREV
+#define ROCKPAINT_DOWN        BUTTON_NEXT
+#define ROCKPAINT_LEFT        BUTTON_HOME
+#define ROCKPAINT_RIGHT       BUTTON_VOL_DOWN
 #else
 #error "Please define keys for this keypad"
 #endif
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index a3f84e32ae..0ea36c84b8 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -340,6 +340,24 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER)
 #define PUZZLE_PICTURE BUTTON_PLAY
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define PUZZLE_QUIT    BUTTON_POWER
+#define PUZZLE_LEFT    BUTTON_HOME
+#define PUZZLE_RIGHT   BUTTON_VOL_DOWN
+#define PUZZLE_UP      BUTTON_PREV
+#define PUZZLE_DOWN    BUTTON_NEXT
+#define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER)
+#define PUZZLE_PICTURE BUTTON_PLAY
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define PUZZLE_QUIT    BUTTON_POWER
+#define PUZZLE_LEFT    BUTTON_HOME
+#define PUZZLE_RIGHT   BUTTON_VOL_DOWN
+#define PUZZLE_UP      BUTTON_PREV
+#define PUZZLE_DOWN    BUTTON_NEXT
+#define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER)
+#define PUZZLE_PICTURE BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 9144edf062..2518316bdd 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -297,6 +297,22 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_DOWN      BUTTON_OPTION
 #define SNAKE_PLAYPAUSE BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define SNAKE_QUIT      BUTTON_POWER
+#define SNAKE_LEFT      BUTTON_HOME
+#define SNAKE_RIGHT     BUTTON_VOL_DOWN
+#define SNAKE_UP        BUTTON_PREV
+#define SNAKE_DOWN      BUTTON_NEXT
+#define SNAKE_PLAYPAUSE BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define SNAKE_QUIT      BUTTON_POWER
+#define SNAKE_LEFT      BUTTON_HOME
+#define SNAKE_RIGHT     BUTTON_VOL_DOWN
+#define SNAKE_UP        BUTTON_PREV
+#define SNAKE_DOWN      BUTTON_NEXT
+#define SNAKE_PLAYPAUSE BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 13d2c57b24..9ea79504e4 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -428,6 +428,24 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define SNAKE2_LEFT         BUTTON_HOME
+#define SNAKE2_RIGHT        BUTTON_VOL_DOWN
+#define SNAKE2_UP           BUTTON_PREV
+#define SNAKE2_DOWN         BUTTON_NEXT
+#define SNAKE2_QUIT         BUTTON_POWER
+#define SNAKE2_PLAYPAUSE    BUTTON_PLAY
+#define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define SNAKE2_LEFT         BUTTON_HOME
+#define SNAKE2_RIGHT        BUTTON_VOL_DOWN
+#define SNAKE2_UP           BUTTON_PREV
+#define SNAKE2_DOWN         BUTTON_NEXT
+#define SNAKE2_QUIT         BUTTON_POWER
+#define SNAKE2_PLAYPAUSE    BUTTON_PLAY
+#define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 98d295eb1a..17971ec4db 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -667,6 +667,38 @@
 #define BUTTON_SAVE BUTTON_PLAY
 #define BUTTON_SAVE_NAME "PLAY"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define SOKOBAN_LEFT BUTTON_HOME
+#define SOKOBAN_RIGHT BUTTON_VOL_DOWN
+#define SOKOBAN_UP BUTTON_PREV
+#define SOKOBAN_DOWN BUTTON_NEXT
+#define SOKOBAN_MENU BUTTON_POWER
+#define SOKOBAN_UNDO_PRE BUTTON_PLAY
+#define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL)
+#define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY)
+#define SOKOBAN_LEVEL_DOWN (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define SOKOBAN_LEVEL_REPEAT (BUTTON_POWER | BUTTON_HOME)
+#define SOKOBAN_LEVEL_UP (BUTTON_POWER | BUTTON_VOL_UP)
+#define SOKOBAN_PAUSE BUTTON_PLAY
+#define BUTTON_SAVE BUTTON_PLAY
+#define BUTTON_SAVE_NAME "PLAY"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define SOKOBAN_LEFT BUTTON_HOME
+#define SOKOBAN_RIGHT BUTTON_VOL_DOWN
+#define SOKOBAN_UP BUTTON_PREV
+#define SOKOBAN_DOWN BUTTON_NEXT
+#define SOKOBAN_MENU BUTTON_POWER
+#define SOKOBAN_UNDO_PRE BUTTON_PLAY
+#define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL)
+#define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY)
+#define SOKOBAN_LEVEL_DOWN (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define SOKOBAN_LEVEL_REPEAT (BUTTON_POWER | BUTTON_HOME)
+#define SOKOBAN_LEVEL_UP (BUTTON_POWER | BUTTON_VOL_UP)
+#define SOKOBAN_PAUSE BUTTON_PLAY
+#define BUTTON_SAVE BUTTON_PLAY
+#define BUTTON_SAVE_NAME "PLAY"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index fe7da2788e..7440160470 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -706,6 +706,44 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define HK_CUR2STACK      "DBL PLAY"
 #   define HK_REM2STACK      "NEXT"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#   define SOL_QUIT          BUTTON_POWER
+#   define SOL_UP            BUTTON_PREV
+#   define SOL_DOWN          BUTTON_NEXT
+#   define SOL_LEFT          BUTTON_HOME
+#   define SOL_RIGHT         BUTTON_VOL_DOWN
+#   define SOL_MOVE_PRE      BUTTON_VOL_UP
+#   define SOL_MOVE          (BUTTON_PLAY | BUTTON_REL)
+#   define SOL_DRAW          (BUTTON_POWER | BUTTON_REPEAT)
+#   define SOL_REM2CUR       (BUTTON_POWER | BUTTON_VOL_DOWN)
+#   define SOL_CUR2STACK_PRE BUTTON_PLAY
+#   define SOL_CUR2STACK     (BUTTON_PLAY | BUTTON_REPEAT)
+#   define SOL_REM2STACK     (BUTTON_POWER | BUTTON_VOL_UP)
+#   define HK_MOVE           "PLAY"
+#   define HK_DRAW           "DBL POWER"
+#   define HK_REM2CUR        "POWER"
+#   define HK_CUR2STACK      "DBL PLAY"
+#   define HK_REM2STACK      "POWER+"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#   define SOL_QUIT          BUTTON_POWER
+#   define SOL_UP            BUTTON_PREV
+#   define SOL_DOWN          BUTTON_NEXT
+#   define SOL_LEFT          BUTTON_HOME
+#   define SOL_RIGHT         BUTTON_VOL_DOWN
+#   define SOL_MOVE_PRE      BUTTON_VOL_UP
+#   define SOL_MOVE          (BUTTON_PLAY | BUTTON_REL)
+#   define SOL_DRAW          (BUTTON_POWER | BUTTON_REPEAT)
+#   define SOL_REM2CUR       (BUTTON_POWER | BUTTON_VOL_DOWN)
+#   define SOL_CUR2STACK_PRE BUTTON_PLAY
+#   define SOL_CUR2STACK     (BUTTON_PLAY | BUTTON_REPEAT)
+#   define SOL_REM2STACK     (BUTTON_POWER | BUTTON_VOL_UP)
+#   define HK_MOVE           "PLAY"
+#   define HK_DRAW           "DBL POWER"
+#   define HK_REM2CUR        "POWER"
+#   define HK_CUR2STACK      "DBL PLAY"
+#   define HK_REM2STACK      "POWER+"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index ad03919861..15d4039b4d 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -363,6 +363,24 @@
 #define AST_RIGHT       BUTTON_NEXT
 #define AST_FIRE        BUTTON_PLAY
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define AST_PAUSE       BUTTON_PLAY
+#define AST_QUIT        BUTTON_POWER
+#define AST_THRUST      BUTTON_NEXT
+#define AST_HYPERSPACE  BUTTON_PREV
+#define AST_LEFT        BUTTON_HOME
+#define AST_RIGHT       BUTTON_VOL_DOWN
+#define AST_FIRE        BUTTON_VOL_UP
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define AST_PAUSE       BUTTON_PLAY
+#define AST_QUIT        BUTTON_POWER
+#define AST_THRUST      BUTTON_NEXT
+#define AST_HYPERSPACE  BUTTON_PREV
+#define AST_LEFT        BUTTON_HOME
+#define AST_RIGHT       BUTTON_VOL_DOWN
+#define AST_FIRE        BUTTON_VOL_UP
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index bcddab8f20..fdf67bec4c 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -639,6 +639,38 @@
 #define STAR_LEVEL_DOWN_NAME "PLAY + PREV"
 #define STAR_LEVEL_REPEAT_NAME "PLAY + OPTION"
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define STAR_QUIT           BUTTON_POWER
+#define STAR_LEFT           BUTTON_HOME
+#define STAR_RIGHT          BUTTON_VOL_DOWN
+#define STAR_UP             BUTTON_PREV
+#define STAR_DOWN           BUTTON_NEXT
+#define STAR_TOGGLE_CONTROL BUTTON_PLAY
+#define STAR_LEVEL_UP      (BUTTON_POWER | BUTTON_VOL_UP)
+#define STAR_LEVEL_DOWN    (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define STAR_LEVEL_REPEAT  (BUTTON_POWER | BUTTON_HOME)
+#define STAR_TOGGLE_CONTROL_NAME "PLAY"
+#define STAR_QUIT_NAME      "POWER"
+#define STAR_LEVEL_UP_NAME  "POWER + VOL+"
+#define STAR_LEVEL_DOWN_NAME "POWER + VOL-"
+#define STAR_LEVEL_REPEAT_NAME "POWER + HOME"
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define STAR_QUIT           BUTTON_POWER
+#define STAR_LEFT           BUTTON_HOME
+#define STAR_RIGHT          BUTTON_VOL_DOWN
+#define STAR_UP             BUTTON_PREV
+#define STAR_DOWN           BUTTON_NEXT
+#define STAR_TOGGLE_CONTROL BUTTON_PLAY
+#define STAR_LEVEL_UP      (BUTTON_POWER | BUTTON_VOL_UP)
+#define STAR_LEVEL_DOWN    (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define STAR_LEVEL_REPEAT  (BUTTON_POWER | BUTTON_HOME)
+#define STAR_TOGGLE_CONTROL_NAME "PLAY"
+#define STAR_QUIT_NAME      "POWER"
+#define STAR_LEVEL_UP_NAME  "POWER + VOL+"
+#define STAR_LEVEL_DOWN_NAME "POWER + VOL-"
+#define STAR_LEVEL_REPEAT_NAME "POWER + HOME"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 69f14a20ef..5e83859d89 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -321,6 +321,22 @@
 #define STOPWATCH_SCROLL_UP      BUTTON_HOME
 #define STOPWATCH_SCROLL_DOWN    BUTTON_OPTION
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define STOPWATCH_QUIT           BUTTON_POWER
+#define STOPWATCH_START_STOP     BUTTON_NEXT
+#define STOPWATCH_RESET_TIMER    BUTTON_PREV
+#define STOPWATCH_LAP_TIMER      BUTTON_PLAY
+#define STOPWATCH_SCROLL_UP      BUTTON_VOL_UP
+#define STOPWATCH_SCROLL_DOWN    BUTTON_VOL_DOWN
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define STOPWATCH_QUIT           BUTTON_POWER
+#define STOPWATCH_START_STOP     BUTTON_NEXT
+#define STOPWATCH_RESET_TIMER    BUTTON_PREV
+#define STOPWATCH_LAP_TIMER      BUTTON_PLAY
+#define STOPWATCH_SCROLL_UP      BUTTON_VOL_UP
+#define STOPWATCH_SCROLL_DOWN    BUTTON_VOL_DOWN
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index e26644a2d8..62ec80dba8 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -437,6 +437,34 @@
 #define SUDOKU_BUTTON_MENU       (BUTTON_POWER | BUTTON_REL)
 #define SUDOKU_BUTTON_POSSIBLE   (BUTTON_HOME | BUTTON_POWER)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define SUDOKU_BUTTON_QUIT_PRE   BUTTON_POWER
+#define SUDOKU_BUTTON_QUIT       (BUTTON_POWER | BUTTON_REPEAT)
+#define SUDOKU_BUTTON_UP         BUTTON_PREV
+#define SUDOKU_BUTTON_DOWN       BUTTON_NEXT
+#define SUDOKU_BUTTON_LEFT       BUTTON_HOME
+#define SUDOKU_BUTTON_RIGHT      BUTTON_VOL_DOWN
+#define SUDOKU_BUTTON_TOGGLEBACK (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define SUDOKU_BUTTON_TOGGLE     (BUTTON_POWER | BUTTON_VOL_UP)
+#define SUDOKU_BUTTON_ALTTOGGLE  BUTTON_PLAY
+#define SUDOKU_BUTTON_MENU_PRE   BUTTON_POWER
+#define SUDOKU_BUTTON_MENU       (BUTTON_POWER | BUTTON_REL)
+#define SUDOKU_BUTTON_POSSIBLE   (BUTTON_POWER | BUTTON_HOME)
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define SUDOKU_BUTTON_QUIT_PRE   BUTTON_POWER
+#define SUDOKU_BUTTON_QUIT       (BUTTON_POWER | BUTTON_REPEAT)
+#define SUDOKU_BUTTON_UP         BUTTON_PREV
+#define SUDOKU_BUTTON_DOWN       BUTTON_NEXT
+#define SUDOKU_BUTTON_LEFT       BUTTON_HOME
+#define SUDOKU_BUTTON_RIGHT      BUTTON_VOL_DOWN
+#define SUDOKU_BUTTON_TOGGLEBACK (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define SUDOKU_BUTTON_TOGGLE     (BUTTON_POWER | BUTTON_VOL_UP)
+#define SUDOKU_BUTTON_ALTTOGGLE  BUTTON_PLAY
+#define SUDOKU_BUTTON_MENU_PRE   BUTTON_POWER
+#define SUDOKU_BUTTON_MENU       (BUTTON_POWER | BUTTON_REL)
+#define SUDOKU_BUTTON_POSSIBLE   (BUTTON_POWER | BUTTON_HOME)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 58bce80eaf..da6453ff8d 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -562,6 +562,32 @@
 #define TV_LINE_DOWN    BUTTON_OPTION
 #define TV_BOOKMARK     (BUTTON_OPTION | BUTTON_PLAY)
+/* Xuelin 770/770c keys */
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define TV_QUIT         BUTTON_POWER
+#define TV_SCROLL_UP    BUTTON_VOL_UP
+#define TV_SCROLL_DOWN  BUTTON_VOL_DOWN
+#define TV_SCREEN_LEFT  BUTTON_PREV
+#define TV_SCREEN_RIGHT BUTTON_NEXT
+#define TV_MENU         BUTTON_PLAY
+#define TV_AUTOSCROLL   (BUTTON_POWER | BUTTON_HOME)
+#define TV_LINE_UP      (BUTTON_POWER | BUTTON_VOL_UP)
+#define TV_LINE_DOWN    (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define TV_BOOKMARK     (BUTTON_POWER | BUTTON_PLAY)
+/* Xuelin 800 keys */
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define TV_QUIT         BUTTON_POWER
+#define TV_SCROLL_UP    BUTTON_VOL_UP
+#define TV_SCROLL_DOWN  BUTTON_VOL_DOWN
+#define TV_SCREEN_LEFT  BUTTON_PREV
+#define TV_SCREEN_RIGHT BUTTON_NEXT
+#define TV_MENU         BUTTON_PLAY
+#define TV_AUTOSCROLL   (BUTTON_POWER | BUTTON_HOME)
+#define TV_LINE_UP      (BUTTON_POWER | BUTTON_VOL_UP)
+#define TV_LINE_DOWN    (BUTTON_POWER | BUTTON_VOL_DOWN)
+#define TV_BOOKMARK     (BUTTON_POWER | BUTTON_PLAY)
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 04876ba198..eaa92d4b48 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -432,6 +432,28 @@
 #define LABEL_MENU      "PLAY"
 #define LABEL_VOLUME    "VOL UP/DN"
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#define VUMETER_QUIT    BUTTON_POWER
+#define VUMETER_HELP    BUTTON_HOME
+#define VUMETER_MENU    BUTTON_PLAY
+#define VUMETER_UP      BUTTON_VOL_UP
+#define VUMETER_DOWN    BUTTON_VOL_DOWN
+#define LABEL_HELP      "HOME"
+#define LABEL_QUIT      "POWER"
+#define LABEL_MENU      "PLAY"
+#define LABEL_VOLUME    "VOL UP/DN"
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define VUMETER_QUIT    BUTTON_POWER
+#define VUMETER_HELP    BUTTON_HOME
+#define VUMETER_MENU    BUTTON_PLAY
+#define VUMETER_UP      BUTTON_VOL_UP
+#define VUMETER_DOWN    BUTTON_VOL_DOWN
+#define LABEL_HELP      "HOME"
+#define LABEL_QUIT      "POWER"
+#define LABEL_MENU      "PLAY"
+#define LABEL_VOLUME    "VOL UP/DN"
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 83cfadc338..8c12862bdb 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -402,6 +402,24 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     (BUTTON_HOME | BUTTON_POWER)
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define BTN_DIR_UP        BUTTON_PREV
+#define BTN_DIR_DOWN      BUTTON_NEXT
+#define BTN_DIR_LEFT      BUTTON_HOME
+#define BTN_DIR_RIGHT     BUTTON_VOL_DOWN
+#define BTN_STARTPAUSE    BUTTON_PLAY
+#define BTN_QUIT          BUTTON_POWER
+#define BTN_STOPRESET     BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define BTN_DIR_UP        BUTTON_PREV
+#define BTN_DIR_DOWN      BUTTON_NEXT
+#define BTN_DIR_LEFT      BUTTON_HOME
+#define BTN_DIR_RIGHT     BUTTON_VOL_DOWN
+#define BTN_STARTPAUSE    BUTTON_PLAY
+#define BTN_QUIT          BUTTON_POWER
+#define BTN_STOPRESET     BUTTON_VOL_UP
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 9b41e2d1ac..8acdf85015 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -351,6 +351,24 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define DOWN     BUTTON_OPTION
 #define PAUSE    BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define QUIT     BUTTON_POWER
+#define LEFT     BUTTON_HOME
+#define RIGHT    BUTTON_VOL_DOWN
+#define UP       BUTTON_PREV
+#define DOWN     BUTTON_NEXT
+#define PAUSE    BUTTON_PLAY
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define QUIT     BUTTON_POWER
+#define LEFT     BUTTON_HOME
+#define RIGHT    BUTTON_VOL_DOWN
+#define UP       BUTTON_PREV
+#define DOWN     BUTTON_NEXT
+#define PAUSE    BUTTON_PLAY
 #else
 #error No keymap defined!
 #endif
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index ebdd41734e..ce527c561e 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -290,6 +290,22 @@
 #define ZX_UP           BUTTON_HOME
 #define ZX_DOWN         BUTTON_OPTION
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define ZX_SELECT       BUTTON_PLAY
+#define ZX_MENU         BUTTON_POWER
+#define ZX_LEFT         BUTTON_HOME
+#define ZX_RIGHT        BUTTON_VOL_DOWN
+#define ZX_UP           BUTTON_PREV
+#define ZX_DOWN         BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define ZX_SELECT       BUTTON_PLAY
+#define ZX_MENU         BUTTON_POWER
+#define ZX_LEFT         BUTTON_HOME
+#define ZX_RIGHT        BUTTON_VOL_DOWN
+#define ZX_UP           BUTTON_PREV
+#define ZX_DOWN         BUTTON_NEXT
 #else
 #error Keymap not defined!
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index f38712d8d1..b3f1ca70e8 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -287,6 +287,24 @@
 #define KBD_UP     BUTTON_HOME
 #define KBD_DOWN   BUTTON_OPTION
+#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#define KBD_SELECT BUTTON_PLAY
+#define KBD_ABORT  BUTTON_POWER
+#define KBD_LEFT   BUTTON_HOME
+#define KBD_RIGHT  BUTTON_VOL_DOWN
+#define KBD_UP     BUTTON_PREV
+#define KBD_DOWN   BUTTON_NEXT
+#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#define KBD_SELECT BUTTON_PLAY
+#define KBD_ABORT  BUTTON_POWER
+#define KBD_LEFT   BUTTON_HOME
+#define KBD_RIGHT  BUTTON_VOL_DOWN
+#define KBD_UP     BUTTON_PREV
+#define KBD_DOWN   BUTTON_NEXT
 #endif
 #ifdef HAVE_TOUCHSCREEN
diff --git a/apps/settings.h b/apps/settings.h
index d0257b51e6..05ad948c0d 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -642,7 +642,6 @@ struct user_settings
 #ifdef HAVE_USB_CHARGING_ENABLE
    int usb_charging;
 #endif
    /* device settings */
 #ifdef HAVE_LCD_CONTRAST
    int contrast;   /* lcd contrast */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index eb3c76865d..1c41954390 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -876,8 +876,13 @@ const struct settings_list settings[] = {
 #ifdef AUDIOHW_HAVE_FILTER_ROLL_OFF
    CHOICE_SETTING(F_SOUNDSETTING, roll_off, LANG_FILTER_ROLL_OFF, 0,
+#ifndef AUDIOHW_HAVE_SHORT_ROLL_OFF
                   "roll_off", "sharp,slow", sound_set_filter_roll_off,
                   2, ID2P(LANG_FILTER_SHARP), ID2P(LANG_FILTER_SLOW)),
+#else
+                   "roll_off", "sharp,slow,short,bypass", sound_set_filter_roll_off,
+                   4, ID2P(LANG_FILTER_SHARP), ID2P(LANG_FILTER_SLOW), ID2P(LANG_FILTER_SHORT), ID2P(LANG_FILTER_BYPASS)),
+#endif
 #endif
    /* playback */
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 0b39da153a..ce73724f69 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -80,7 +80,8 @@ nwz_linux.c
 rocker_linux.c
 #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \
      || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \
-      || defined(IHIFI760) || defined(IHIFI960)
+      || defined(IHIFI760) || defined(IHIFI960) || defined(IHIFI800) \
+      || defined(IHIFI770) || defined(IHIFI770C)
 rk27xx.c
 show_logo.c
 #elif defined(SANSA_CONNECT)
diff --git a/bootloader/common.c b/bootloader/common.c
index 5c5647ac64..03c1bf9964 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -54,7 +54,8 @@
 || defined(SAMSUNG_YH820) || defined(PHILIPS_SA9200) \
 || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) \
 || defined(ONDA_VX747) || defined(PBELL_VIBE500) \
- || defined(TOSHIBA_GIGABEAT_S) || defined(XDUOO_X3)
+ || defined(TOSHIBA_GIGABEAT_S) || defined(XDUOO_X3) \
+ || defined(IHIFI770) || defined(IHIFI770C) || defined(IHIFI800)
 bool verbose = false;
 #else
 bool verbose = true;
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 33d59fa429..16ae4cc350 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -442,6 +442,8 @@ drivers/audio/audiohw-swcodec.c
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER)
 #if defined(HAVE_UDA1380)
 drivers/audio/uda1380.c
+#elif defined(HAVE_WM8740)
+drivers/audio/wm8740.c
 #elif defined(HAVE_WM8751) \
   || defined(HAVE_WM8750)
 drivers/audio/wm8751.c
@@ -481,6 +483,8 @@ drivers/audio/df1704.c
 drivers/audio/pcm1792.c
 #elif defined (HAVE_CS4398)
 drivers/audio/cs4398.c
+#elif defined (HAVE_ES9018)
+drivers/audio/es9018.c
 #endif /* defined(HAVE_*) */
 #else /* PLATFORM_HOSTED */
 #if defined(SAMSUNG_YPR0) && defined(HAVE_AS3514)
@@ -791,6 +795,12 @@ target/arm/s3c2440/lcd-s3c2440.c
 target/arm/rk27xx/ma/lcd-ma.c
 #elif CONFIG_LCD == LCD_IHIFI
 target/arm/rk27xx/ihifi/lcd-ihifi.c
+#elif CONFIG_LCD == LCD_IHIFI770
+target/arm/rk27xx/ihifi2/lcd-ihifi770.c
+#elif CONFIG_LCD == LCD_IHIFI770C
+target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
+#elif CONFIG_LCD == LCD_IHIFI800
+target/arm/rk27xx/ihifi2/lcd-ihifi800.c
 #endif
 /* USB Stack */
@@ -1904,6 +1914,21 @@ target/arm/rk27xx/ihifi/powermgmt-ihifi960.c
 #endif
 #endif
+#if defined(IHIFI770) || defined(IHIFI770C) || defined(IHIFI800)
+target/arm/rk27xx/ihifi2/button-ihifi.c
+target/arm/rk27xx/ihifi2/power-ihifi.c
+#if defined(IHIFI770)
+target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
+target/arm/rk27xx/ihifi2/audio-ihifi770.c
+#elif defined(IHIFI770C)
+target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
+target/arm/rk27xx/ihifi2/audio-ihifi770.c
+#elif defined(IHIFI800)
+target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
+target/arm/rk27xx/ihifi2/audio-ihifi800.c
+#endif
+#endif
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)
 target/hosted/kernel-unix.c
 target/hosted/filesystem-unix.c
diff --git a/firmware/drivers/audio/es9018.c b/firmware/drivers/audio/es9018.c
new file mode 100644
index 0000000000..89e8c1d46f
--- /dev/null
+++ b/firmware/drivers/audio/es9018.c
@@ -0,0 +1,134 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "system.h"
+#include "es9018.h"
+#include "config.h"
+#include "audio.h"
+#include "audiohw.h"
+/* NOTE:  The register names are not known, as the register numbering
+   listed in the ES9018 datasheet does not match what is described below.. */
+static uint8_t reg0  = 0x00; /* System settings. Default value of register 0 */
+static uint8_t reg1  = 0x80; /* Input settings. Manual input, I2S, 32-bit (?) */
+static uint8_t reg4  = 0x00; /* Automute time. Default = disabled */
+static uint8_t reg5  = 0x68; /* Automute level. Default is some level */
+static uint8_t reg6  = 0x4A; /* Deemphasis. Default = disabled */
+static uint8_t reg7  = 0x83; /* General settings. Default sharp fir, pcm iir and muted */
+static uint8_t reg8  = 0x10; /* GPIO configuration */
+static uint8_t reg10 = 0x05; /* Master Mode Control. Default value: master mode off */
+static uint8_t reg11 = 0x02; /* Channel Mapping. Default stereo is Ch1=left, Ch2=right */
+static uint8_t reg12 = 0x50; /* DPLL Settings. Default = 005 for I2S, OFF for DSD */
+static uint8_t reg13 = 0x40; /* THD Compensation */
+static uint8_t reg14 = 0x8A; /* Soft Start Settings */
+static uint8_t reg21 = 0x00; /* Oversampling filter. Default: oversampling ON */
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+static int vol_tenthdb2hw(const int tdb)
+{
+    if (tdb < ES9018_VOLUME_MIN) {
+        return 0xff;
+    } else if (tdb > ES9018_VOLUME_MAX) {
+        return 0x00;
+    } else {
+        return (-tdb/5);
+    }
+}
+void audiohw_set_volume(int vol_l, int vol_r)
+{
+    es9018_write_reg(15, vol_tenthdb2hw(vol_l));
+    es9018_write_reg(16, vol_tenthdb2hw(vol_r));
+}
+void audiohw_mute(void)
+{
+    bitSet(reg7, 0); /* Mute Channel 1 */
+    bitSet(reg7, 1); /* Mute Channel 2 */
+    es9018_write_reg(0x07, reg7);
+}
+void audiohw_unmute(void)
+{
+    bitClear(reg7, 0); /* Unmute Channel 1 */
+    bitClear(reg7, 1); /* Unmute Channel 2 */
+    es9018_write_reg(0x07, reg7);
+}
+void audiohw_init(void)
+{
+    es9018_write_reg(0x00, reg0);
+    es9018_write_reg(0x01, reg1);
+    es9018_write_reg(0x04, reg4);
+    es9018_write_reg(0x05, reg5);
+    es9018_write_reg(0x06, reg6);
+    es9018_write_reg(0x07, reg7);
+    es9018_write_reg(0x08, reg8);
+    es9018_write_reg(0x0A, reg10);
+    es9018_write_reg(0x0B, reg11);
+    es9018_write_reg(0x0C, reg12);
+    es9018_write_reg(0x0D, reg13);
+    es9018_write_reg(0x0E, reg14);
+    es9018_write_reg(0x15, reg21);
+}
+void audiohw_preinit(void)
+{
+}
+void audiohw_set_frequency(int fsel)
+{
+    (void)fsel;
+}
+void audiohw_set_filter_roll_off(int value)
+{
+    /* 0 = Sharp (Default)
+       1 = Slow
+       2 = Short
+       3 = Bypass */
+    switch(value)
+    {
+        case 0:
+            bitClear(reg7, 5);
+            bitClear(reg7, 6);
+            bitClear(reg21, 0);
+            break;
+        case 1:
+            bitSet(reg7, 5);
+            bitClear(reg7, 6);
+            bitClear(reg21, 0);
+            break;
+        case 2:
+            bitClear(reg7, 5);
+            bitSet(reg7, 6);
+            bitClear(reg21, 0);
+            break;
+        case 3:
+            bitSet(reg21, 0);
+            break;
+    }
+    es9018_write_reg(0x07, reg7);
+    es9018_write_reg(0x15, reg21);
+}
diff --git a/firmware/drivers/audio/wm8740.c b/firmware/drivers/audio/wm8740.c
new file mode 100644
index 0000000000..d88f53bd75
--- /dev/null
+++ b/firmware/drivers/audio/wm8740.c
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "system.h"
+#include "wm8740.h"
+#include "config.h"
+#include "audio.h"
+#include "audiohw.h"
+static void wm8740_write_reg(const int reg, const unsigned int value)
+{
+    int i;
+    for (i = (1<<15); i; i >>= 1) {
+        udelay(1);
+        wm8740_set_mc(0);
+        if ((reg|value) & i) {
+            wm8740_set_md(1);
+        } else {
+            wm8740_set_md(0);
+        }
+        udelay(1);
+        wm8740_set_mc(1);
+    }
+    udelay(1);
+    wm8740_set_ml(0);
+    udelay(1);
+    wm8740_set_mc(0);
+    udelay(1);
+    wm8740_set_ml(1);
+    udelay(1);
+}
+static int vol_tenthdb2hw(const int tdb)
+{
+    if (tdb < WM8740_VOLUME_MIN) {
+        return 0x00;
+    } else if (tdb > WM8740_VOLUME_MAX) {
+        return 0xff;
+    } else {
+        return ((tdb / 5 + 0xff) & 0xff);
+    }
+}
+void audiohw_set_volume(int vol_l, int vol_r)
+{
+    wm8740_write_reg(WM8740_REG0, vol_tenthdb2hw(vol_l));
+    wm8740_write_reg(WM8740_REG1, vol_tenthdb2hw(vol_r) | WM8740_LDR);
+}
+void audiohw_mute(void)
+{
+    wm8740_write_reg(WM8740_REG2, WM8740_MUT);
+}
+void audiohw_unmute(void)
+{
+    wm8740_write_reg(WM8740_REG2, 0x00);
+}
+void audiohw_init(void)
+{
+    wm8740_write_reg(WM8740_REG0, 0x00);
+    wm8740_write_reg(WM8740_REG1, 0x00);
+    wm8740_write_reg(WM8740_REG2, WM8740_MUT);
+    wm8740_write_reg(WM8740_REG3, WM8740_I2S);
+    wm8740_write_reg(WM8740_REG4, 0x00);
+}
+void audiohw_preinit(void)
+{
+}
+void audiohw_set_frequency(int fsel)
+{
+    (void)fsel;
+}
+void audiohw_set_filter_roll_off(int value)
+{
+    /* 0 = fast (sharp); 
+       1 = slow */
+    if (value == 0) {
+        wm8740_write_reg(WM8740_REG3, WM8740_I2S);
+    } else {
+        wm8740_write_reg(WM8740_REG3, WM8740_I2S | WM8740_SR0);
+    }
+}
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 09001c8045..458fba3412 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -165,6 +165,8 @@ struct sound_settings_info
 #include "uda1380.h"
 #elif defined(HAVE_UDA1341)
 #include "uda1341.h"
+#elif defined(HAVE_WM8740)
+#include "wm8740.h"
 #elif defined(HAVE_WM8750) || defined(HAVE_WM8751)
 #include "wm8751.h"
 #elif defined(HAVE_WM8978)
@@ -211,6 +213,8 @@ struct sound_settings_info
 #include "nwzlinux_codec.h"
 #elif defined(HAVE_CS4398)
 #include "cs4398.h"
+#elif defined(HAVE_ES9018)
+#include "es9018.h"
 #elif (CONFIG_PLATFORM & (PLATFORM_ANDROID | PLATFORM_MAEMO\
       | PLATFORM_PANDORA | PLATFORM_SDL))
 #include "hosted_codec.h"
@@ -571,7 +575,7 @@ void audiohw_set_depth_3d(int val);
 #ifdef AUDIOHW_HAVE_FILTER_ROLL_OFF
 /**
 * Set DAC's oversampling filter roll-off.
- * @param val 0 - sharp roll-off, 1 - slow roll-off.
+ * @param val 0 - sharp roll-off, 1 - slow roll-off, 2 - short roll-off, 3 - bypass.
 * NOTE: AUDIOHW_CAPS need to contain
 *          FILTER_ROLL_OFF_CAP
 */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 8b177963d3..2db12bea4a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -169,6 +169,8 @@
 #define SONY_NWZA860_PAD   64 /* The NWZ-A860 is too different (touchscreen) */
 #define AGPTEK_ROCKER_PAD  65
 #define XDUOO_X3_PAD       66
+#define IHIFI_770_PAD      67
+#define IHIFI_800_PAD      68
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE   1
@@ -284,6 +286,9 @@
 #define LCD_NWZ_LINUX   63 /* as used in the Linux-based NWZ series */
 #define LCD_INGENIC_LINUX 64
 #define LCD_XDUOOX3       65 /* as used by the xDuoo X3 */
+#define LCD_IHIFI770      66 /* as used by IHIFI 770 */
+#define LCD_IHIFI770C     67 /* as used by IHIFI 770C */
+#define LCD_IHIFI800      68 /* as used by IHIFI 800 */
 /* LCD_PIXELFORMAT */
 #define HORIZONTAL_PACKING 1
@@ -581,6 +586,12 @@ Lyre prototype 1 */
 #include "config/samsungypz5.h"
 #elif defined(IHIFI760)
 #include "config/ihifi760.h"
+#elif defined(IHIFI770)
+#include "config/ihifi770.h"
+#elif defined(IHIFI770C)
+#include "config/ihifi770c.h"
+#elif defined(IHIFI800)
+#include "config/ihifi800.h"
 #elif defined(IHIFI960)
 #include "config/ihifi960.h"
 #elif defined(CREATIVE_ZENXFISTYLE)
@@ -974,7 +985,6 @@ Lyre prototype 1 */
 #define USB_STATUS_BY_EVENT
 #define USB_DETECT_BY_REQUEST
 #elif CONFIG_USBOTG == USBOTG_RK27XX
-#define USB_STATUS_BY_EVENT
 #define USB_DETECT_BY_REQUEST
 #endif /* CONFIG_USB == */
 #endif /* HAVE_USBSTACK */
@@ -1193,7 +1203,7 @@ Lyre prototype 1 */
 #endif /* HAVE_USB_CHARGING_ENABLE && HAVE_USBSTACK */
 #ifndef SIMULATOR
-#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND)
+#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND) || (CONFIG_STORAGE & STORAGE_RAMDISK)
 #define STORAGE_GET_INFO
 #endif
 #endif
@@ -1211,7 +1221,8 @@ Lyre prototype 1 */
    (CONFIG_USBOTG == USBOTG_JZ4760) || \
    (CONFIG_USBOTG == USBOTG_M66591) || \
    (CONFIG_USBOTG == USBOTG_DESIGNWARE) || \
-    (CONFIG_USBOTG == USBOTG_AS3525)
+    (CONFIG_USBOTG == USBOTG_AS3525) || \
+    (CONFIG_USBOTG == USBOTG_RK27XX)
 #define USB_HAS_BULK
 #define USB_HAS_INTERRUPT
 #elif defined(CPU_TCC780X) || defined(CPU_TCC77X)
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h
new file mode 100644
index 0000000000..af7acff206
--- /dev/null
+++ b/firmware/export/config/ihifi770.h
@@ -0,0 +1,197 @@
+/*
+ * This config file is for IHIFI 770
+ */
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 108
+#define MODEL_NAME   "IHIFI 770"
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+/* #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FM) */
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_44 | \
+                         SAMPR_CAP_32 | SAMPR_CAP_24 | SAMPR_CAP_22 | \
+                         SAMPR_CAP_16 | SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
+#define HAVE_WM8740
+#define CODEC_SLAVE
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+/* define this if you can flip your LCD */
+/* #define HAVE_LCD_FLIP */
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+/* define this if you can invert the colours on your LCD */
+/* #define HAVE_LCD_INVERT */
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define CONFIG_NAND NAND_RK27XX
+#define HAVE_SW_TONE_CONTROLS
+#define HAVE_HOTSWAP
+#define NUM_DRIVES 1
+#define SECTOR_SIZE 512
+/* for small(ish) SD cards */
+#define HAVE_FAT16SUPPORT
+/* LCD dimensions */
+#define LCD_WIDTH  320
+#define LCD_HEIGHT 240
+/* sqrt(320^2 + 240^2) / 2.4 = 166.7 */
+#define LCD_DPI 167
+#define LCD_DEPTH  16   /* pseudo 262.144 colors */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+/* Define this if the LCD can shut down */
+/* #define HAVE_LCD_SHUTDOWN */
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
+   should be defined as well. */
+#ifndef BOOTLOADER
+/* TODO: #define HAVE_LCD_SLEEP */
+/* TODO: #define HAVE_LCD_SLEEP_SETTING */
+#endif
+#define CONFIG_KEYPAD IHIFI_770_PAD
+/* define this if the target has volume keys which can be used in the lists */
+#define HAVE_VOLUME_IN_LIST
+/* Define this if a programmable hotkey is mapped */
+/* #define HAVE_HOTKEY */
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+/* define this if you have a real-time clock */
+/* #define CONFIG_RTC RTC_NANO2G */
+/* Define if the device can wake from an RTC alarm */
+/* #define HAVE_RTC_ALARM */
+/* Define the type of audio codec */
+/*#define HAVE_RK27XX_CODEC */
+/* #define HAVE_PCM_DMA_ADDRESS */
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+#define HAVE_BACKLIGHT_BRIGHTNESS
+#define MIN_BRIGHTNESS_SETTING      0
+#define MAX_BRIGHTNESS_SETTING      31
+#define DEFAULT_BRIGHTNESS_SETTING  31
+#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+#define BATTERY_CAPACITY_DEFAULT 1050 /* default battery capacity */
+#define BATTERY_CAPACITY_MIN      500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX     1050 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC       10 /* capacity increment */
+#define BATTERY_TYPES_COUNT         1 /* only one type */
+#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
+/* Hardware controlled charging with monitoring */
+#define CONFIG_CHARGING CHARGING_MONITOR
+/* define current usage levels */
+/* TODO: #define CURRENT_NORMAL
+ * TODO: #define CURRENT_BACKLIGHT  23
+ */
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+/* Define this if your LCD can set contrast */
+/* #define HAVE_LCD_CONTRAST */
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+#define STORAGE_NEEDS_ALIGN
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+/** Non-simulator section **/
+#ifndef SIMULATOR
+/* The exact type of CPU */
+#define CONFIG_CPU RK27XX
+/* Define this to the CPU frequency */
+#define CPU_FREQ        200000000
+/* I2C interface */
+#define CONFIG_I2C I2C_RK27XX
+/* define this if the hardware can be powered off while charging */
+/* #define HAVE_POWEROFF_WHILE_CHARGING */
+/* Type of LCD */
+#define CONFIG_LCD LCD_IHIFI770
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_RK27XX
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x071b
+#define USB_PRODUCT_ID 0x3202
+#define HAVE_BOOTLOADER_USB_MODE
+#define RKW_FORMAT
+#define BOOTFILE_EXT "rkw"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+/* disabled for now */
+#undef HAVE_HOTSWAP
+#endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h
new file mode 100644
index 0000000000..c4058f337b
--- /dev/null
+++ b/firmware/export/config/ihifi770c.h
@@ -0,0 +1,197 @@
+/*
+ * This config file is for IHIFI 770C
+ */
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 108
+#define MODEL_NAME   "IHIFI 770C"
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+/* #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FM) */
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_44 | \
+                         SAMPR_CAP_32 | SAMPR_CAP_24 | SAMPR_CAP_22 | \
+                         SAMPR_CAP_16 | SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
+#define HAVE_WM8740
+#define CODEC_SLAVE
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+/* define this if you can flip your LCD */
+/* #define HAVE_LCD_FLIP */
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+/* define this if you can invert the colours on your LCD */
+/* #define HAVE_LCD_INVERT */
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define CONFIG_NAND NAND_RK27XX
+#define HAVE_SW_TONE_CONTROLS
+#define HAVE_HOTSWAP
+#define NUM_DRIVES 1
+#define SECTOR_SIZE 512
+/* for small(ish) SD cards */
+#define HAVE_FAT16SUPPORT
+/* LCD dimensions */
+#define LCD_WIDTH  320
+#define LCD_HEIGHT 240
+/* sqrt(320^2 + 240^2) / 2.4 = 166.7 */
+#define LCD_DPI 167
+#define LCD_DEPTH  16   /* pseudo 262.144 colors */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+/* Define this if the LCD can shut down */
+/* #define HAVE_LCD_SHUTDOWN */
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
+   should be defined as well. */
+#ifndef BOOTLOADER
+/* TODO: #define HAVE_LCD_SLEEP */
+/* TODO: #define HAVE_LCD_SLEEP_SETTING */
+#endif
+#define CONFIG_KEYPAD IHIFI_770_PAD
+/* define this if the target has volume keys which can be used in the lists */
+#define HAVE_VOLUME_IN_LIST
+/* Define this if a programmable hotkey is mapped */
+/* #define HAVE_HOTKEY */
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+/* define this if you have a real-time clock */
+/* #define CONFIG_RTC RTC_NANO2G */
+/* Define if the device can wake from an RTC alarm */
+/* #define HAVE_RTC_ALARM */
+/* Define the type of audio codec */
+/*#define HAVE_RK27XX_CODEC */
+/* #define HAVE_PCM_DMA_ADDRESS */
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+#define HAVE_BACKLIGHT_BRIGHTNESS
+#define MIN_BRIGHTNESS_SETTING      0
+#define MAX_BRIGHTNESS_SETTING      31
+#define DEFAULT_BRIGHTNESS_SETTING  31
+#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+#define BATTERY_CAPACITY_DEFAULT 1050 /* default battery capacity */
+#define BATTERY_CAPACITY_MIN      500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX     1050 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC       10 /* capacity increment */
+#define BATTERY_TYPES_COUNT         1 /* only one type */
+#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
+/* Hardware controlled charging with monitoring */
+#define CONFIG_CHARGING CHARGING_MONITOR
+/* define current usage levels */
+/* TODO: #define CURRENT_NORMAL
+ * TODO: #define CURRENT_BACKLIGHT  23
+ */
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+/* Define this if your LCD can set contrast */
+/* #define HAVE_LCD_CONTRAST */
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+#define STORAGE_NEEDS_ALIGN
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+/** Non-simulator section **/
+#ifndef SIMULATOR
+/* The exact type of CPU */
+#define CONFIG_CPU RK27XX
+/* Define this to the CPU frequency */
+#define CPU_FREQ        200000000
+/* I2C interface */
+#define CONFIG_I2C I2C_RK27XX
+/* define this if the hardware can be powered off while charging */
+/* #define HAVE_POWEROFF_WHILE_CHARGING */
+/* Type of LCD */
+#define CONFIG_LCD LCD_IHIFI770C
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_RK27XX
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x071b
+#define USB_PRODUCT_ID 0x3202
+#define HAVE_BOOTLOADER_USB_MODE
+#define RKW_FORMAT
+#define BOOTFILE_EXT "rkw"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+/* disabled for now */
+#undef HAVE_HOTSWAP
+#endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h
new file mode 100644
index 0000000000..eb1c2015ad
--- /dev/null
+++ b/firmware/export/config/ihifi800.h
@@ -0,0 +1,198 @@
+/*
+ * This config file is for IHIFI 800
+ */
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 109
+#define MODEL_NAME   "IHIFI 800"
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+/* #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FM) */
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_96 | SAMPR_CAP_48 | SAMPR_CAP_44 | \
+                         SAMPR_CAP_32 | SAMPR_CAP_24 | SAMPR_CAP_22 | \
+                         SAMPR_CAP_16 | SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
+#define HAVE_ES9018
+#define CODEC_SLAVE
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+/* define this if you can flip your LCD */
+/* #define HAVE_LCD_FLIP */
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+/* define this if you can invert the colours on your LCD */
+/* #define HAVE_LCD_INVERT */
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define CONFIG_NAND NAND_RK27XX
+#define HAVE_SW_TONE_CONTROLS
+#define HAVE_HOTSWAP
+#define NUM_DRIVES 1
+#define SECTOR_SIZE 512
+/* for small(ish) SD cards */
+#define HAVE_FAT16SUPPORT
+/* LCD dimensions */
+#define LCD_WIDTH  240
+#define LCD_HEIGHT 320
+/* sqrt(240^2 + 320^2) / 2.4 = 166.7 */
+#define LCD_DPI 167
+#define LCD_DEPTH  16   /* pseudo 262.144 colors */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+/* Define this if the LCD can shut down */
+/* #define HAVE_LCD_SHUTDOWN */
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
+   should be defined as well. */
+#ifndef BOOTLOADER
+/* TODO: #define HAVE_LCD_SLEEP */
+/* TODO: #define HAVE_LCD_SLEEP_SETTING */
+#endif
+#define CONFIG_KEYPAD IHIFI_800_PAD
+/* define this if the target has volume keys which can be used in the lists */
+#define HAVE_VOLUME_IN_LIST
+/* Define this if a programmable hotkey is mapped */
+/* #define HAVE_HOTKEY */
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+/* define this if you have a real-time clock */
+/* #define CONFIG_RTC RTC_NANO2G */
+/* Define if the device can wake from an RTC alarm */
+/* #define HAVE_RTC_ALARM */
+/* Define the type of audio codec */
+/*#define HAVE_RK27XX_CODEC */
+/* #define HAVE_PCM_DMA_ADDRESS */
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+#define HAVE_BACKLIGHT_BRIGHTNESS
+#define MIN_BRIGHTNESS_SETTING      0
+#define MAX_BRIGHTNESS_SETTING      31
+#define DEFAULT_BRIGHTNESS_SETTING  31
+#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+/* TODO: Figure out real values */
+#define BATTERY_CAPACITY_DEFAULT 1400 /* default battery capacity */
+#define BATTERY_CAPACITY_MIN      700 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX     1400 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC       10 /* capacity increment */
+#define BATTERY_TYPES_COUNT         1 /* only one type */
+#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
+/* Hardware controlled charging with monitoring */
+#define CONFIG_CHARGING CHARGING_MONITOR
+/* define current usage levels */
+/* TODO: #define CURRENT_NORMAL
+ * TODO: #define CURRENT_BACKLIGHT  23
+ */
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+/* Define this if your LCD can set contrast */
+/* #define HAVE_LCD_CONTRAST */
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+#define STORAGE_NEEDS_ALIGN
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+/** Non-simulator section **/
+#ifndef SIMULATOR
+/* The exact type of CPU */
+#define CONFIG_CPU RK27XX
+/* Define this to the CPU frequency */
+#define CPU_FREQ        200000000
+/* I2C interface */
+#define CONFIG_I2C I2C_RK27XX
+/* define this if the hardware can be powered off while charging */
+/* #define HAVE_POWEROFF_WHILE_CHARGING */
+/* Type of LCD */
+#define CONFIG_LCD LCD_IHIFI800
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_RK27XX
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x071b
+#define USB_PRODUCT_ID 0x3202
+#define HAVE_BOOTLOADER_USB_MODE
+#define RKW_FORMAT
+#define BOOTFILE_EXT "rkw"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+/* disabled for now */
+#undef HAVE_HOTSWAP
+#endif /* SIMULATOR */
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 503857bd43..69cf9f3758 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -63,7 +63,7 @@
 /* commented for now */
 /* #define HAVE_HOTSWAP */
-#define NUM_DRIVES 2
+#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 /* for small(ish) SD cards */
diff --git a/firmware/export/es9018.h b/firmware/export/es9018.h
new file mode 100644
index 0000000000..41ea0d0b1c
--- /dev/null
+++ b/firmware/export/es9018.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef _ES9018_H
+#define _ES9018_H
+#define ES9018_VOLUME_MIN       -1270
+#define ES9018_VOLUME_MAX       0
+#define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
+#define AUDIOHW_HAVE_SHORT_ROLL_OFF
+AUDIOHW_SETTING(VOLUME, "dB", 0, 1, ES9018_VOLUME_MIN/10, ES9018_VOLUME_MAX/10, 0)
+AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 3, 0)
+void es9018_write_reg(uint8_t reg, uint8_t val);
+uint8_t es9018_read_reg(uint8_t reg);
+void audiohw_mute(void);
+void audiohw_unmute(void);
+#endif
diff --git a/firmware/export/rk27xx.h b/firmware/export/rk27xx.h
index 58b3fe8166..dc6bca7cbd 100644
--- a/firmware/export/rk27xx.h
+++ b/firmware/export/rk27xx.h
@@ -8,7 +8,8 @@
 #define FLASH_BANK1 0x11000000
 #define USB_NUM_ENDPOINTS 16
-#define USB_DEVBSS_ATTR
+/* cache aligned */
+#define USB_DEVBSS_ATTR        __attribute__((aligned(CACHEALIGN_SIZE)))
 /* Timers */
 #define APB0_TIMER             (ARM_BUS0_BASE + 0x00000000)
@@ -811,6 +812,7 @@
 #define RXVOIDINTEN            (1<<5)
 #define RXERRINTEN             (1<<6)
 #define RXACKINTEN             (1<<7)
+#define RXCFINTE               (1<<12)
 /* bits 31:8 reserved for EP0 */
 /* bits 31:14 reserved for others */
@@ -833,6 +835,7 @@
 #define TXERRINTEN             (1<<5)
 #define TXACKINTEN             (1<<6)
 #define TXDMADNEN              (1<<7) /* reserved for EP0 */
+#define TXCFINTE               (1<<12)
 /* bits 31:8 reserved */
 /* TXnBUF bits */
diff --git a/firmware/export/wm8740.h b/firmware/export/wm8740.h
new file mode 100644
index 0000000000..ff27a7e41e
--- /dev/null
+++ b/firmware/export/wm8740.h
@@ -0,0 +1,83 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef _WM8740_H
+#define _WM8740_H
+#define WM8740_VOLUME_MIN       -1270
+#define WM8740_VOLUME_MAX       0
+#define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
+AUDIOHW_SETTING(VOLUME, "dB", 0, 1, WM8740_VOLUME_MIN/10, WM8740_VOLUME_MAX/10, 0)
+AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 1, 0)
+#define WM8740_REG0             0x0000
+#define WM8740_REG1             0x0200
+#define WM8740_REG2             0x0400
+#define WM8740_REG3             0x0600
+#define WM8740_REG4             0x0C00
+/**
+ * Register #0
+ */
+#define WM8740_LDL              (1<<8)
+/**
+ * Register #1
+ */
+#define WM8740_LDR              (1<<8)
+/**
+ * Register #2
+ */
+#define WM8740_MUT              (1<<0)
+#define WM8740_DEM              (1<<1)
+#define WM8740_OPE              (1<<2)
+#define WM8740_IW0              (1<<3)
+#define WM8740_IW1              (1<<4)
+/**
+ * Register #3
+ */
+#define WM8740_I2S              (1<<0)
+#define WM8740_LRP              (1<<1)
+#define WM8740_ATC              (1<<2)
+#define WM8740_SR0              (1<<3)
+#define WM8740_REV              (1<<4)
+#define WM8740_SF0              (1<<6)
+#define WM8740_SF1              (1<<7)
+#define WM8740_IZD              (1<<8)
+/**
+ * Register #4
+ */
+#define WM8740_DIFF0            (1<<4)
+#define WM8740_DIFF1            (1<<5)
+#define WM8740_CDD              (1<<6)
+void audiohw_mute(void);
+void audiohw_unmute(void);
+void wm8740_set_ml(const int);
+void wm8740_set_mc(const int);
+void wm8740_set_md(const int);
+#endif
diff --git a/firmware/target/arm/rk27xx/backlight-rk27xx.c b/firmware/target/arm/rk27xx/backlight-rk27xx.c
index 1756fcdb29..61e887af46 100644
--- a/firmware/target/arm/rk27xx/backlight-rk27xx.c
+++ b/firmware/target/arm/rk27xx/backlight-rk27xx.c
@@ -75,6 +75,13 @@ static const unsigned short lin_brightness[] = {
    759, 768, 778, 788, 800, 812, 826, 841,
    856, 873, 891, 910, 931, 952, 975, 1000
 };
+#elif defined(IHIFI770) || defined(IHIFI770C) || defined(IHIFI800)
+static const unsigned short lin_brightness[] = {
+     4096,  4215,  4381,  4603,  4887, 5243,   5679,  6201,
+     6818,  7538,  8370,  9320, 10397, 11609, 12963, 14469,
+    16133, 17963, 19968, 22156, 24534, 27110, 29893, 32890,
+    36109, 39559, 43246, 47180, 51368, 55817, 60537, 65535
+};
 #endif
 bool backlight_hw_init(void)
diff --git a/firmware/target/arm/rk27xx/debug-rk27xx.c b/firmware/target/arm/rk27xx/debug-rk27xx.c
index 83bc1a5af6..ea0190049f 100644
--- a/firmware/target/arm/rk27xx/debug-rk27xx.c
+++ b/firmware/target/arm/rk27xx/debug-rk27xx.c
@@ -35,6 +35,8 @@
 #elif defined(HM60X) || defined(HM801) || (CONFIG_KEYPAD == MA_PAD) || \
    (CONFIG_KEYPAD == IHIFI_PAD)
 #define DEBUG_CANCEL BUTTON_LEFT
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
+#define DEBUG_CANCEL BUTTON_POWER
 #endif
 /*  Skeleton for adding target specific debug info to the debug menu
diff --git a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c
new file mode 100644
index 0000000000..a21ea9cfef
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi770.c
@@ -0,0 +1,88 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "system.h"
+#include "kernel.h"
+#include "audiohw.h"
+void wm8740_hw_init(void)
+{
+    GPIO_PADR &= ~(1<<0); /* MD */
+    GPIO_PACON |= (1<<0);
+    GPIO_PADR &= ~(1<<1); /* MC */
+    GPIO_PACON |= (1<<1);
+    SCU_IOMUXB_CON &= ~(1<<2);
+    GPIO_PCDR |= (1<<4);  /* ML */
+    GPIO_PCCON |= (1<<4);
+}
+void wm8740_set_md(const int val)
+{
+    if (val)
+        GPIO_PADR |= (1<<0);
+    else
+        GPIO_PADR &= ~(1<<0);
+}
+void wm8740_set_mc(const int val)
+{
+    if (val)
+        GPIO_PADR |= (1<<1);
+    else
+        GPIO_PADR &= ~(1<<1);
+}
+void wm8740_set_ml(const int val)
+{
+    if (val)
+        GPIO_PCDR |= (1<<4);
+    else
+        GPIO_PCDR &= ~(1<<4);
+}
+static void pop_ctrl(const int val)
+{
+    if (val)
+        GPIO_PADR |= (1<<7);
+    else
+        GPIO_PADR &= ~(1<<7);
+}
+void audiohw_postinit(void)
+{
+    pop_ctrl(0);
+    sleep(HZ/4);
+    wm8740_hw_init();
+    audiohw_init();
+    sleep(HZ/2);
+    pop_ctrl(1);
+    sleep(HZ/4);
+    audiohw_unmute();
+}
+void audiohw_close(void)
+{
+    audiohw_mute();
+    pop_ctrl(0);
+    sleep(HZ/4);
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c
new file mode 100644
index 0000000000..14b126c72a
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/audio-ihifi800.c
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "system.h"
+#include "kernel.h"
+#include "audiohw.h"
+#include "i2c-rk27xx.h"
+#define ES9018_I2C_ADDR    0x90
+static unsigned char buf;
+void es9018_write_reg(uint8_t reg, uint8_t val)
+{
+    buf = val;
+    i2c_write(ES9018_I2C_ADDR, reg, sizeof(buf), (void*)&buf);
+}
+uint8_t es9018_read_reg(uint8_t reg)
+{
+    i2c_read(ES9018_I2C_ADDR, reg, sizeof(buf), (void*)&buf);
+    return buf;
+}
+static void pop_ctrl(const int val)
+{
+    if (val)
+        GPIO_PADR |= (1<<7);
+    else
+        GPIO_PADR &= ~(1<<7);
+}
+void audiohw_postinit(void)
+{
+    pop_ctrl(0);
+    sleep(HZ/4);
+    audiohw_init();
+    sleep(HZ/2);
+    pop_ctrl(1);
+    sleep(HZ/4);
+    audiohw_unmute();
+}
+void audiohw_close(void)
+{
+    audiohw_mute();
+    pop_ctrl(0);
+    sleep(HZ/4);
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c b/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c
new file mode 100644
index 0000000000..172853a83a
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/button-ihifi.c
@@ -0,0 +1,99 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "system.h"
+#include "kernel.h"
+#include "button.h"
+#include "adc.h"
+#include "backlight.h"
+static bool soft_hold = false;
+#ifndef BOOTLOADER
+static unsigned hold_counter = 0;
+#ifndef IHIFI800
+#define HOLDBUTTON gpio_btn
+#define HOLDCNTMAX HZ
+#else
+#define HOLDBUTTON (gpio_btn) && (adc_val > 325) && (adc_val < 480)
+#define HOLDCNTMAX (HZ/10)
+#endif
+#endif
+void button_init_device(void) {
+    GPIO_PCCON &= ~(1<<1); /* PWR BTN */
+    GPIO_PCCON &= ~(1<<7); /* CD */
+}
+bool button_hold(void)
+{
+    return soft_hold;
+}
+int button_read_device(void) {
+    int adc_val = adc_read(ADC_BUTTONS);
+    int gpio_btn = GPIO_PCDR & (1<<1);
+    int button = BUTTON_NONE;
+    if (gpio_btn)
+        button |= BUTTON_POWER;
+#ifndef BOOTLOADER
+    if (HOLDBUTTON) {
+        if (++hold_counter == HOLDCNTMAX) {
+            soft_hold = !soft_hold;
+            backlight_hold_changed(soft_hold);
+        }
+    } else {
+        hold_counter = 0;
+    }
+    if (soft_hold) {
+        return (hold_counter <= HOLDCNTMAX) ? BUTTON_NONE : button;
+    }
+#endif
+    if (adc_val < 792) {
+        if (adc_val < 480) {
+            if (adc_val < 170) {
+                if (adc_val < 46) {
+                    button |= BUTTON_HOME;  // 0-45
+                } else {
+                    button |= BUTTON_PLAY;  // 46-169
+                }
+            } else {
+                if (adc_val < 325) {
+                    button |= BUTTON_NEXT;  // 170-324
+                } else {
+                    button |= BUTTON_VOL_UP;// 325-479
+                }
+            }
+        } else {
+            if (adc_val < 636) {
+                button |= BUTTON_VOL_DOWN;// 480-635
+            } else {
+                button |= BUTTON_PREV; // 636-791
+            }
+        }
+    }
+    return button;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/button-target.h b/firmware/target/arm/rk27xx/ihifi2/button-target.h
new file mode 100644
index 0000000000..211e20e1d6
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/button-target.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef _BUTTON_TARGET_H_
+#define _BUTTON_TARGET_H_
+#define HAS_BUTTON_HOLD
+/* Main unit's buttons */
+#define BUTTON_POWER      0x00000001
+#define BUTTON_HOME       0x00000002
+#define BUTTON_PREV       0x00000004
+#define BUTTON_NEXT       0x00000008
+#define BUTTON_PLAY       0x00000010
+#define BUTTON_VOL_UP     0x00000020
+#define BUTTON_VOL_DOWN   0x00000040
+#define BUTTON_LEFT  0
+#define BUTTON_RIGHT 0
+#define BUTTON_MAIN  (BUTTON_POWER | BUTTON_HOME | BUTTON_PREV | BUTTON_NEXT | \
+                      BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN)
+/* Software power-off */
+#ifndef IHIFI800
+#define POWEROFF_BUTTON BUTTON_POWER
+#else
+#define POWEROFF_BUTTON BUTTON_HOME
+#endif
+#define POWEROFF_COUNT  30
+#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c
new file mode 100644
index 0000000000..23505d9fa0
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c
@@ -0,0 +1,285 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "kernel.h"
+#include "lcd.h"
+#include "system.h"
+#include "cpu.h"
+#include "lcdif-rk27xx.h"
+static bool display_on = false;
+void lcd_display_init(void)
+{
+    unsigned int i, x, y;
+    lcd_cmd(0x11);
+    lcd_cmd(0x13);
+    mdelay(120);
+    lcd_cmd(0x29);
+    lcd_cmd(0xB0);
+    lcd_data(0x05);
+    lcd_data(0x00);
+    lcd_data(0xF0);
+    lcd_data(0x0A);
+    lcd_data(0x41);
+    lcd_data(0x02);
+    lcd_data(0x0A);
+    lcd_data(0x30);
+    lcd_data(0x31);
+    lcd_data(0x36);
+    lcd_data(0x37);
+    lcd_data(0x40);
+    lcd_data(0x02);
+    lcd_data(0x3F);
+    lcd_data(0x40);
+    lcd_data(0x02);
+    lcd_data(0x81);
+    lcd_data(0x04);
+    lcd_data(0x05);
+    lcd_data(0x64);
+    lcd_cmd(0xFC);
+    lcd_data(0x88);
+    lcd_data(0x00);
+    lcd_data(0x10);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x10);
+    lcd_data(0x42);
+    lcd_data(0x42);
+    lcd_data(0x22);
+    lcd_data(0x11);
+    lcd_data(0x11);
+    lcd_data(0x22);
+    lcd_data(0x99);
+    lcd_data(0xAA);
+    lcd_data(0xAA);
+    lcd_data(0xAA);
+    lcd_data(0xBB);
+    lcd_data(0xBB);
+    lcd_data(0xAA);
+    lcd_data(0x33);
+    lcd_data(0x33);
+    lcd_data(0x11);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0xC0);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_cmd(0xFD);
+    lcd_data(0x88);
+    lcd_data(0x00);
+    lcd_data(0x10);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x10);
+    lcd_data(0x42);
+    lcd_data(0x42);
+    lcd_data(0x22);
+    lcd_data(0x11);
+    lcd_data(0x11);
+    lcd_data(0x22);
+    lcd_data(0x99);
+    lcd_data(0xAA);
+    lcd_data(0xAA);
+    lcd_data(0xAA);
+    lcd_data(0xBB);
+    lcd_data(0xBB);
+    lcd_data(0xAA);
+    lcd_data(0x33);
+    lcd_data(0x33);
+    lcd_data(0x11);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x01);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x03);
+    lcd_cmd(0xBE);
+    lcd_data(0x00);
+    lcd_data(0x15);
+    lcd_data(0x16);
+    lcd_data(0x08);
+    lcd_data(0x09);
+    lcd_data(0x15);
+    lcd_data(0x10);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_cmd(0xC0);
+    lcd_data(0x0E);
+    lcd_data(0x01);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_cmd(0xC1);
+    lcd_data(0x2F);
+    lcd_data(0x23);
+    lcd_data(0xB4);
+    lcd_data(0xFF);
+    lcd_data(0x24);
+    lcd_data(0x03);
+    lcd_data(0x20);
+    lcd_data(0x02);
+    lcd_data(0x02);
+    lcd_data(0x02);
+    lcd_data(0x20);
+    lcd_data(0x20);
+    lcd_data(0x00);
+    lcd_cmd(0xC2);
+    lcd_data(0x03);
+    lcd_cmd(0x26);
+    lcd_data(0x08);
+    lcd_cmd(0x35);
+    lcd_cmd(0x36);
+    lcd_data(0x04);
+    lcd_cmd(0x3A);
+    lcd_data(0x05);
+    lcd_cmd(0x2A);
+    lcd_data(0x013F);
+    lcd_cmd(0x2B);
+    lcd_data(0xEF);
+    lcd_cmd(0x2C);
+    lcd_cmd(0x2D);
+    for (i = 0; i < 0x20; i++) {
+        lcd_data(i << 1);
+    }
+    for (i = 0; i < 0x40; i++) {
+        lcd_data(i);
+    }
+    for (i = 0; i < 0x20; i++) {
+        lcd_data(i << 1);
+    }
+    lcd_cmd(0x2A);
+    lcd_data(0x00);
+    lcd_cmd(0x2B);
+    lcd_data(0x00);
+    lcd_cmd(0x11);
+    mdelay(120);
+    lcd_cmd(0x29);
+    lcd_cmd(0x2C);
+    for (x = 0; x < LCD_WIDTH; x++)
+        for(y=0; y < LCD_HEIGHT; y++)
+            lcd_data(0x00);
+    display_on = true;
+}
+void lcd_enable (bool on)
+{
+    if (on == display_on)
+        return;
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    if (on) {
+        lcd_cmd(0x11);
+        mdelay(120);
+        lcd_cmd(0x29);
+        lcd_cmd(0x2C);
+    } else {
+        lcd_cmd(0x28);
+        mdelay(120);
+        lcd_cmd(0x10);
+    }
+    display_on = on;
+    LCDC_CTRL &= ~RGB24B;
+}
+void lcd_set_gram_area(int x_start, int y_start,
+                       int x_end, int y_end)
+{
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    lcd_cmd(0x2A);
+    lcd_data((x_start&0xff00)>>8);
+    lcd_data(x_start&0x00ff);
+    lcd_data((x_end&0xff00)>>8);
+    lcd_data(x_end&0x00ff);
+    lcd_cmd(0x2B);
+    lcd_data((y_start&0xff00)>>8);
+    lcd_data(y_start&0x00ff);
+    lcd_data((y_end&0xff00)>>8);
+    lcd_data(y_end&0x00ff);
+    lcd_cmd(0x2C);
+    LCDC_CTRL &= ~RGB24B;
+}
+bool lcd_active()
+{
+    return display_on;
+}
+/* Blit a YUV bitmap directly to the LCD */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
new file mode 100644
index 0000000000..311b8057cb
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c
@@ -0,0 +1,248 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "kernel.h"
+#include "lcd.h"
+#include "system.h"
+#include "cpu.h"
+#include "lcdif-rk27xx.h"
+static bool display_on = false;
+void lcd_display_init(void)
+{
+    unsigned int x, y;
+    lcd_cmd(0x13);
+    mdelay(120);
+    lcd_cmd(0x35);
+    lcd_data(0x00);
+    lcd_cmd(0x36);
+    lcd_data(0x48);
+    lcd_cmd(0xD0);
+    lcd_data(0x00);
+    lcd_data(0x05);
+    lcd_cmd(0xEF);
+    lcd_data(0x07);
+    lcd_cmd(0xF2);
+    lcd_data(0x1B);
+    lcd_data(0x16);
+    lcd_data(0x0F);
+    lcd_data(0x08);
+    lcd_data(0x08);
+    lcd_data(0x08);
+    lcd_data(0x08);
+    lcd_data(0x10);
+    lcd_data(0x00);
+    lcd_data(0x1C);
+    lcd_data(0x16);
+    lcd_cmd(0xF3);
+    lcd_data(0x01);
+    lcd_data(0x41);
+    lcd_data(0x15);
+    lcd_data(0x0D);
+    lcd_data(0x33);
+    lcd_data(0x63);
+    lcd_data(0x46);
+    lcd_data(0x10);
+    lcd_cmd(0xF4);
+    lcd_data(0x5B);
+    lcd_data(0x5B);
+    lcd_data(0x55);
+    lcd_data(0x55);
+    lcd_data(0x44);
+    lcd_cmd(0xF5);
+    lcd_data(0x12);
+    lcd_data(0x11);
+    lcd_data(0x06);
+    lcd_data(0xF0);
+    lcd_data(0x00);
+    lcd_data(0x1F);
+    lcd_cmd(0xF6);
+    lcd_data(0x80);
+    lcd_data(0x10);
+    lcd_data(0x00);
+    lcd_cmd(0xFD);
+    lcd_data(0x11);
+    lcd_data(0x1D);
+    lcd_data(0x00);
+    lcd_cmd(0xF8);
+    lcd_data(0x00);
+    lcd_data(0x15);
+    lcd_data(0x01);
+    lcd_data(0x08);
+    lcd_data(0x15);
+    lcd_data(0x22);
+    lcd_data(0x25);
+    lcd_data(0x28);
+    lcd_data(0x14);
+    lcd_data(0x13);
+    lcd_data(0x10);
+    lcd_data(0x11);
+    lcd_data(0x09);
+    lcd_data(0x24);
+    lcd_data(0x28);
+    lcd_cmd(0xF9);
+    lcd_data(0x00);
+    lcd_data(0x15);
+    lcd_data(0x01);
+    lcd_data(0x08);
+    lcd_data(0x15);
+    lcd_data(0x22);
+    lcd_data(0x25);
+    lcd_data(0x28);
+    lcd_data(0x14);
+    lcd_data(0x13);
+    lcd_data(0x10);
+    lcd_data(0x11);
+    lcd_data(0x09);
+    lcd_data(0x24);
+    lcd_data(0x28);
+    lcd_cmd(0xFC);
+    lcd_data(0x00);
+    lcd_data(0x15);
+    lcd_data(0x01);
+    lcd_data(0x08);
+    lcd_data(0x15);
+    lcd_data(0x22);
+    lcd_data(0x25);
+    lcd_data(0x28);
+    lcd_data(0x14);
+    lcd_data(0x13);
+    lcd_data(0x10);
+    lcd_data(0x11);
+    lcd_data(0x09);
+    lcd_data(0x24);
+    lcd_data(0x28);
+    lcd_cmd(0x36);
+    lcd_data(0x48);
+    lcd_cmd(0x3A);
+    lcd_data(0x55);
+    lcd_cmd(0x2A);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x01);
+    lcd_data(0x3F);
+    lcd_cmd(0x2B);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0xEF);
+    lcd_cmd(0x11);
+    mdelay(120);
+    lcd_cmd(0x29);
+    lcd_cmd(0x2C);
+    for (x = 0; x < LCD_WIDTH; x++)
+        for(y=0; y < LCD_HEIGHT; y++)
+            lcd_data(0x00);
+    display_on = true;
+}
+void lcd_enable (bool on)
+{
+    if (on == display_on)
+        return;
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    if (on) {
+        lcd_cmd(0x11);
+        mdelay(120);
+        lcd_cmd(0x29);
+        lcd_cmd(0x2C);
+    } else {
+        lcd_cmd(0x28);
+        mdelay(120);
+        lcd_cmd(0x10);
+    }
+    display_on = on;
+    LCDC_CTRL &= ~RGB24B;
+}
+void lcd_set_gram_area(int x_start, int y_start,
+                       int x_end, int y_end)
+{
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    lcd_cmd(0x2A);
+    lcd_data((x_start&0xff00)>>8);
+    lcd_data(x_start&0x00ff);
+    lcd_data((x_end&0xff00)>>8);
+    lcd_data(x_end&0x00ff);
+    lcd_cmd(0x2B);
+    lcd_data((y_start&0xff00)>>8);
+    lcd_data(y_start&0x00ff);
+    lcd_data((y_end&0xff00)>>8);
+    lcd_data(y_end&0x00ff);
+    lcd_cmd(0x2C);
+    LCDC_CTRL &= ~RGB24B;
+}
+bool lcd_active()
+{
+    return display_on;
+}
+/* Blit a YUV bitmap directly to the LCD */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c
new file mode 100644
index 0000000000..821b52dcb6
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c
@@ -0,0 +1,228 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "kernel.h"
+#include "lcd.h"
+#include "system.h"
+#include "cpu.h"
+#include "lcdif-rk27xx.h"
+static bool display_on = false;
+void lcd_display_init(void)
+{
+    unsigned int x, y;
+    lcd_cmd(0xEF);
+    lcd_data(0x03);
+    lcd_data(0x80);
+    lcd_data(0x02);
+    lcd_cmd(0xCF);
+    lcd_data(0x00);
+    lcd_data(0xC1);
+    lcd_data(0x30);
+    lcd_cmd(0xED);
+    lcd_data(0x67);
+    lcd_data(0x03);
+    lcd_data(0x12);
+    lcd_data(0x81);
+    lcd_cmd(0xE8);
+    lcd_data(0x85);
+    lcd_data(0x11);
+    lcd_data(0x79);
+    lcd_cmd(0xCB);
+    lcd_data(0x39);
+    lcd_data(0x2C);
+    lcd_data(0x00);
+    lcd_data(0x34);
+    lcd_data(0x06);
+    lcd_cmd(0xF7);
+    lcd_data(0x20);
+    lcd_cmd(0xEA);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_cmd(0xC0);
+    lcd_data(0x1D);
+    lcd_cmd(0xC1);
+    lcd_data(0x12);
+    lcd_cmd(0xC5);
+    lcd_data(0x44);
+    lcd_data(0x3C);
+    lcd_cmd(0xC7);
+    lcd_data(0x88);
+    lcd_cmd(0x3A);
+    lcd_data(0x55);
+    lcd_cmd(0x36);
+    lcd_data(0x0C);
+    lcd_cmd(0xB1);
+    lcd_data(0x00);
+    lcd_data(0x17);
+    lcd_cmd(0xB6);
+    lcd_data(0x0A);
+    lcd_data(0xA2);
+    lcd_cmd(0xF2);
+    lcd_data(0x00);
+    lcd_cmd(0x26);
+    lcd_data(0x01);
+    lcd_cmd(0xE0);
+    lcd_data(0x0F);
+    lcd_data(0x22);
+    lcd_data(0x1C);
+    lcd_data(0x1B);
+    lcd_data(0x08);
+    lcd_data(0x0F);
+    lcd_data(0x48);
+    lcd_data(0xB8);
+    lcd_data(0x34);
+    lcd_data(0x05);
+    lcd_data(0x0C);
+    lcd_data(0x09);
+    lcd_data(0x0F);
+    lcd_data(0x07);
+    lcd_data(0x00);
+    lcd_cmd(0xE1);
+    lcd_data(0x00);
+    lcd_data(0x23);
+    lcd_data(0x24);
+    lcd_data(0x07);
+    lcd_data(0x10);
+    lcd_data(0x07);
+    lcd_data(0x38);
+    lcd_data(0x47);
+    lcd_data(0x4B);
+    lcd_data(0x0A);
+    lcd_data(0x13);
+    lcd_data(0x06);
+    lcd_data(0x30);
+    lcd_data(0x38);
+    lcd_data(0x0F);
+    lcd_cmd(0x2A);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0xEF);
+    lcd_cmd(0x2B);
+    lcd_data(0x00);
+    lcd_data(0x00);
+    lcd_data(0x01);
+    lcd_data(0x3F);
+    lcd_cmd(0x11);
+    mdelay(120);
+    lcd_cmd(0x29);
+    lcd_cmd(0x2C);
+    for (x = 0; x < LCD_WIDTH; x++)
+        for(y=0; y < LCD_HEIGHT; y++)
+            lcd_data(0x00);
+    display_on = true;
+}
+void lcd_enable (bool on)
+{
+    if (on == display_on)
+        return;
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    if (on) {
+        lcd_cmd(0x11);
+        mdelay(120);
+        lcd_cmd(0x29);
+        lcd_cmd(0x2C);
+    } else {
+        lcd_cmd(0x28);
+        mdelay(120);
+        lcd_cmd(0x10);
+    }
+    display_on = on;
+    LCDC_CTRL &= ~RGB24B;
+}
+void lcd_set_gram_area(int x_start, int y_start,
+                       int x_end, int y_end)
+{
+    lcdctrl_bypass(1);
+    LCDC_CTRL |= RGB24B;
+    lcd_cmd(0x2A);
+    lcd_data((x_start&0xff00)>>8);
+    lcd_data(x_start&0x00ff);
+    lcd_data((x_end&0xff00)>>8);
+    lcd_data(x_end&0x00ff);
+    lcd_cmd(0x2B);
+    lcd_data((y_start&0xff00)>>8);
+    lcd_data(y_start&0x00ff);
+    lcd_data((y_end&0xff00)>>8);
+    lcd_data(y_end&0x00ff);
+    lcd_cmd(0x2C);
+    LCDC_CTRL &= ~RGB24B;
+}
+bool lcd_active()
+{
+    return display_on;
+}
+/* Blit a YUV bitmap directly to the LCD */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-target.h b/firmware/target/arm/rk27xx/ihifi2/lcd-target.h
new file mode 100644
index 0000000000..6b2aa5d8a5
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/lcd-target.h
@@ -0,0 +1,26 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#ifndef LCD_TARGET_H
+#define LCD_TARGET_H
+#define LCD_DATABUS_WIDTH LCDIF_16BIT
+#endif
diff --git a/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c b/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c
new file mode 100644
index 0000000000..cc489eacfe
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/power-ihifi.c
@@ -0,0 +1,53 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 <stdbool.h>
+#include "config.h"
+#include "inttypes.h"
+#include "power.h"
+#include "panic.h"
+#include "system.h"
+#include "usb_core.h"   /* for usb_charging_maxcurrent_change */
+#include "adc.h"
+void power_off(void)
+{
+    GPIO_PCCON &= ~(1<<0);
+    while(1);
+}
+void power_init(void)
+{
+    GPIO_PCDR |= (1<<0);
+    GPIO_PCCON |= (1<<0);
+    GPIO_PADR &= ~(1<<7);  /* MUTE */
+    GPIO_PACON |= (1<<7);
+}
+unsigned int power_input_status(void)
+{
+    return (usb_detect() == USB_INSERTED) ? POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
+}
+bool charging_state(void)
+{
+    return (adc_read(ADC_EXTRA) < 512);
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
new file mode 100644
index 0000000000..b0ff4f5a7b
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770.c
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "adc.h"
+#include "adc-target.h"
+#include "powermgmt.h"
+/*  Battery voltage calculation and discharge/charge curves for the iHiFi 770
+    Battery voltage is calculated under the assumption that the adc full-scale
+    readout represents 3.00V and that the battery ADC channel is fed with
+    exactly half of the battery voltage (through a resistive divider).
+    Charge curve have not been calibrated yet.
+*/
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    /* 5% */
+    3500,
+};
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    /* 0% */
+    3300,
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    { 3300, 3570, 3660, 3696, 3712, 3742, 3798, 3865, 3935, 4020, 4130 }
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+    { 3300, 3570, 3660, 3696, 3712, 3742, 3798, 3865, 3935, 4020, 4130 };
+/* full-scale ADC readout (2^10) in millivolt */
+#define BATTERY_SCALE_FACTOR 6296
+/* Returns battery voltage from ADC [millivolts] */
+int _battery_voltage(void)
+{
+    return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
new file mode 100644
index 0000000000..613553010b
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi770c.c
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "adc.h"
+#include "adc-target.h"
+#include "powermgmt.h"
+/*  Battery voltage calculation and discharge/charge curves for the iHiFi 770C
+    Battery voltage is calculated under the assumption that the adc full-scale
+    readout represents 3.00V and that the battery ADC channel is fed with
+    exactly half of the battery voltage (through a resistive divider).
+    Charge curve have not been calibrated yet.
+*/
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    /* 5% */
+    3500,
+};
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    /* 0% */
+    3300,
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    { 3300, 3570, 3660, 3696, 3712, 3742, 3798, 3865, 3935, 4020, 4130 }
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+    { 3300, 3570, 3660, 3696, 3712, 3742, 3798, 3865, 3935, 4020, 4130 };
+/* full-scale ADC readout (2^10) in millivolt */
+#define BATTERY_SCALE_FACTOR 6296
+/* Returns battery voltage from ADC [millivolts] */
+int _battery_voltage(void)
+{
+    return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10;
+}
diff --git a/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
new file mode 100644
index 0000000000..26f4e47b93
--- /dev/null
+++ b/firmware/target/arm/rk27xx/ihifi2/powermgmt-ihifi800.c
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 "adc.h"
+#include "adc-target.h"
+#include "powermgmt.h"
+/*  Battery voltage calculation and discharge/charge curves for the iHiFi 800
+    Battery voltage is calculated under the assumption that the adc full-scale
+    readout represents 3.00V and that the battery ADC channel is fed with
+    exactly half of the battery voltage (through a resistive divider).
+    Charge curve have not been calibrated yet.
+*/
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    /* 5% */
+    3628,
+};
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    /* 0% */
+    3300,
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    { 3300, 3649, 3701, 3726, 3745, 3778, 3831, 3904, 3965, 4056, 4160 }
+};
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+    { 3300, 3649, 3701, 3726, 3745, 3778, 3831, 3904, 3965, 4056, 4160 };
+/* full-scale ADC readout (2^10) in millivolt */
+#define BATTERY_SCALE_FACTOR 6296
+/* Returns battery voltage from ADC [millivolts] */
+int _battery_voltage(void)
+{
+    return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10;
+}
diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c
index 2ddfd0cf0a..e5467058de 100644
--- a/firmware/target/arm/rk27xx/sd-rk27xx.c
+++ b/firmware/target/arm/rk27xx/sd-rk27xx.c
@@ -97,7 +97,7 @@ void INT_SD(void)
        /* get the status */
        cmd_error = SD_CMDRES;
        semaphore_release(&command_completion_signal);
-    }    
+    }
    /* data transfer status pending */
    if(status & DATA_XFER_STAT)
@@ -140,13 +140,15 @@ static void mmu_buff_reset(void)
 static inline bool card_detect_target(void)
 {
-#if defined(RK27_GENERIC)
+#if defined(RK27_GENERIC) || defined(IHIFI770) || defined(IHIFI770C) || defined(IHIFI800)
-/* My generic device uses PC7 pin, active low */
+    /* PC7, active low */
    return !(GPIO_PCDR & 0x80);
 #elif defined(HM60X) || defined(HM801)
+    /* PF2, active low */
    return !(GPIO_PFDR & (1<<2));
 #elif defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C)
-    return (GPIO_PCDR & 0x80);
+    /* PC7, active high */
+    return (GPIO_PCDR & (1<<7));
 #elif defined(IHIFI760) || defined(IHIFI960)
    /* TODO: find out pin */
    return true;
@@ -190,7 +192,7 @@ static bool send_cmd(const int cmd, const int arg, const int res,
 #if 0
 /* for some misterious reason the card does not report itself as being in TRAN
 * but transfers are successful. Rockchip OF does not check the card state
- * after SELECT. I checked two different cards. 
+ * after SELECT. I checked two different cards.
 */
 static void print_card_status(void)
 {
@@ -224,7 +226,7 @@ static int sd_wait_for_tran_state(void)
        {
            return 0;
        }
-    
        if(TIME_AFTER(current_tick, timeout))
        {
            return -10 * ((response >> 9) & 0xf);
@@ -265,7 +267,7 @@ static int sd_init_card(void)
    /* CMD0 Go Idle  */
    if(!send_cmd(SD_GO_IDLE_STATE, 0, RES_NO, NULL))
        return -1;
-    
    sleep(1);
    /* CMD8 Check for v2 sd card.  Must be sent before using ACMD41
@@ -671,7 +673,7 @@ int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
 #endif
    return ret;
-   
 #endif /* defined(BOOTLOADER) */
 }
diff --git a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
index badc3ab5ed..057ecf6ebc 100644
--- a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
+++ b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c
@@ -28,37 +28,16 @@
 #include "kernel.h"
 #include "panic.h"
-//#include "usb-s3c6400x.h"
 #include "usb_ch9.h"
 #include "usb_core.h"
 #include <inttypes.h>
 #include "power.h"
+#define LOGF_ENABLE
 #include "logf.h"
 typedef volatile uint32_t reg32;
-/* Bulk OUT: ep1, ep4, ep7, ep10, ep13 */
-#define BOUT_RXSTAT(ep_num)       (*(reg32*)(AHB0_UDC+0x54+0x38*(ep_num/3)))
-#define BOUT_RXCON(ep_num)        (*(reg32*)(AHB0_UDC+0x58+0x38*(ep_num/3)))
-#define BOUT_DMAOUTCTL(ep_num)    (*(reg32*)(AHB0_UDC+0x5C+0x38*(ep_num/3)))
-#define BOUT_DMAOUTLMADDR(ep_num) (*(reg32*)(AHB0_UDC+0x60+0x38*(ep_num/3)))
-/* Bulk IN: ep2, ep5, ep8, ep11, ep4 */
-#define BIN_TXSTAT(ep_num)        (*(reg32*)(AHB0_UDC+0x64+0x38*(ep_num/3)))
-#define BIN_TXCON(ep_num)         (*(reg32*)(AHB0_UDC+0x68+0x38*(ep_num/3)))
-#define BIN_TXBUF(ep_num)         (*(reg32*)(AHB0_UDC+0x6C+0x38*(ep_num/3)))
-#define BIN_DMAINCTL(ep_num)      (*(reg32*)(AHB0_UDC+0x70+0x38*(ep_num/3)))
-#define BIN_DMAINLMADDR(ep_num)   (*(reg32*)(AHB0_UDC+0x74+0x38*(ep_num/3)))
-/* INTERRUPT IN: ep3, ep6, ep9, ep12, ep15 */
-#define IIN_TXSTAT(ep_num)        (*(reg32*)(AHB0_UDC+0x78+0x38*((ep_num/3)-1)))
-#define IIN_TXCON(ep_num)         (*(reg32*)(AHB0_UDC+0x7C+0x38*((ep_num/3)-1)))
-#define IIN_TXBUF(ep_num)         (*(reg32*)(AHB0_UDC+0x80+0x38*((ep_num/3)-1)))
-#define IIN_DMAINCTL(ep_num)      (*(reg32*)(AHB0_UDC+0x84+0x38*((ep_num/3)-1)))
-#define IIN_DMAINLMADDR(ep_num)   (*(reg32*)(AHB0_UDC+0x88+0x38*((ep_num/3)-1)))
 #ifdef LOGF_ENABLE
 #define XFER_DIR_STR(dir) ((dir) ? "IN" : "OUT")
 #define XFER_TYPE_STR(type) \
@@ -68,9 +47,12 @@ typedef volatile uint32_t reg32;
       ((type) == USB_ENDPOINT_XFER_INT ? "INTR" : "INVL"))))
 #endif
-struct endpoint_t {
+struct endpoint_t
+{
+    const int ep_num;            /* EP number */
    const int type;              /* EP type */
    const int dir;               /* DIR_IN/DIR_OUT */
+    volatile unsigned long *stat; /* RXSTAT/TXSTAT register */
    bool allocated;              /* flag to mark EPs taken */
    volatile void *buf;          /* tx/rx buffer address */
    volatile int len;            /* size of the transfer (bytes) */
@@ -79,110 +61,91 @@ struct endpoint_t {
    struct semaphore complete;   /* semaphore for blocking transfers */
 };
-#define EP_INIT(_type, _dir, _alloced, _buf, _len, _cnt, _block) \
+/* compute RXCON address from RXSTAT, and so on */
-    { .type = (_type), .dir = (_dir), .allocated = (_alloced), .buf = (_buf), \
+#define RXSTAT(endp)        *((endp)->stat)
-      .len = (_len), .cnt = (_cnt), .block = (_block) }
+#define RXCON(endp)         *(1 + (endp)->stat)
+#define DMAOUTCTL(endp)     *(2 + (endp)->stat)
-static struct endpoint_t ctrlep[2] = {
+#define DMAOUTLMADDR(endp)  *(3 + (endp)->stat)
-    EP_INIT(USB_ENDPOINT_XFER_CONTROL, DIR_OUT, true, NULL, 0, 0, true),
+/* compute TXCON address from TXSTAT, and so on */
-    EP_INIT(USB_ENDPOINT_XFER_CONTROL, DIR_IN,  true, NULL, 0, 0, true),
+#define TXSTAT(endp)        *((endp)->stat)
+#define TXCON(endp)         *(1 + (endp)->stat)
+#define TXBUF(endp)         *(2 + (endp)->stat)
+#define DMAINCTL(endp)      *(3 + (endp)->stat)
+#define DMAINLMADDR(endp)   *(4 + (endp)->stat)
+#define ENDPOINT(num, type, dir, reg) \
+    {num, USB_ENDPOINT_XFER_##type, USB_DIR_##dir, reg, false, NULL, 0, 0, true, {{0, 0}, 0, 0}}
+static struct endpoint_t ctrlep[2] =
+{
+    ENDPOINT(0, CONTROL, OUT, &RX0STAT),
+    ENDPOINT(0, CONTROL, IN, &TX0STAT),
 };
-static struct endpoint_t endpoints[16] = {
+static struct endpoint_t endpoints[16] =
-    EP_INIT(USB_ENDPOINT_XFER_CONTROL,    3, true,  NULL, 0, 0,  true ),  /* stub   */
+{
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_OUT, false, NULL, 0, 0, false ),  /* BOUT1  */
+    ENDPOINT(0,  CONTROL, OUT, NULL),  /* stub */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_IN,  false, NULL, 0, 0, false ),  /* BIN2   */
+    ENDPOINT(1,  BULK, OUT, &RX1STAT),  /* BOUT1 */
-    EP_INIT(USB_ENDPOINT_XFER_INT,  DIR_IN,  false, NULL, 0, 0, false ),  /* IIN3   */
+    ENDPOINT(2,  BULK, IN,  &TX2STAT),  /* BIN2 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_OUT, false, NULL, 0, 0, false ),  /* BOUT4  */
+    ENDPOINT(3,  INT,  IN,  &TX3STAT),  /* IIN3 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_IN,  false, NULL, 0, 0, false ),  /* BIN5   */
+    ENDPOINT(4,  BULK, OUT, &RX4STAT),  /* BOUT4 */
-    EP_INIT(USB_ENDPOINT_XFER_INT,  DIR_IN,  false, NULL, 0, 0, false ),  /* IIN6   */
+    ENDPOINT(5,  BULK, IN,  &TX5STAT),  /* BIN5 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_OUT, false, NULL, 0, 0, false ),  /* BOUT7  */
+    ENDPOINT(6,  INT,  IN,  &TX6STAT),  /* IIN6 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_IN,  false, NULL, 0, 0, false ),  /* BIN8   */
+    ENDPOINT(7,  BULK, OUT, &RX7STAT),  /* BOUT7 */
-    EP_INIT(USB_ENDPOINT_XFER_INT,  DIR_IN,  false, NULL, 0, 0, false ),  /* IIN9   */
+    ENDPOINT(8,  BULK, IN,  &TX8STAT),  /* BIN8 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_OUT, false, NULL, 0, 0, false ),  /* BOUT10 */
+    ENDPOINT(9,  INT,  IN,  &TX9STAT),  /* IIN9 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_IN,  false, NULL, 0, 0, false ),  /* BIN11  */
+    ENDPOINT(10, BULK, OUT, &RX10STAT), /* BOUT10 */
-    EP_INIT(USB_ENDPOINT_XFER_INT,  DIR_IN,  false, NULL, 0, 0, false ),  /* IIN12  */
+    ENDPOINT(11, BULK, IN,  &TX11STAT), /* BIN11 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_OUT, false, NULL, 0, 0, false ),  /* BOUT13 */
+    ENDPOINT(12, INT,  IN,  &TX12STAT), /* IIN12 */
-    EP_INIT(USB_ENDPOINT_XFER_BULK, DIR_IN,  false, NULL, 0, 0, false ),  /* BIN14  */
+    ENDPOINT(13, BULK, OUT, &RX13STAT), /* BOUT13 */
-    EP_INIT(USB_ENDPOINT_XFER_INT,  DIR_IN,  false, NULL, 0, 0, false ),  /* IIN15  */
+    ENDPOINT(14, BULK, IN,  &TX14STAT), /* BIN14 */
+    ENDPOINT(15, INT,  IN,  &TX15STAT), /* IIN15 */
 };
+static volatile bool set_address = false;
+static volatile bool set_configuration = false;
+#undef ENDPOINT
 static void setup_received(void)
 {
    static uint32_t setup_data[2];
-    
+    logf("udc: setup");
    /* copy setup data from packet */
    setup_data[0] = SETUP1;
    setup_data[1] = SETUP2;
-    /* clear all pending control transfers
-     * do we need this here?
-     */
-    
    /* pass setup data to the upper layer */
    usb_core_control_request((struct usb_ctrlrequest*)setup_data);
 }
-/* service ep0 IN transaction */
+static int max_pkt_size(struct endpoint_t *endp)
-static void ctr_write(void)
 {
-    int xfer_size = (ctrlep[DIR_IN].cnt > 64) ? 64 : ctrlep[DIR_IN].cnt;
+    switch(endp->type)
-    unsigned int timeout = current_tick + HZ/10;
-    
-    while (TX0BUF & TXFULL) /* TX0FULL flag */
    {
-        if(TIME_AFTER(current_tick, timeout))
+        case USB_ENDPOINT_XFER_CONTROL: return 64;
-            break;
+        case USB_ENDPOINT_XFER_BULK: return usb_drv_port_speed() ? 512 : 64;
+        case USB_ENDPOINT_XFER_INT: return usb_drv_port_speed() ? 1024 : 64;
+        default: panicf("die"); return 0;
    }
-    TX0STAT = xfer_size;                           /* size of the transfer */
-    TX0DMALM_IADDR = (uint32_t)ctrlep[DIR_IN].buf; /* local buffer address */
-    TX0DMAINCTL = DMA_START;                       /* start DMA */
-    TX0CON &= ~TXNAK;                              /* clear NAK */
-    
-    /* Decrement by max packet size is intentional.
-     * This way if we have final packet short one we will get negative len
-     * after transfer, which in turn indicates we *don't* need to send
-     * zero length packet. If the final packet is max sized packet we will
-     * get zero len after transfer which indicates we need to send
-     * zero length packet to signal host end of the transfer.
-     */
-    ctrlep[DIR_IN].cnt -= 64;
-    ctrlep[DIR_IN].buf += xfer_size;
-}
-static void ctr_read(void)
-{
-    int xfer_size = RX0STAT & 0xffff;
-    
-    /* clear NAK bit */
-    RX0CON &= ~RXNAK;
-    
-    ctrlep[DIR_OUT].cnt -= xfer_size;
-    ctrlep[DIR_OUT].buf += xfer_size;
-    
-    RX0DMAOUTLMADDR = (uint32_t)ctrlep[DIR_OUT].buf; /* buffer address */
-    RX0DMACTLO = DMA_START;                          /* start DMA */
 }
-static void blk_write(int ep)
+static void ep_write(struct endpoint_t *endp)
 {
-    int ep_num = EP_NUM(ep);
+    int xfer_size = MIN(max_pkt_size(endp), endp->cnt);
-    int max = usb_drv_port_speed() ? 512 : 64;
-    int xfer_size = (endpoints[ep_num].cnt > max) ? max : endpoints[ep_num].cnt;  
    unsigned int timeout = current_tick + HZ/10;
-    
-    while (BIN_TXBUF(ep_num) & TXFULL) /* TXFULL flag */
+    while(TXBUF(endp) & TXFULL) /* TXFULL flag */
    {
        if(TIME_AFTER(current_tick, timeout))
            break;
    }
-    
-    BIN_TXSTAT(ep_num) = xfer_size;                            /* size */
+    /* setup transfer size and DMA */
-    BIN_DMAINLMADDR(ep_num) = (uint32_t)endpoints[ep_num].buf; /* buf address */
+    TXSTAT(endp) = xfer_size;
-    BIN_DMAINCTL(ep_num) = DMA_START;                          /* start DMA */
+    DMAINLMADDR(endp) = (uint32_t)endp->buf; /* local buffer address */
-    BIN_TXCON(ep_num) &= ~TXNAK;                               /* clear NAK */
+    DMAINCTL(endp) = DMA_START;
-    
    /* Decrement by max packet size is intentional.
     * This way if we have final packet short one we will get negative len
     * after transfer, which in turn indicates we *don't* need to send
@@ -190,247 +153,141 @@ static void blk_write(int ep)
     * get zero len after transfer which indicates we need to send
     * zero length packet to signal host end of the transfer.
     */
-    endpoints[ep_num].cnt -= max;
+    endp->cnt -= max_pkt_size(endp);
-    endpoints[ep_num].buf += xfer_size;
+    endp->buf += xfer_size;
+    /* clear NAK */
+    TXCON(endp) &= ~TXNAK;
 }
-static void blk_read(int ep)
+static void ep_read(struct endpoint_t *endp)
 {
-    int ep_num = EP_NUM(ep);
+    /* setup DMA */
-    int xfer_size = BOUT_RXSTAT(ep_num) & 0xffff;
+    DMAOUTLMADDR(endp) = (uint32_t)endp->buf; /* local buffer address */
-    
+    DMAOUTCTL(endp) = DMA_START;
-    /* clear NAK bit */
+    /* clear NAK */
-    BOUT_RXCON(ep_num) &= ~RXNAK;
+    RXCON(endp) &= ~RXNAK;
-    
-    endpoints[ep_num].cnt -= xfer_size;
-    endpoints[ep_num].buf += xfer_size;
-    
-    BOUT_DMAOUTLMADDR(ep_num) = (uint32_t)endpoints[ep_num].buf;
-    BOUT_DMAOUTCTL(ep_num) = DMA_START;
-}
-static void int_write(int ep)
-{
-    int ep_num = EP_NUM(ep);
-    int max = usb_drv_port_speed() ? 1024 : 64;
-    int xfer_size = (endpoints[ep_num].cnt > max) ? max : endpoints[ep_num].cnt;  
-    unsigned int timeout = current_tick + HZ/10;
-    
-    while (IIN_TXBUF(ep_num) & TXFULL) /* TXFULL flag */
-    {
-        if(TIME_AFTER(current_tick, timeout))
-            break;
-    }
-    
-    IIN_TXSTAT(ep_num) = xfer_size;                            /* size */
-    IIN_DMAINLMADDR(ep_num) = (uint32_t)endpoints[ep_num].buf; /* buf address */
-    IIN_DMAINCTL(ep_num) = DMA_START;                          /* start DMA */
-    IIN_TXCON(ep_num) &= ~TXNAK;                               /* clear NAK */
-    
-    /* Decrement by max packet size is intentional.
-     * This way if we have final packet short one we will get negative len
-     * after transfer, which in turn indicates we *don't* need to send
-     * zero length packet. If the final packet is max sized packet we will
-     * get zero len after transfer which indicates we need to send
-     * zero length packet to signal host end of the transfer.
-     */
-    endpoints[ep_num].cnt -= max;
-    endpoints[ep_num].buf += xfer_size;
 }
-/* UDC ISR function */
+static void in_intr(struct endpoint_t *endp)
-void INT_UDC(void)
 {
-    uint32_t txstat, rxstat;
+    uint32_t txstat = TXSTAT(endp);
-    int tmp, ep_num;
+    /* check if clear feature was sent by host */
-    
+    if(txstat & TXCFINT)
-    /* read what caused UDC irq */
-    uint32_t intsrc = INT2FLAG & 0x7fffff;
-    
-    if (intsrc & SETUP_INTR) /* setup interrupt */
    {
-        setup_received();
+        logf("clear_stall: %d", endp->ep_num);
+        usb_drv_stall(endp->ep_num, false, true);
    }
-    else if (intsrc & IN0_INTR) /* ep0 in interrupt */
+    /* check if a transfer has finished */
+    if(txstat & TXACK)
    {
-        txstat = TX0STAT; /* read clears flags */
+        logf("udc: ack(%d)", endp->ep_num);
-        
+        /* finished ? */
-        /* TODO handle errors */
+        if(endp->cnt <= 0)
-        if (txstat & TXACK) /* check TxACK flag */
        {
-            if (ctrlep[DIR_IN].cnt >= 0)
+            usb_core_transfer_complete(endp->ep_num, endp->dir, 0, endp->len);
-            {
+            /* release semaphore for blocking transfer */
-                /* we still have data to send (or ZLP) */
+            if(endp->block)
-                ctr_write();
+                semaphore_release(&endp->complete);
-            }
-            else
-            {
-                /* final ack received */
-                usb_core_transfer_complete(0,                   /* ep */
-                                           USB_DIR_IN,          /* dir */
-                                           0,                   /* status */
-                                           ctrlep[DIR_IN].len); /* length */
-                
-                /* release semaphore for blocking transfer */
-                if (ctrlep[DIR_IN].block)
-                    semaphore_release(&ctrlep[DIR_IN].complete);
-            }
        }
+        else /* more data to send */
+            ep_write(endp);
    }
-    else if (intsrc & OUT0_INTR) /* ep0 out interrupt */
+}
-    {
-        rxstat = RX0STAT;
-        /* TODO handle errors */
+static void out_intr(struct endpoint_t *endp)
-        if (rxstat & RXACK) /* RxACK */
+{
-        {
+    uint32_t rxstat = RXSTAT(endp);
-            if (ctrlep[DIR_OUT].cnt > 0)
+    logf("udc: out intr(%d)", endp->ep_num);
-                ctr_read();
+    /* check if clear feature was sent by host */
-            else
+    if(rxstat & RXCFINT)
-                usb_core_transfer_complete(0,                    /* ep */
-                                           USB_DIR_OUT,          /* dir */
-                                           0,                    /* status */
-                                           ctrlep[DIR_OUT].len); /* length */                
-        }
-    }
-    else if (intsrc & USBRST_INTR) /* usb reset */
-    {
-        usb_drv_init();
-    }
-    else if (intsrc & RESUME_INTR) /* usb resume */
-    {
-        TX0CON |=  TXCLR;  /* TxClr */
-        TX0CON &= ~TXCLR;
-        RX0CON |=  RXCLR; /* RxClr */
-        RX0CON &= ~RXCLR;
-    }
-    else if (intsrc & SUSP_INTR) /* usb suspend */
    {
+        logf("clear_stall: %d", endp->ep_num);
+        usb_drv_stall(endp->ep_num, false, false);
    }
-    else if (intsrc & CONN_INTR) /* usb connect */
+    /* check if a transfer has finished */
+    if(rxstat & RXACK)
    {
+        int xfer_size = rxstat & 0xffff;
+        endp->cnt -= xfer_size;
+        endp->buf += xfer_size;
+        logf("udc: ack(%d) -> %d/%d", endp->ep_num, xfer_size, endp->cnt);
+        /* finished ? */
+        if(endp->cnt <= 0 || xfer_size < max_pkt_size(endp))
+            usb_core_transfer_complete(endp->ep_num, endp->dir, 0, endp->len);
+        else
+            ep_read(endp);
    }
-    else
+}
-    {
-        /* lets figure out which ep generated irq */
+static void udc_phy_reset(void)
-        tmp = intsrc >> 7;
+{
-        for (ep_num=1; ep_num < 15; ep_num++)
+    DEV_CTL |= SOFT_POR;
-        {
+    udelay(10000);                 /* min 10ms */
-            tmp >>= ep_num;
+    DEV_CTL &= ~SOFT_POR;
-            if (tmp & 0x01)
+}
-                break;
-        }
+static void udc_soft_connect(void)
-        
+{
-        if (intsrc & ((1<<8)|(1<<11)|(1<<14)|(1<<17)|(1<<20)))
+    DEV_CTL |= CSR_DONE    |
-        {
+               DEV_SOFT_CN |
-            /* bulk out */
+               DEV_SELF_PWR;
-            rxstat = BOUT_RXSTAT(ep_num);
+}
-            
-            /* TODO handle errors */
+static void udc_helper(void)
-            if (rxstat & (1<<18)) /* RxACK */
+{
-            {
+    uint32_t dev_info = DEV_INFO;
-                if (endpoints[ep_num].cnt > 0)
-                    blk_read(ep_num);
+    /* This polls for DEV_EN bit set in DEV_INFO  register
-                else
+     * as well as tracks current requested configuration
-                    usb_core_transfer_complete(ep_num,               /* ep */
+     * (DEV_INFO [11:8]). On state change it notifies usb stack
-                                               USB_DIR_OUT,          /* dir */
+     * about it.
-                                               0,                    /* status */
+     */
-                                               endpoints[ep_num].len); /* length */                
-            }
+    /* SET ADDRESS request */
-        }
+    if(!set_address)
-        else if (intsrc & ((1<<9)|(1<<12)|(1<<15)|(1<<18)|(1<<21)))
+        if(dev_info & 0x7f)
        {
-            /* bulk in */
+            set_address = true;
-            txstat = BIN_TXSTAT(ep_num);
+            usb_core_notify_set_address(dev_info & 0x7f);
-            
-            /* TODO handle errors */
-            if (txstat & (1<<18)) /* check TxACK flag */
-            {
-                if (endpoints[ep_num].cnt >= 0)
-                {
-                    /* we still have data to send (or ZLP) */
-                    blk_write(ep_num);
-                }
-                else
-                {
-                    /* final ack received */
-                    usb_core_transfer_complete(ep_num,                   /* ep */
-                                               USB_DIR_IN,          /* dir */
-                                               0,                   /* status */
-                                               endpoints[ep_num].len); /* length */
-                
-                    /* release semaphore for blocking transfer */
-                    if (endpoints[ep_num].block)
-                        semaphore_release(&endpoints[ep_num].complete);
-                }
-            }
        }
-        else if (intsrc & ((1<<10)|(1<13)|(1<<16)|(1<<19)|(1<<22)))
+    /* SET CONFIGURATION request */
+    if(!set_configuration)
+        if(dev_info & DEV_EN)
        {
-            /* int in */
+            set_configuration = true;
-            txstat = IIN_TXSTAT(ep_num);
+            usb_core_notify_set_config(((dev_info >> 7) & 0xf) + 1);
-            /* TODO handle errors */
-            if (txstat & TXACK) /* check TxACK flag */
-            {
-                if (endpoints[ep_num].cnt >= 0)
-                {
-                    /* we still have data to send (or ZLP) */
-                    int_write(ep_num);
-                }
-                else
-                {
-                    /* final ack received */
-                    usb_core_transfer_complete(ep_num,                   /* ep */
-                                               USB_DIR_IN,          /* dir */
-                                               0,                   /* status */
-                                               endpoints[ep_num].len); /* length */
-                
-                    /* release semaphore for blocking transfer */
-                    if (endpoints[ep_num].block)
-                        semaphore_release(&endpoints[ep_num].complete);
-                }
-            }
        }
-    }
 }
 /* return port speed FS=0, HS=1 */
 int usb_drv_port_speed(void)
 {
-    return ((DEV_INFO & DEV_SPEED) == 0) ? 0 : 1;
+    return (DEV_INFO & DEV_SPEED) ? 0 : 1;
 }
 /* Reserve endpoint */
 int usb_drv_request_endpoint(int type, int dir)
 {
-    int ep_num, ep_dir;
+    logf("req: %s %s", XFER_DIR_STR(dir), XFER_TYPE_STR(type));
-    int ep_type;
-    /* Safety */
-    ep_dir = EP_DIR(dir);
-    ep_type = type & USB_ENDPOINT_XFERTYPE_MASK;
-    logf("req: %s %s", XFER_DIR_STR(ep_dir), XFER_TYPE_STR(ep_type));
-    
    /* Find an available ep/dir pair */
-    for (ep_num=1;ep_num<USB_NUM_ENDPOINTS;ep_num++)
+    for(int ep_num = 1; ep_num<USB_NUM_ENDPOINTS;ep_num++)
    {
-        struct endpoint_t* endpoint = &endpoints[ep_num];
+        struct endpoint_t *endp = &endpoints[ep_num];
-        
-        if (endpoint->type == ep_type &&
+        if(endp->allocated || endp->type != type || endp->dir != dir)
-            endpoint->dir == ep_dir &&
+            continue;
-            !endpoint->allocated)
+        /* allocate endpoint and enable interrupt */
-        {
+        endp->allocated = true;
-            /* mark endpoint as taken */
+        if(dir == USB_DIR_IN)
-            endpoint->allocated = true;
+            TXCON(endp) = (ep_num << 8) | TXEPEN | TXNAK | TXACKINTEN | TXCFINTE;
-            
+        else
-            /* enable interrupt from this endpoint */
+            RXCON(endp) = (ep_num << 8) | RXEPEN | RXNAK | RXACKINTEN | RXCFINTE | RXERRINTEN;
-            EN_INT |= (1<<(ep_num+7));
+        EN_INT |= 1 << (ep_num + 7);
-            
-            logf("add: ep%d %s", ep_num, XFER_DIR_STR(ep_dir));
+        logf("add: ep%d %s", ep_num, XFER_DIR_STR(dir));
-            return (ep_num | (dir & USB_ENDPOINT_DIR_MASK));
+        return ep_num | dir;
-        }
    }
    return -1;
 }
@@ -439,14 +296,12 @@ int usb_drv_request_endpoint(int type, int dir)
 void usb_drv_release_endpoint(int ep)
 {
    int ep_num = EP_NUM(ep);
-    int ep_dir = EP_DIR(ep);
-    (void) ep_dir;
-    logf("rel: ep%d %s", ep_num, XFER_DIR_STR(ep_dir));
+    logf("rel: ep%d", ep_num);
    endpoints[ep_num].allocated = false;
-    
    /* disable interrupt from this endpoint */
-    EN_INT &= ~(1<<(ep_num+7));
+    EN_INT &= ~(1 << (ep_num + 7));
 }
 /* Set the address (usually it's in a register).
@@ -463,39 +318,25 @@ void usb_drv_set_address(int address)
 static int _usb_drv_send(int endpoint, void *ptr, int length, bool block)
 {
+    logf("udc: send(%x)", endpoint);
    struct endpoint_t *ep;
    int ep_num = EP_NUM(endpoint);
-    
    if (ep_num == 0)
        ep = &ctrlep[DIR_IN];
    else
        ep = &endpoints[ep_num];
+    /* for send transfers, make sure the data is committed */
+    commit_discard_dcache_range(ptr, length);
    ep->buf = ptr;
    ep->len = ep->cnt = length;
-    
+    ep->block = block;
-    if (block)
-        ep->block = true;
+    ep_write(ep);
-    else
-        ep->block = false;
+    /* wait for transfer to end */
-    
+    if(block)
-    switch (ep->type)
-    {
-        case USB_ENDPOINT_XFER_CONTROL:                     
-            ctr_write();
-            break;
-        
-        case USB_ENDPOINT_XFER_BULK:
-            blk_write(ep_num);
-            break;
-        
-        case USB_ENDPOINT_XFER_INT:
-            int_write(ep_num);
-            break;
-    }
-    
-    if (block)
-        /* wait for transfer to end */
        semaphore_wait(&ep->complete, TIMEOUT_BLOCK);
    return 0;
@@ -516,28 +357,20 @@ int usb_drv_send_nonblocking(int endpoint, void *ptr, int length)
 /* Setup a receive transfer. (non blocking) */
 int usb_drv_recv(int endpoint, void* ptr, int length)
 {
+    logf("udc: recv(%x)", endpoint);
    struct endpoint_t *ep;
    int ep_num = EP_NUM(endpoint);
-    
-    if (ep_num == 0)
+    if(ep_num == 0)
-    {
        ep = &ctrlep[DIR_OUT];
-        
-        ctr_read();
-    }
    else
-    {
        ep = &endpoints[ep_num];
-        
-        /* clear NAK bit */
+    /* for recv, discard the cache lines related to the buffer */
-        BOUT_RXCON(ep_num) &= ~RXNAK;
+    commit_discard_dcache_range(ptr, length);
-        BOUT_DMAOUTLMADDR(ep_num) = (uint32_t)ptr;
-        BOUT_DMAOUTCTL(ep_num) = DMA_START;
-    }
-       
    ep->buf = ptr;
    ep->len = ep->cnt = length;
+    ep_read(ep);
    return 0;
 }
@@ -560,173 +393,54 @@ void usb_drv_set_test_mode(int mode)
 /* Check if endpoint is in stall state */
 bool usb_drv_stalled(int endpoint, bool in)
 {
-    int ep_num = EP_NUM(endpoint);
+    struct endpoint_t *endp = &endpoints[EP_NUM(endpoint)];
-    switch (endpoints[ep_num].type)
-    {
-        case USB_ENDPOINT_XFER_CONTROL:
-            if (in)
-                return (TX0CON & TXSTALL) ? true : false;
-            else
-                return (RX0CON & RXSTALL) ? true : false;
-            break;
-        case USB_ENDPOINT_XFER_BULK:
+    if(in)
-            if (in)
+        return !!(TXCON(endp) & TXSTALL);
-                return (BIN_TXCON(ep_num) & TXSTALL) ? true : false;
+    else
-            else
+        return !!(RXCON(endp) & RXSTALL);
-                return (BOUT_RXCON(ep_num) & RXSTALL) ? true : false;
-            break;
-            
-        case USB_ENDPOINT_XFER_INT:
-            if (in)
-                return (IIN_TXCON(ep_num) & TXSTALL) ? true : false;
-            else
-                return false;    /* we don't have such endpoint anyway */
-                
-            break;
-    }
-    return false;
 }
 /* Stall the endpoint. Usually set a flag in the controller */
 void usb_drv_stall(int endpoint, bool stall, bool in)
 {
-    int ep_num = EP_NUM(endpoint);
+    struct endpoint_t *endp = &endpoints[EP_NUM(endpoint)];
+    if(in)
-    switch (endpoints[ep_num].type)
    {
-        case USB_ENDPOINT_XFER_CONTROL:
+        if(stall)
-            if (in)
+            TXCON(endp) |= TXSTALL;
-            {
+        else
-                if (stall)
+            TXCON(endp) &= ~TXSTALL;
-                    TX0CON |=  TXSTALL;
+    }
-                else
+    else
-                    TX0CON &= ~TXSTALL;
+    {
-            }
+        if(stall)
-            else
+            RXCON(endp) |= RXSTALL;
-            {
+        else
-                if (stall)
+            RXCON(endp) &= ~RXSTALL;
-                    RX0CON |=  RXSTALL;
-                else
-                    RX0CON &= ~RXSTALL; /* doc says Auto clear by UDC 2.0 */
-            }
-            break;
-        case USB_ENDPOINT_XFER_BULK:
-            if (in)
-            {
-                if (stall)
-                    BIN_TXCON(ep_num) |=  TXSTALL;
-                else
-                    BIN_TXCON(ep_num) &= ~TXSTALL;
-            }
-            else
-            {
-                if (stall)
-                    BOUT_RXCON(ep_num) |=  RXSTALL;
-                else
-                    BOUT_RXCON(ep_num) &= ~RXSTALL;
-            }
-            break;
-            
-        case USB_ENDPOINT_XFER_INT:
-            if (in)
-            {
-                if (stall)
-                    IIN_TXCON(ep_num) |=  TXSTALL;
-                else
-                    IIN_TXCON(ep_num) &= ~TXSTALL;
-            }
-            break;
    }
 }
 /* one time init (once per connection) - basicaly enable usb core */
 void usb_drv_init(void)
 {
-    int ep_num;
-        
-    /* enable USB clock */
-    SCU_CLKCFG &= ~CLKCFG_UDC;
-    
-    /* 1. do soft disconnect */
-    DEV_CTL = DEV_SELF_PWR;
-    /* 2. do power on reset to PHY */
-    DEV_CTL = DEV_SELF_PWR |
-              SOFT_POR;
-    
-    /* 3. wait more than 10ms */
-    udelay(20000);
-    
-    /* 4. clear SOFT_POR bit */
-    DEV_CTL  &= ~SOFT_POR;
-    
-    /* 5. configure minimal EN_INT */
-    EN_INT = EN_SUSP_INTR   |  /* Enable Suspend Interrupt */
-             EN_RESUME_INTR |  /* Enable Resume Interrupt */
-             EN_USBRST_INTR |  /* Enable USB Reset Interrupt */
-             EN_OUT0_INTR   |  /* Enable OUT Token receive Interrupt EP0 */
-             EN_IN0_INTR    |  /* Enable IN Token transmits Interrupt EP0 */
-             EN_SETUP_INTR;    /* Enable SETUP Packet Receive Interrupt */
-             
-    /* 6. configure INTCON */
-    INTCON = UDC_INTHIGH_ACT |  /* interrupt high active */
-             UDC_INTEN;         /* enable EP0 interrupts */
-    
-    /* 7. configure EP0 control registers */
-    TX0CON = TXACKINTEN |  /* Set as one to enable the EP0 tx irq */
-             TXNAK;        /* Set as one to response NAK handshake */
-             
-    RX0CON = RXACKINTEN |
-             RXEPEN     |  /* Endpoint 0 Enable. When cleared the endpoint does
-                            * not respond to an SETUP or OUT token
-                            */
-             RXNAK;        /* Set as one to response NAK handshake */
-             
-    /* 8. write final bits to DEV_CTL */
-    DEV_CTL = CSR_DONE     | /* Configure CSR done */
-              DEV_PHY16BIT | /* 16-bit data path enabled. udc_clk = 30MHz */
-              DEV_SOFT_CN  | /* Device soft connect */
-              DEV_SELF_PWR;  /* Device self power */
    /* init semaphore of ep0 */
    semaphore_init(&ctrlep[DIR_OUT].complete, 1, 0);
    semaphore_init(&ctrlep[DIR_IN].complete, 1, 0);
-    
-    for (ep_num = 1; ep_num < USB_NUM_ENDPOINTS; ep_num++)
+    for(int ep_num = 1; ep_num < USB_NUM_ENDPOINTS; ep_num++)
-    {
        semaphore_init(&endpoints[ep_num].complete, 1, 0);
-        
-        if (ep_num%3 == 0) /* IIN 3, 6, 9, 12, 15 */
-        {
-            IIN_TXCON(ep_num) |= (ep_num<<8)|TXEPEN|TXNAK; /* ep_num, enable, NAK */
-        }
-        else if (ep_num%3 == 1) /* BOUT 1, 4, 7, 10, 13 */
-        {
-            BOUT_RXCON(ep_num) |= (ep_num<<8)|RXEPEN|RXNAK; /* ep_num, NAK, enable */
-        }
-        else if (ep_num%3 == 2) /* BIN 2, 5, 8, 11, 14 */
-        {
-            BIN_TXCON(ep_num) |= (ep_num<<8)|TXEPEN|TXNAK; /* ep_num, enable, NAK */
-        }
-    }
 }
 /* turn off usb core */
 void usb_drv_exit(void)
 {
    DEV_CTL = DEV_SELF_PWR;
-    
    /* disable USB interrupts in interrupt controller */
    INTC_IMR &= ~IRQ_ARM_UDC;
    INTC_IECR &= ~IRQ_ARM_UDC;
-    
    /* we cannot disable UDC clock since this causes data abort
     * when reading DEV_INFO in order to check usb connect event
     */
@@ -734,9 +448,94 @@ void usb_drv_exit(void)
 int usb_detect(void)
 {
-    if (DEV_INFO & VBUS_STS)
+    if(DEV_INFO & VBUS_STS)
        return USB_INSERTED;
    else
        return USB_EXTRACTED;
 }
+/* UDC ISR function */
+void INT_UDC(void)
+{
+    /* read what caused UDC irq */
+    uint32_t intsrc = INT2FLAG & 0x7fffff;
+    if(intsrc & USBRST_INTR) /* usb reset */
+    {
+        logf("udc_int: reset, %ld", current_tick);
+        EN_INT = EN_SUSP_INTR   |  /* Enable Suspend Irq */
+                 EN_RESUME_INTR |  /* Enable Resume Irq */
+                 EN_USBRST_INTR |  /* Enable USB Reset Irq */
+                 EN_OUT0_INTR   |  /* Enable OUT Token receive Irq EP0 */
+                 EN_IN0_INTR    |  /* Enable IN Token transmit Irq EP0 */
+                 EN_SETUP_INTR;    /* Enable SETUP Packet Receive Irq */
+        INTCON = UDC_INTHIGH_ACT | /* interrupt high active */
+                 UDC_INTEN;        /* enable EP0 irqs */
+        TX0CON = TXACKINTEN |      /* Set as one to enable the EP0 tx irq */
+                 TXNAK;            /* Set as one to response NAK handshake */
+        RX0CON = RXACKINTEN |
+                 RXEPEN     |      /* Endpoint 0 Enable. When cleared the
+                                    * endpoint does not respond to an SETUP
+                                    * or OUT token */
+                 RXNAK;            /* Set as one to response NAK handshake */
+        set_address = false;
+        set_configuration = false;
+    }
+    /* This needs to be processed AFTER usb reset */
+    udc_helper();
+    if(intsrc & SETUP_INTR) /* setup interrupt */
+    {
+        setup_received();
+    }
+    if(intsrc & IN0_INTR)
+    {
+        /* EP0 IN done */
+        in_intr(&ctrlep[DIR_IN]);
+    }
+    if(intsrc & OUT0_INTR)
+    {
+        /* EP0 OUT done */
+        out_intr(&ctrlep[DIR_OUT]);
+    }
+    if(intsrc & USBRST_INTR)
+    {
+        /* usb reset */
+        usb_drv_init();
+    }
+    if(intsrc & RESUME_INTR)
+    {
+        /* usb resume */
+        TX0CON |=  TXCLR;  /* TxClr */
+        TX0CON &= ~TXCLR;
+        RX0CON |=  RXCLR; /* RxClr */
+        RX0CON &= ~RXCLR;
+    }
+    if(intsrc & SUSP_INTR)
+    {
+        /* usb suspend */
+    }
+    if(intsrc & CONN_INTR)
+    {
+        /* usb connect */
+        udc_phy_reset();
+        udelay(10000);         /* wait at least 10ms */
+        udc_soft_connect();
+    }
+    /* other endpoints */
+    for(int ep_num = 1; ep_num < 16; ep_num++)
+    {
+        if(!(intsrc & (1 << (ep_num + 7))))
+            continue;
+        struct endpoint_t *endp = &endpoints[ep_num];
+        if(endp->dir == USB_DIR_IN)
+            in_intr(endp);
+        else
+            out_intr(endp);
+    }
+}
diff --git a/firmware/target/arm/rk27xx/usb-rk27xx.c b/firmware/target/arm/rk27xx/usb-rk27xx.c
index 20bf867c8d..09c9090a3b 100644
--- a/firmware/target/arm/rk27xx/usb-rk27xx.c
+++ b/firmware/target/arm/rk27xx/usb-rk27xx.c
@@ -32,6 +32,20 @@ int usb_status = USB_EXTRACTED;
 void usb_init_device(void)
 {
+    /* enable UDC interrupt */
+    INTC_IMR |= (1<<16);
+    INTC_IECR |= (1<<16);
+    EN_INT = EN_SUSP_INTR   |  /* Enable Suspend Interrupt */
+             EN_RESUME_INTR |  /* Enable Resume Interrupt */
+             EN_USBRST_INTR |  /* Enable USB Reset Interrupt */
+             EN_OUT0_INTR   |  /* Enable OUT Token receive Interrupt EP0 */
+             EN_IN0_INTR    |  /* Enable IN Token transmits Interrupt EP0 */
+             EN_SETUP_INTR;    /* Enable SETUP Packet Receive Interrupt */
+    /* configure INTCON */
+    INTCON = UDC_INTHIGH_ACT |  /* interrupt high active */
+             UDC_INTEN;         /* enable EP0 interrupts */
 }
 void usb_attach(void)
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index 0303ac8ca2..99ae062595 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -527,6 +527,28 @@
 #define UI_HEIGHT                   457 /* height of GUI window */
 #define UI_LCD_POSX                 34
 #define UI_LCD_POSY                 73
+#elif defined(IHIFI770)
+#define UI_TITLE                    "iHiFi 770"
+#define UI_WIDTH                    382 /* width of GUI window */
+#define UI_HEIGHT                   690 /* height of GUI window */
+#define UI_LCD_POSX                 32
+#define UI_LCD_POSY                 86
+#elif defined(IHIFI770C)
+#define UI_TITLE                    "iHiFi 770C"
+#define UI_WIDTH                    382 /* width of GUI window */
+#define UI_HEIGHT                   690 /* height of GUI window */
+#define UI_LCD_POSX                 32
+#define UI_LCD_POSY                 86
+#elif defined(IHIFI800)
+#define UI_TITLE                    "iHiFi 800"
+#define UI_WIDTH                    300 /* width of GUI window */
+#define UI_HEIGHT                   670 /* height of GUI window */
+#define UI_LCD_POSX                 26
+#define UI_LCD_POSY                 40
 #elif defined(SIMULATOR)
 #error no UI defines
 #endif
diff --git a/tools/builds.pm b/tools/builds.pm
index 5f7e2c5f58..ddb4b1442b 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -422,6 +422,18 @@ $releasenotes="/wiki/ReleaseNotes314";
        name => 'xDuoo X3',
        status => 2,
    },
+    'ihifi770' => {
+        name => 'Xuelin iHIFI 770',
+        status => 2,
+    },
+    'ihifi770C' => {
+        name => 'Xuelin iHIFI 770C',
+        status => 2,
+    },
+    'ihifi800' => {
+        name => 'Xuelin iHIFI 800',
+        status => 2,
+    },
 );
 sub manualname {
diff --git a/tools/configure b/tools/configure
index e7f254ada7..cad2238d9b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1548,13 +1548,14 @@ cat <<EOF
 206) Android MIPS        ==IHIFI==              222) NWZ-E450 series
 207) Android x86         230) 760               223) NWZ-E460 series
 208) Samsung YP-R1       231) 960               224) NWZ-E470 series
-                                                 225) NWZ-E580 series
+                          250) 770C              225) NWZ-E580 series
- ==iBasso==               ==Agptek==             226) NWZ-A10 series
+ ==iBasso==               251) 770               226) NWZ-A10 series
- 232) DX50                240) Rocker            227) NW-A20 series
+ 232) DX50                252) 800               227) NW-A20 series
 233) DX90                                       228) NWZ-A860 series
                                                 229) NWZ-S750 series
- ==xDuoo==
+ ==xDuoo==                ==AgpTek==
- 241) X3
+ 241) X3                  240) Rocker
 EOF
  buildfor=`input`;
@@ -4257,6 +4258,75 @@ fi
    t_model="xduoo_x3"
    ;;
+   250|ihifi770C)
+    target_id=107
+    modelname="ihifi770c"
+    target="IHIFI770C"
+    memory=16
+    arm7ejscc
+    tool="$rootdir/tools/scramble -rkw -modelnum=97"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.rkw"
+    bootoutput="bootloader.rkw"
+    appextra="recorder:gui"
+    plugins="yes"
+    swcodec="yes"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$genericbitmaptools"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="rk27xx"
+    t_model="ihifi2"
+    ;;
+   251|ihifi770)
+    target_id=108
+    modelname="ihifi770"
+    target="IHIFI770"
+    memory=16
+    arm7ejscc
+    tool="$rootdir/tools/scramble -rkw -modelnum=98"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.rkw"
+    bootoutput="bootloader.rkw"
+    appextra="recorder:gui"
+    plugins="yes"
+    swcodec="yes"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$genericbitmaptools"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="rk27xx"
+    t_model="ihifi2"
+    ;;
+   252|ihifi800)
+    target_id=109
+    modelname="ihifi800"
+    target="IHIFI800"
+    memory=16
+    arm7ejscc
+    tool="$rootdir/tools/scramble -rkw -modelnum=99"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.rkw"
+    bootoutput="bootloader.rkw"
+    appextra="recorder:gui"
+    plugins="yes"
+    swcodec="yes"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$genericbitmaptools"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="rk27xx"
+    t_model="ihifi2"
+    ;;
   *)
    echo "Please select a supported target platform!"
    exit 7
diff --git a/uisimulator/bitmaps/UI-ihifi770.bmp b/uisimulator/bitmaps/UI-ihifi770.bmp
new file mode 100644
index 0000000000..4f2513828a
--- /dev/null
+++ b/uisimulator/bitmaps/UI-ihifi770.bmp
Binary files differ
diff --git a/uisimulator/bitmaps/UI-ihifi770c.bmp b/uisimulator/bitmaps/UI-ihifi770c.bmp
new file mode 100644
index 0000000000..4f2513828a
--- /dev/null
+++ b/uisimulator/bitmaps/UI-ihifi770c.bmp
Binary files differ
diff --git a/uisimulator/bitmaps/UI-ihifi800.bmp b/uisimulator/bitmaps/UI-ihifi800.bmp
new file mode 100644
index 0000000000..710f85102a
--- /dev/null
+++ b/uisimulator/bitmaps/UI-ihifi800.bmp
Binary files differ
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index d46066d478..4c6ca3adef 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -87,5 +87,7 @@ sony-nwza860.c
 agptek-rocker.c
 #elif CONFIG_KEYPAD == XDUOO_X3_PAD
 xduoo-x3.c
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
+ihifi2.c
 #endif
 #endif /* SIMULATOR */
diff --git a/uisimulator/buttonmap/ihifi2.c b/uisimulator/buttonmap/ihifi2.c
new file mode 100644
index 0000000000..a197ab8ac2
--- /dev/null
+++ b/uisimulator/buttonmap/ihifi2.c
@@ -0,0 +1,90 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2016 by Roman Stolyarov
+ *
+ * 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 <SDL.h>
+#include "button.h"
+#include "buttonmap.h"
+int key_to_button(int keyboard_button)
+{
+    int new_btn = BUTTON_NONE;
+    switch (keyboard_button)
+    {
+        case SDLK_KP8:
+        case SDLK_ESCAPE:
+            new_btn = BUTTON_POWER;
+            break;
+        case SDLK_KP4:
+        case SDLK_KP_ENTER:
+        case SDLK_SPACE:
+        case SDLK_RETURN:
+            new_btn = BUTTON_PLAY;
+            break;
+        case SDLK_KP5:
+        case SDLK_UP:
+            new_btn = BUTTON_PREV;
+            break;
+        case SDLK_KP6:
+        case SDLK_PAGEUP:
+            new_btn = BUTTON_VOL_UP;
+            break;
+        case SDLK_KP1:
+        case SDLK_BACKSPACE:
+            new_btn = BUTTON_HOME;
+            break;
+        case SDLK_KP2:
+        case SDLK_DOWN:
+            new_btn = BUTTON_NEXT;
+            break;
+        case SDLK_KP3:
+        case SDLK_PAGEDOWN:
+            new_btn = BUTTON_VOL_DOWN;
+            break;
+    }
+    return new_btn;
+}
+#if (CONFIG_KEYPAD == IHIFI_770_PAD)
+struct button_map bm[] = {
+    { SDLK_KP8,     210,   0, 20, "Power" },
+    { SDLK_KP4,      94, 430, 40, "Play" },
+    { SDLK_KP5,     190, 430, 40, "Prev" },
+    { SDLK_KP6,     285, 430, 40, "Vol Up" },
+    { SDLK_KP1,      94, 508, 40, "Home" },
+    { SDLK_KP2,     190, 508, 40, "Next" },
+    { SDLK_KP3,     285, 508, 40, "Vol Down" },
+    { 0, 0, 0, 0, "None" }
+};
+#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
+struct button_map bm[] = {
+    { SDLK_KP8,     214, 468, 25, "Power" },
+    { SDLK_KP4,     168, 580, 25, "Play" },
+    { SDLK_KP5,      60, 524, 25, "Prev" },
+    { SDLK_KP6,     102, 455, 25, "Vol Up" },
+    { SDLK_KP1,     246, 580, 25, "Home" },
+    { SDLK_KP2,      60, 580, 25, "Next" },
+    { SDLK_KP3,      50, 455, 25, "Vol Down" },
+    { 0, 0, 0, 0, "None" }
+};
+#else
+#error please define button map
+#endif