summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2018-07-28 17:35:01 +0200
committerWilliam Wilgus <me.theuser@yahoo.com>2018-07-28 17:35:07 +0200
commitd8bd356e565f5d1be946462616e8bb1e858fb833 (patch)
tree71e60336b6e43fc372b2f56941cdc4a4bf054659 /apps
parent16f10e2abddb3a6cb6e3a7098ff0c190c0635401 (diff)
downloadrockbox-d8bd356e565f5d1be946462616e8bb1e858fb833.tar.gz
rockbox-d8bd356e565f5d1be946462616e8bb1e858fb833.tar.bz2
rockbox-d8bd356e565f5d1be946462616e8bb1e858fb833.zip
Revert "As3525 v1/v2 Add power savings menu"
This reverts commit 6f0320a9535bc1aa81d83fa879ac14d5ee603658. Change-Id: I7425d422a4a0af7a49e9194cfe0bb55d431bc401
Diffstat (limited to 'apps')
-rw-r--r--apps/features.txt4
-rw-r--r--apps/lang/english.lang51
-rw-r--r--apps/menus/settings_menu.c35
-rw-r--r--apps/settings.h19
-rw-r--r--apps/settings_list.c38
5 files changed, 1 insertions, 146 deletions
diff --git a/apps/features.txt b/apps/features.txt
index 39c8422fbd..3c0b0a3856 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -288,7 +288,3 @@ play_frequency
#if defined(HAVE_BOOTDATA)
boot_data
#endif
-
-#if defined(CONFIG_POWER_SAVING)
-sys_powersaving
-#endif
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index fa1b5f2c27..d4e0697667 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13647,54 +13647,3 @@
*: "Disable Touch"
</voice>
</phrase>
-<phrase>
- id: LANG_POWER_SAVING_MENU
- desc: system clock and voltage settings
- user: core
- <source>
- *: none
- sys_powersaving: "Power Saving"
- </source>
- <dest>
- *: none
- sys_powersaving: "Power Saving"
- </dest>
- <voice>
- *: none
- sys_powersaving: "Power Saving"
- </voice>
-</phrase>
-<phrase>
- id: LANG_CPU
- desc: system clock and voltage settings
- user: core
- <source>
- *: none
- sys_powersaving: "CPU"
- </source>
- <dest>
- *: none
- sys_powersaving: "CPU"
- </dest>
- <voice>
- *: none
- sys_powersaving: "CPU"
- </voice>
-</phrase>
-<phrase>
- id: LANG_I2C
- desc: system clock and voltage settings
- user: core
- <source>
- *: none
- sys_powersaving: "I2C"
- </source>
- <dest>
- *: none
- sys_powersaving: "I2C"
- </dest>
- <voice>
- *: none
- sys_powersaving: "I2C"
- </voice>
-</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index f23f01d4dc..5c99cb4cd4 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -295,36 +295,6 @@ MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON,
);
#endif
-#ifdef CONFIG_POWER_SAVING
-#if (CONFIG_POWER_SAVING & POWERSV_CPU)
-MENUITEM_SETTING(cpu_powersave, &global_settings.cpu_powersave, NULL);
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISK)
-MENUITEM_SETTING(disk_powersave, &global_settings.disk_powersave, NULL);
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_I2C)
-MENUITEM_SETTING(i2c_powersave, &global_settings.i2c_powersave, NULL);
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISP)
-MENUITEM_SETTING(disp_powersave, &global_settings.disp_powersave, NULL);
-#endif
-
-MAKE_MENU(power_save_menu, ID2P(LANG_POWER_SAVING_MENU), 0, Icon_NOICON,
-#if (CONFIG_POWER_SAVING & POWERSV_CPU)
- &cpu_powersave,
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISK)
- &disk_powersave,
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_I2C)
- &i2c_powersave,
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISP)
- &disp_powersave,
-#endif
- );
-#endif /* ifdef CONFIG_POWER_SAVING */
-
/* Limits menu */
MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL);
MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL);
@@ -442,11 +412,6 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
&disk_menu,
#endif
&limits_menu,
-
-#if defined(CONFIG_POWER_SAVING)
- &power_save_menu,
-#endif
-
#ifdef HAVE_QUICKSCREEN
&shortcuts_replaces_quickscreen,
#endif
diff --git a/apps/settings.h b/apps/settings.h
index 8d8c766d45..cbe12d70b7 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -864,25 +864,6 @@ struct user_settings
int governor;
int usb_mode;
#endif
-
-#ifdef CONFIG_POWER_SAVING
-#if (CONFIG_POWER_SAVING & POWERSV_CPU)
- bool cpu_powersave;
-#endif
-
-#if (CONFIG_POWER_SAVING & POWERSV_DISK)
- bool disk_powersave;
-#endif
-
-#if (CONFIG_POWER_SAVING & POWERSV_I2C)
- bool i2c_powersave;
-#endif
-
-#if (CONFIG_POWER_SAVING & POWERSV_DISP)
- bool disp_powersave;
-#endif
-#endif /*defined(CONFIG_POWER_SAVING)*/
-
};
/** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index fe280b0ff6..57763d345a 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -2246,43 +2246,7 @@ const struct settings_list settings[] = {
ID2P(LANG_IBASSO_USB_MODE_CHARGE),
ID2P(LANG_IBASSO_USB_MODE_ADB)),
#endif
-
-#ifdef CONFIG_POWER_SAVING
-#if (CONFIG_POWER_SAVING & POWERSV_CPU)
- OFFON_SETTING(0,
- cpu_powersave,
- LANG_CPU,
- false,
- "cpu powersave",
- cpu_set_powersave),
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISK)
- OFFON_SETTING(0,
- disk_powersave,
- LANG_DISK_MENU,
- false,
- "disk powersave",
- disk_set_powersave),
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_DISP)
- OFFON_SETTING(0,
- disp_powersave,
- LANG_DISPLAY,
- false,
- "disp powersave",
- disp_set_powersave),
-#endif
-#if (CONFIG_POWER_SAVING & POWERSV_I2C)
- OFFON_SETTING(0,
- i2c_powersave,
- LANG_I2C,
- false,
- "i2c powersave",
- i2c_set_powersave),
-#endif
-#endif /*defined(CONFIG_POWER_SAVING)*/
-
-};/*struct settings_list settings*/
+};
const int nb_settings = sizeof(settings)/sizeof(*settings);