From 0b5ad60c26f30dc5363c21e436b73292c09ac567 Mon Sep 17 00:00:00 2001 From: Simon Rothen Date: Sat, 30 Aug 2014 13:15:53 +0200 Subject: Introducing Targets iBasso DX50 & iBasso DX90 The port to for this two targets has been entirely developped by Ilia Sergachev (alias Il or xzcc). His source can be found at https://bitbucket.org/isergachev/rockbox . The few necesary modifications for the DX90 port was done by headwhacker form head-fi.org. Unfortunately i could not try out the final state of the DX90 port. The port is hosted on android (without java) as standalone app. The official Firmware is required to run this port. Ilia did modify the source files for the "android" target in the rockbox source to make the DX port work. The work I did was to separate the code for DX50 (&DX90) from the android target. On this Target Ilia used source from tinyalsa from AOSP. I did not touch that part of the code because I do not understand it. What else I changed from Ilias sources besides the separation from the target "android": * removed a dirty hack to keep backlight off * changed value battery meter to voltage battery meter * made all plugins compile (named target as "standalone") and added keymaps * i added the graphics for the manual but did not do anything else for the manual yet * minor optimizations known bugs: * timers are slowed donw when playback is active (tinyalsa related?) * some minor bugs Things to do: * The main prolem will be how to install the app correctly. A guy called DOC2008 added a CWM (by androtab.info) to the official firmware and Ilia made a CWM installation script and a dualboot selector (rbutils/ibassoboot, build with ndk-build). We will have to find a way to install rockbox in a proper way without breaking any copyrights. Maybe ADB is an option but it is not enable with OF by default. Patching the OF is probably the way to go. * All the wiki and manual to build: needed: android ndk installed, android sdk installed with additional build-tools 19.1.0 installed ./tools/configure select iBasso DX50 or iBasso DX90 make -j apk the content of rockbox.zip/.rockbox needs to be copied to /system/rockbox/app_rockbox/rockbox/ (rockbox app not needed) the content of libs/armeabi to /system/rockbox/lib/ (rockbox app needed) The boot selector is needed as /system/bin/MangoPlayer and the iBasso app as /system/bin/MangoPlayer_original. There is also the "vold" file. The one from OF does not work with DX50 rockbox (DX90 works!?), the one from Ilia is necessary. Until we have found a proper way to install it, it can only be installed following the instructions of Ilia on his bitbucket page, using the CWM-OF and his installation script package. Change-Id: Ic4faaf84824c162aabcc08e492cee6e0068719d0 Reviewed-on: http://gerrit.rockbox.org/941 Tested: Chiwen Chang Reviewed-by: Michael Giacomelli --- firmware/target/hosted/android/system-android.c | 54 ++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) (limited to 'firmware/target/hosted/android/system-android.c') diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c index d13b8d6462..6279504e48 100644 --- a/firmware/target/hosted/android/system-android.c +++ b/firmware/target/hosted/android/system-android.c @@ -23,6 +23,12 @@ #include #include #include +#if defined(DX50) || defined(DX90) +#include +#include +#include +#include +#endif /* DX50 || DX90 */ #include #include "config.h" #include "system.h" @@ -31,40 +37,83 @@ +#if !defined(DX50) && !defined(DX90) /* global fields for use with various JNI calls */ static JavaVM *vm_ptr; JNIEnv *env_ptr; jobject RockboxService_instance; jclass RockboxService_class; +#endif /* !DX50 && !DX90 */ uintptr_t *stackbegin; uintptr_t *stackend; extern int main(void); +#if !defined(DX50) && !defined(DX90) extern void telephony_init_device(void); - +#endif void system_exception_wait(void) { +#if defined(DX50) || defined(DX90) + while(1); +#else intptr_t dummy = 0; while(button_read_device(&dummy) != BUTTON_BACK); +#endif /* DX50 || DX90 */ } void system_reboot(void) { +#if defined(DX50) || defined(DX90) + reboot(RB_AUTOBOOT); +#else power_off(); +#endif /* DX50 || DX90 */ } +#if !defined(DX50) && !defined(DX90) /* this is used to return from the entry point of the native library. */ static jmp_buf poweroff_buf; +#endif + void power_off(void) { +#if defined(DX50) || defined(DX90) + reboot(RB_POWER_OFF); +#else longjmp(poweroff_buf, 1); +#endif /* DX50 || DX90 */ } void system_init(void) { +#if defined(DX50) || defined(DX90) + volatile uintptr_t stack = 0; + stackbegin = stackend = (uintptr_t*) &stack; + + struct stat m1, m2; + stat("/mnt/", &m1); + do + { + /* waiting for storage to get mounted */ + stat("/sdcard/", &m2); + usleep(100000); + } + while(m1.st_dev == m2.st_dev); +/* here would be the correct place for 'system("/system/bin/muteopen");' (headphone-out relay) but in pcm-dx50.c, pcm_play_dma_start() + the output capacitors are charged already a bit and the click of the headphone-connection-relay is softer */ + +#if defined(DX90) + /* DAC needs to be unmuted on DX90 */ + FILE * f = fopen("/sys/class/codec/wm8740_mute", "w"); + fputc(0, f); + fclose(f); +#endif /* DX90 */ + +#else /* no better place yet */ telephony_init_device(); +#endif /* DX50 || DX90 */ } int hostfs_init(void) @@ -79,6 +128,7 @@ int hostfs_flush(void) return 0; } +#if !defined(DX50) && !defined(DX90) JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void* reserved) { @@ -119,7 +169,7 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) /* simply return here. this will allow the VM to clean up objects and do * garbage collection */ } - +#endif /* !DX50 && !DX90 */ /* below is the facility for external (from other java threads) to safely call * into our snative code. When extracting rockbox.zip the main function is -- cgit v1.2.3