xDuoo X3II and X20 port

Provided by Roman Stolyarov
Integration, Refactoring, and Upstreaming by Solomon Peachy

X3II confirmed working by forum tester, X20 is nearly identical.

This includes bootloader, main firmware, and the flash image patcher.

Eventual Todo:

 * Further refactor AGPTek Rocker & xduoo hiby bootloaders
 * Further refactor AGPTek Rocker & xduoo hosted platform code

Change-Id: I34a674051d368efcc75d1d18c725971fe46c3eee

2 files changed, 34 insertions, 0 deletions

diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index ce527c561e..53dd9e8d88 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 == XDUOO_X3II_PAD
+#define ZX_SELECT       BUTTON_PLAY
+#define ZX_MENU         BUTTON_POWER
+#define ZX_LEFT         BUTTON_PREV
+#define ZX_RIGHT        BUTTON_NEXT
+#define ZX_UP           BUTTON_HOME
+#define ZX_DOWN         BUTTON_OPTION
+
+#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#define ZX_SELECT       BUTTON_PLAY
+#define ZX_MENU         BUTTON_POWER
+#define ZX_LEFT         BUTTON_PREV
+#define ZX_RIGHT        BUTTON_NEXT
+#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
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index b3f1ca70e8..4a26accc8a 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 == XDUOO_X3II_PAD
+
+#define KBD_SELECT BUTTON_PLAY
+#define KBD_ABORT  BUTTON_POWER
+#define KBD_LEFT   BUTTON_PREV
+#define KBD_RIGHT  BUTTON_NEXT
+#define KBD_UP     BUTTON_HOME
+#define KBD_DOWN   BUTTON_OPTION
+
+#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+
+#define KBD_SELECT BUTTON_PLAY
+#define KBD_ABORT  BUTTON_POWER
+#define KBD_LEFT   BUTTON_PREV
+#define KBD_RIGHT  BUTTON_NEXT
+#define KBD_UP     BUTTON_HOME
+#define KBD_DOWN   BUTTON_OPTION
+
 #elif CONFIG_KEYPAD == IHIFI_770_PAD
 
 #define KBD_SELECT BUTTON_PLAY