diff options
author | William Wilgus <me.theuser@yahoo.com> | 2018-07-28 17:35:01 +0200 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2018-07-28 17:35:07 +0200 |
commit | d8bd356e565f5d1be946462616e8bb1e858fb833 (patch) | |
tree | 71e60336b6e43fc372b2f56941cdc4a4bf054659 /apps | |
parent | 16f10e2abddb3a6cb6e3a7098ff0c190c0635401 (diff) | |
download | rockbox-d8bd356e565f5d1be946462616e8bb1e858fb833.tar.gz 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.txt | 4 | ||||
-rw-r--r-- | apps/lang/english.lang | 51 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 35 | ||||
-rw-r--r-- | apps/settings.h | 19 | ||||
-rw-r--r-- | apps/settings_list.c | 38 |
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 | |||
288 | #if defined(HAVE_BOOTDATA) | 288 | #if defined(HAVE_BOOTDATA) |
289 | boot_data | 289 | boot_data |
290 | #endif | 290 | #endif |
291 | |||
292 | #if defined(CONFIG_POWER_SAVING) | ||
293 | sys_powersaving | ||
294 | #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 @@ | |||
13647 | *: "Disable Touch" | 13647 | *: "Disable Touch" |
13648 | </voice> | 13648 | </voice> |
13649 | </phrase> | 13649 | </phrase> |
13650 | <phrase> | ||
13651 | id: LANG_POWER_SAVING_MENU | ||
13652 | desc: system clock and voltage settings | ||
13653 | user: core | ||
13654 | <source> | ||
13655 | *: none | ||
13656 | sys_powersaving: "Power Saving" | ||
13657 | </source> | ||
13658 | <dest> | ||
13659 | *: none | ||
13660 | sys_powersaving: "Power Saving" | ||
13661 | </dest> | ||
13662 | <voice> | ||
13663 | *: none | ||
13664 | sys_powersaving: "Power Saving" | ||
13665 | </voice> | ||
13666 | </phrase> | ||
13667 | <phrase> | ||
13668 | id: LANG_CPU | ||
13669 | desc: system clock and voltage settings | ||
13670 | user: core | ||
13671 | <source> | ||
13672 | *: none | ||
13673 | sys_powersaving: "CPU" | ||
13674 | </source> | ||
13675 | <dest> | ||
13676 | *: none | ||
13677 | sys_powersaving: "CPU" | ||
13678 | </dest> | ||
13679 | <voice> | ||
13680 | *: none | ||
13681 | sys_powersaving: "CPU" | ||
13682 | </voice> | ||
13683 | </phrase> | ||
13684 | <phrase> | ||
13685 | id: LANG_I2C | ||
13686 | desc: system clock and voltage settings | ||
13687 | user: core | ||
13688 | <source> | ||
13689 | *: none | ||
13690 | sys_powersaving: "I2C" | ||
13691 | </source> | ||
13692 | <dest> | ||
13693 | *: none | ||
13694 | sys_powersaving: "I2C" | ||
13695 | </dest> | ||
13696 | <voice> | ||
13697 | *: none | ||
13698 | sys_powersaving: "I2C" | ||
13699 | </voice> | ||
13700 | </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, | |||
295 | ); | 295 | ); |
296 | #endif | 296 | #endif |
297 | 297 | ||
298 | #ifdef CONFIG_POWER_SAVING | ||
299 | #if (CONFIG_POWER_SAVING & POWERSV_CPU) | ||
300 | MENUITEM_SETTING(cpu_powersave, &global_settings.cpu_powersave, NULL); | ||
301 | #endif | ||
302 | #if (CONFIG_POWER_SAVING & POWERSV_DISK) | ||
303 | MENUITEM_SETTING(disk_powersave, &global_settings.disk_powersave, NULL); | ||
304 | #endif | ||
305 | #if (CONFIG_POWER_SAVING & POWERSV_I2C) | ||
306 | MENUITEM_SETTING(i2c_powersave, &global_settings.i2c_powersave, NULL); | ||
307 | #endif | ||
308 | #if (CONFIG_POWER_SAVING & POWERSV_DISP) | ||
309 | MENUITEM_SETTING(disp_powersave, &global_settings.disp_powersave, NULL); | ||
310 | #endif | ||
311 | |||
312 | MAKE_MENU(power_save_menu, ID2P(LANG_POWER_SAVING_MENU), 0, Icon_NOICON, | ||
313 | #if (CONFIG_POWER_SAVING & POWERSV_CPU) | ||
314 | &cpu_powersave, | ||
315 | #endif | ||
316 | #if (CONFIG_POWER_SAVING & POWERSV_DISK) | ||
317 | &disk_powersave, | ||
318 | #endif | ||
319 | #if (CONFIG_POWER_SAVING & POWERSV_I2C) | ||
320 | &i2c_powersave, | ||
321 | #endif | ||
322 | #if (CONFIG_POWER_SAVING & POWERSV_DISP) | ||
323 | &disp_powersave, | ||
324 | #endif | ||
325 | ); | ||
326 | #endif /* ifdef CONFIG_POWER_SAVING */ | ||
327 | |||
328 | /* Limits menu */ | 298 | /* Limits menu */ |
329 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 299 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
330 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 300 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
@@ -442,11 +412,6 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
442 | &disk_menu, | 412 | &disk_menu, |
443 | #endif | 413 | #endif |
444 | &limits_menu, | 414 | &limits_menu, |
445 | |||
446 | #if defined(CONFIG_POWER_SAVING) | ||
447 | &power_save_menu, | ||
448 | #endif | ||
449 | |||
450 | #ifdef HAVE_QUICKSCREEN | 415 | #ifdef HAVE_QUICKSCREEN |
451 | &shortcuts_replaces_quickscreen, | 416 | &shortcuts_replaces_quickscreen, |
452 | #endif | 417 | #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 | |||
864 | int governor; | 864 | int governor; |
865 | int usb_mode; | 865 | int usb_mode; |
866 | #endif | 866 | #endif |
867 | |||
868 | #ifdef CONFIG_POWER_SAVING | ||
869 | #if (CONFIG_POWER_SAVING & POWERSV_CPU) | ||
870 | bool cpu_powersave; | ||
871 | #endif | ||
872 | |||
873 | #if (CONFIG_POWER_SAVING & POWERSV_DISK) | ||
874 | bool disk_powersave; | ||
875 | #endif | ||
876 | |||
877 | #if (CONFIG_POWER_SAVING & POWERSV_I2C) | ||
878 | bool i2c_powersave; | ||
879 | #endif | ||
880 | |||
881 | #if (CONFIG_POWER_SAVING & POWERSV_DISP) | ||
882 | bool disp_powersave; | ||
883 | #endif | ||
884 | #endif /*defined(CONFIG_POWER_SAVING)*/ | ||
885 | |||
886 | }; | 867 | }; |
887 | 868 | ||
888 | /** global variables **/ | 869 | /** 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[] = { | |||
2246 | ID2P(LANG_IBASSO_USB_MODE_CHARGE), | 2246 | ID2P(LANG_IBASSO_USB_MODE_CHARGE), |
2247 | ID2P(LANG_IBASSO_USB_MODE_ADB)), | 2247 | ID2P(LANG_IBASSO_USB_MODE_ADB)), |
2248 | #endif | 2248 | #endif |
2249 | 2249 | }; | |
2250 | #ifdef CONFIG_POWER_SAVING | ||
2251 | #if (CONFIG_POWER_SAVING & POWERSV_CPU) | ||
2252 | OFFON_SETTING(0, | ||
2253 | cpu_powersave, | ||
2254 | LANG_CPU, | ||
2255 | false, | ||
2256 | "cpu powersave", | ||
2257 | cpu_set_powersave), | ||
2258 | #endif | ||
2259 | #if (CONFIG_POWER_SAVING & POWERSV_DISK) | ||
2260 | OFFON_SETTING(0, | ||
2261 | disk_powersave, | ||
2262 | LANG_DISK_MENU, | ||
2263 | false, | ||
2264 | "disk powersave", | ||
2265 | disk_set_powersave), | ||
2266 | #endif | ||
2267 | #if (CONFIG_POWER_SAVING & POWERSV_DISP) | ||
2268 | OFFON_SETTING(0, | ||
2269 | disp_powersave, | ||
2270 | LANG_DISPLAY, | ||
2271 | false, | ||
2272 | "disp powersave", | ||
2273 | disp_set_powersave), | ||
2274 | #endif | ||
2275 | #if (CONFIG_POWER_SAVING & POWERSV_I2C) | ||
2276 | OFFON_SETTING(0, | ||
2277 | i2c_powersave, | ||
2278 | LANG_I2C, | ||
2279 | false, | ||
2280 | "i2c powersave", | ||
2281 | i2c_set_powersave), | ||
2282 | #endif | ||
2283 | #endif /*defined(CONFIG_POWER_SAVING)*/ | ||
2284 | |||
2285 | };/*struct settings_list settings*/ | ||
2286 | 2250 | ||
2287 | const int nb_settings = sizeof(settings)/sizeof(*settings); | 2251 | const int nb_settings = sizeof(settings)/sizeof(*settings); |
2288 | 2252 | ||