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 --- .../target/hosted/android/dx50/powermgmt-dx50.c | 97 ---------------------- 1 file changed, 97 deletions(-) delete mode 100644 firmware/target/hosted/android/dx50/powermgmt-dx50.c (limited to 'firmware/target/hosted/android/dx50/powermgmt-dx50.c') diff --git a/firmware/target/hosted/android/dx50/powermgmt-dx50.c b/firmware/target/hosted/android/dx50/powermgmt-dx50.c deleted file mode 100644 index 713e8a977e..0000000000 --- a/firmware/target/hosted/android/dx50/powermgmt-dx50.c +++ /dev/null @@ -1,97 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Thomas Martitz - * - * 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 -#include -#include -#include "config.h" -#include "power.h" -#include "powermgmt.h" - - -unsigned int power_input_status(void) -{ - int val; - FILE *f = fopen("/sys/class/power_supply/ac/present", "r"); - fscanf(f, "%d", &val); - fclose(f); - return val?POWER_INPUT_MAIN_CHARGER:POWER_INPUT_NONE; -} - - -/* Returns true, if battery is charging, false else. */ -bool charging_state( void ) -{ - /* Full, Charging, Discharging */ - char state[9]; - - /* true if charging. */ - bool charging = false; - - FILE *f = fopen( "/sys/class/power_supply/battery/status", "r" ); - if( f != NULL ) - { - if( fgets( state, 9, f ) != NULL ) - { - charging = ( strcmp( state, "Charging" ) == 0 ); - } - } - fclose( f ); - - return charging; -} - - -/* Values for stock PISEN battery. TODO: Needs optimization */ -const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = -{ - 3380 -}; - -const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = -{ - 3100 -}; - -/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ -const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = -{ - { 3370, 3650, 3700, 3740, 3780, 3820, 3870, 3930, 4000, 4090, 4190 } -}; - -/* Voltages (millivolt) of 0%, 10%, ... 100% when charging is enabled. */ -const unsigned short percent_to_volt_charge[11] = -{ - 3370, 3650, 3700, 3740, 3780, 3820, 3870, 3930, 4000, 4090, 4190 -}; - - -/* Returns battery voltage from android measurement [millivolts] */ -int _battery_voltage(void) -{ - int val; - FILE *f = fopen("/sys/class/power_supply/battery/voltage_now", "r"); - fscanf(f, "%d", &val); - fclose(f); - return (val/1000); -} - - -- cgit v1.2.3