From dbabd0d9c34a33bc0c51243ec37f230d117db955 Mon Sep 17 00:00:00 2001 From: Udo Schläpfer Date: Mon, 2 Feb 2015 21:44:29 +0100 Subject: iBasso DX50/DX90: Major code cleanup and reorganization. Reorganization - Separated iBasso devices from PLATFORM_ANDROID. These are now standlone hosted targets. Most device specific code is in the firmware/target/hosted/ibasso directory. - No dependency on Android SDK, only the Android NDK is needed. 32 bit Android NDK and Android API Level 16. - Separate implementation for each device where feasible. Code cleanup - Rewrite of existing code, from simple reformat to complete reimplementation. - New backlight interface, seperating backlight from touchscreen. - Rewrite of device button handler, removing unneeded code and fixing memory leaks. - New Debug messages interface logging to Android adb logcat (DEBUGF, panicf, logf). - Rewrite of lcd device handler, removing unneeded code and fixing memory leaks. - Rewrite of audiohw device handler/pcm interface, removing unneeded code and fixing memory leaks, enabling 44.1/48kHz pthreaded playback. - Rewrite of power and powermng, proper shutdown, using batterylog results (see http://gerrit.rockbox.org/r/#/c/1047/). - Rewrite of configure (Android NDK) and device specific config. - Rewrite of the Android NDK specific Makefile. Misc - All plugins/games/demos activated. - Update tinyalsa to latest from https://github.com/tinyalsa/tinyalsa. Includes - http://gerrit.rockbox.org/r/#/c/993/ - http://gerrit.rockbox.org/r/#/c/1010/ - http://gerrit.rockbox.org/r/#/c/1035/ Does not include http://gerrit.rockbox.org/r/#/c/1007/ due to new backlight interface and new option for hold switch, touchscreen, physical button interaction. Rockbox needs the iBasso DX50/DX90 loader for startup, see http://gerrit.rockbox.org/r/#/c/1099/ The loader expects Rockbox to be installed in /mnt/sdcard/.rockbox/. If /mnt/sdcard/ is accessed as USB mass storage device, Rockbox will exit gracefully and the loader will restart Rockbox on USB disconnect. Tested on iBasso DX50. Compiled (not tested) for iBasso DX90. Compiled (not tested) for PLATFORM_ANDROID. Change-Id: I5f5e22e68f5b4cf29c28e2b40b2c265f2beb7ab7 --- apps/plugins/SOURCES.app_build | 2 +- apps/plugins/SUBDIRS.app_build | 2 +- apps/plugins/battery_bench.c | 8 ++++---- apps/plugins/plugins.make | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build index 990a7c1c86..89a8b0ede6 100644 --- a/apps/plugins/SOURCES.app_build +++ b/apps/plugins/SOURCES.app_build @@ -1,4 +1,4 @@ -#ifndef HAVE_TOUCHSCREEN +#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) /* In devices running RockBox as an application, but having a keypad */ #include "SOURCES" #else diff --git a/apps/plugins/SUBDIRS.app_build b/apps/plugins/SUBDIRS.app_build index 934474a996..954044146a 100644 --- a/apps/plugins/SUBDIRS.app_build +++ b/apps/plugins/SUBDIRS.app_build @@ -1,4 +1,4 @@ -#ifndef HAVE_TOUCHSCREEN +#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) /* This is for devices having a keypad, running RockBox as an application */ #include "SUBDIRS" diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 289b399e27..9ffdb0798f 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -262,10 +262,10 @@ #define BATTERY_OFF_TXT "Power" #elif CONFIG_KEYPAD == DX50_PAD -#define BATTERY_ON BUTTON_PLAY -#define BATTERY_OFF BUTTON_POWER -#define BATTERY_OFF_TXT "POWER" -#define BATTERY_ON_TXT "PLAY - start" +#define BATTERY_ON BUTTON_PLAY +#define BATTERY_OFF BUTTON_POWER_LONG +#define BATTERY_OFF_TXT "Power Long" +#define BATTERY_ON_TXT "Play - start" #else #error No keymap defined! diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 1edbd37306..be3d35717e 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -11,11 +11,9 @@ is_app_build = ifdef APP_TYPE ifneq ($(APP_TYPE),sdl-sim) -ifeq (,$(findstring standalone, $(APP_TYPE))) is_app_build = yes endif endif -endif ifdef is_app_build PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build) -- cgit v1.2.3