From 040306a71663d98f1ca568b61010ee125d1e6501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Udo=20Schl=C3=A4pfer?= Date: Fri, 30 Jan 2015 22:47:30 +0100 Subject: [PATCH] iBasso DX50/DX90: User selectable freq scaling governor. Depends on http://gerrit.rockbox.org/r/#/c/1043/. This patch adds a new setting in Settings -> General -> System: Freq Scaling Governor Usable in Quickscreen and Shortcuts. Possible settings are: - Conservative: Slow frequency switching. - Ondemand or Interactive: Fast frequency switching. - Powersave: Allways lowest frequency. - Performance: Allways highest frequency. German translation provided. This may be genric for Android kernel based devices but is only enabled for iBasso Devices. Other maintainers may choose do adopt this. Change-Id: I10296f5be9586ad3a409105db0cd03682a30e9c1 --- apps/lang/deutsch.lang | 21 +++++ apps/lang/english.lang | 20 +++++ apps/menus/settings_menu.c | 12 +++ apps/settings.c | 9 ++ apps/settings.h | 4 + apps/settings_list.c | 20 +++++ firmware/SOURCES | 1 + .../target/hosted/ibasso/governor-ibasso.c | 90 +++++++++++++++++++ .../target/hosted/ibasso/governor-ibasso.h | 54 +++++++++++ firmware/target/hosted/ibasso/system-ibasso.c | 4 +- 10 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 firmware/target/hosted/ibasso/governor-ibasso.c create mode 100644 firmware/target/hosted/ibasso/governor-ibasso.h diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index 55377c2ca1..6d9c025bd2 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -33,6 +33,7 @@ # - Kaspar Rothenfußer # - Johannes Linke # - Kai Posadowsky +# - Udo Schläpfer id: LANG_SET_BOOL_YES desc: bool true representation @@ -13054,3 +13055,23 @@ *: "Beschränke automatischen Verzeichniswechsel" + + id: LANG_IBASSO_FREQ_SCALING_GOVERNOR + desc: in Settings -> General -> System -> Freq Scaling Governor + user: core + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + diff --git a/apps/lang/english.lang b/apps/lang/english.lang index ca5e687ea8..081e33d32c 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -13373,3 +13373,23 @@ swcodec: "Dry / Wet Mix" + + id: LANG_IBASSO_FREQ_SCALING_GOVERNOR + desc: in Settings -> General -> System -> Freq Scaling Governor + user: core + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + + *: none + ibassodx50: "Freq Scaling Governor" + ibassodx90: "Freq Scaling Governor" + + diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 130f5be1a2..6fcc3e91a9 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -50,6 +50,10 @@ #endif #include "folder_select.h" +#if defined(DX50) || defined(DX90) +#include "governor-ibasso.h" +#endif + /***********************************/ /* TAGCACHE MENU */ #ifdef HAVE_TAGCACHE @@ -325,6 +329,10 @@ MENUITEM_SETTING(touchpad_deadzone, &global_settings.touchpad_deadzone, NULL); MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_replaces_qs, NULL); #endif +#if defined(DX50) || defined(DX90) +MENUITEM_SETTING(governor, &global_settings.governor, NULL); +#endif + MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) @@ -377,6 +385,10 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), #if defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE) &usb_skip_first_drive, #endif + +#if defined(DX50) || defined(DX90) + &governor, +#endif ); /* SYSTEM MENU */ diff --git a/apps/settings.c b/apps/settings.c index f144a4af03..be7b7c30e6 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -105,6 +105,11 @@ struct system_status global_status; #include "lcd-remote.h" #endif +#if defined(DX50) || defined(DX90) +#include "governor-ibasso.h" +#endif + + long lasttime = 0; /** NVRAM stuff, if the target doesnt have NVRAM it is saved in ROCKBOX_DIR /nvram.bin **/ @@ -1081,6 +1086,10 @@ void settings_apply(bool read_disk) memcpy(&calibration_parameters, &global_settings.ts_calibration_data, sizeof(struct touchscreen_parameter)); #endif +#if defined(DX50) || defined(DX90) + ibasso_set_governor(global_settings.governor); +#endif + /* This should stay last */ #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC enc_global_settings_apply(); diff --git a/apps/settings.h b/apps/settings.h index 4ea56d273e..5d25dc7ab0 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -850,6 +850,10 @@ struct user_settings int pbe_precut; int afr_enabled; + +#if defined(DX50) || defined(DX90) + int governor; +#endif }; /** global variables **/ diff --git a/apps/settings_list.c b/apps/settings_list.c index abdb512a42..2c3f360cea 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -62,6 +62,10 @@ #include "onplay.h" #endif +#if defined(DX50) || defined(DX90) +#include "governor-ibasso.h" +#endif + #define NVRAM(bytes) (bytes< ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * 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 "config.h" +#include "cpufreq-linux.h" +#include "debug.h" + +#include "debug-ibasso.h" +#include "governor-ibasso.h" +#include "sysfs-ibasso.h" + + +/* Default governor at boot. */ +static int _last_governor = GOVERNOR_INTERACTIVE; + + +void ibasso_set_governor(int governor) +{ + DEBUGF("DEBUG %s: _last_governor: %d, governor: %d.", __func__, _last_governor, governor); + + if(_last_governor != governor) + { + switch(governor) + { + case GOVERNOR_CONSERVATIVE: + { + _last_governor = governor; + cpufreq_set_governor("conservative", CPUFREQ_ALL_CPUS); + break; + } + + case GOVERNOR_ONDEMAND: + { + _last_governor = governor; + cpufreq_set_governor("ondemand", CPUFREQ_ALL_CPUS); + break; + } + + case GOVERNOR_POWERSAVE: + { + _last_governor = governor; + cpufreq_set_governor("powersave", CPUFREQ_ALL_CPUS); + break; + } + + case GOVERNOR_INTERACTIVE: + { + _last_governor = governor; + cpufreq_set_governor("interactive", CPUFREQ_ALL_CPUS); + break; + } + + case GOVERNOR_PERFORMANCE: + { + _last_governor = governor; + cpufreq_set_governor("performance", CPUFREQ_ALL_CPUS); + break; + } + + default: + { + DEBUGF("ERROR %s: Unknown governor: %d.", __func__, governor); + break; + } + } + } +} diff --git a/firmware/target/hosted/ibasso/governor-ibasso.h b/firmware/target/hosted/ibasso/governor-ibasso.h new file mode 100644 index 0000000000..34781fde0b --- /dev/null +++ b/firmware/target/hosted/ibasso/governor-ibasso.h @@ -0,0 +1,54 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * 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 _GOVERNOR_IBASSO_H_ +#define _GOVERNOR_IBASSO_H_ + + +/* Supported freq scaling governors. */ +enum ibasso_governors +{ + /* Slow frequency switching. */ + GOVERNOR_CONSERVATIVE = 0, + + /* Fast frequency switching. */ + GOVERNOR_ONDEMAND, + GOVERNOR_INTERACTIVE, + + /* Allways lowest frequency. */ + GOVERNOR_POWERSAVE, + + /* Allways highest frequency. */ + GOVERNOR_PERFORMANCE +}; + + +/* + Set the active freq scaling governor. + governor: ibasso_governors +*/ +void ibasso_set_governor(int governor); + + +#endif diff --git a/firmware/target/hosted/ibasso/system-ibasso.c b/firmware/target/hosted/ibasso/system-ibasso.c index 00f8669ae0..a107af7a7f 100644 --- a/firmware/target/hosted/ibasso/system-ibasso.c +++ b/firmware/target/hosted/ibasso/system-ibasso.c @@ -27,7 +27,6 @@ #include #include "config.h" -#include "cpufreq-linux.h" #include "debug.h" #include "button-ibasso.h" @@ -50,8 +49,7 @@ void system_init(void) volatile uintptr_t stack = 0; stackbegin = stackend = (uintptr_t*) &stack; - cpufreq_set_governor("powersave", CPUFREQ_ALL_CPUS); - vold_monitor_start(); + vold_monitor_start(); ibasso_set_usb_mode(USB_MODE_MASS_STORAGE); /*