diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 19:54:25 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 19:54:25 +0000 |
| commit | 58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657 (patch) | |
| tree | 084c7b7c5d374fbfef2f8cddb3673a3b2a26a7df /apps/settings.h | |
| parent | 0d0cc039f88ced4f6db5c4468b19913f52cd08c8 (diff) | |
| download | rockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.tar.gz rockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.zip | |
Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19315 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
| -rw-r--r-- | apps/settings.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/settings.h b/apps/settings.h index be83689368..f79fb9d09e 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
| @@ -684,11 +684,9 @@ struct user_settings | |||
| 684 | unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */ | 684 | unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */ |
| 685 | #endif | 685 | #endif |
| 686 | 686 | ||
| 687 | #ifdef HAVE_USB_POWER | 687 | #ifdef HAVE_USB_CHARGING_ENABLE |
| 688 | #if CONFIG_CHARGING | ||
| 689 | bool usb_charging; | 688 | bool usb_charging; |
| 690 | #endif | 689 | #endif |
| 691 | #endif | ||
| 692 | 690 | ||
| 693 | bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */ | 691 | bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */ |
| 694 | #ifdef HAVE_LCD_BITMAP | 692 | #ifdef HAVE_LCD_BITMAP |