diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2008-04-20 18:28:25 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2008-04-20 18:28:25 +0000 |
commit | 850a11250a8c5b6825b080ff843f30fd68cb71f6 (patch) | |
tree | d236674a20fccc8002edeafa30d210b5c972327d /apps/menus/settings_menu.c | |
parent | cea07eb2a4ddb72d084c7085192521613004a997 (diff) | |
download | rockbox-850a11250a8c5b6825b080ff843f30fd68cb71f6.tar.gz rockbox-850a11250a8c5b6825b080ff843f30fd68cb71f6.zip |
Adding new setting to System Settings <Accessory Power Supply -- off by default). This setting can be used to enable/disable the power supply for accessories. With this commit implemented for iPods with PCF50605 power controller.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17193 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 9d816c99b1..635651e256 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -34,19 +34,19 @@ | |||
34 | #include "splash.h" | 34 | #include "splash.h" |
35 | #include "talk.h" | 35 | #include "talk.h" |
36 | #include "sprintf.h" | 36 | #include "sprintf.h" |
37 | #include "powermgmt.h" | 37 | #include "powermgmt.h" |
38 | #if CONFIG_CODEC == SWCODEC | 38 | #if CONFIG_CODEC == SWCODEC |
39 | #include "playback.h" | 39 | #include "playback.h" |
40 | #endif | 40 | #endif |
41 | #ifdef HAVE_RTC_ALARM | 41 | #ifdef HAVE_RTC_ALARM |
42 | #include "alarm_menu.h" | 42 | #include "alarm_menu.h" |
43 | #endif | 43 | #endif |
44 | #if CONFIG_TUNER | 44 | #if CONFIG_TUNER |
45 | #include "radio.h" | 45 | #include "radio.h" |
46 | #endif | 46 | #endif |
47 | #if CONFIG_RTC | 47 | #if CONFIG_RTC |
48 | #include "screens.h" | 48 | #include "screens.h" |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | /***********************************/ | 51 | /***********************************/ |
52 | /* TAGCACHE MENU */ | 52 | /* TAGCACHE MENU */ |
@@ -348,6 +348,9 @@ MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback); | |||
348 | #if CONFIG_CHARGING | 348 | #if CONFIG_CHARGING |
349 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | 349 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); |
350 | #endif | 350 | #endif |
351 | #ifdef HAVE_ACCESSORY_SUPPLY | ||
352 | MENUITEM_SETTING(accessory_supply, &global_settings.accessory_supply, NULL); | ||
353 | #endif | ||
351 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 354 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
352 | 355 | ||
353 | #ifdef HAVE_BUTTON_LIGHT | 356 | #ifdef HAVE_BUTTON_LIGHT |
@@ -385,6 +388,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
385 | #if CONFIG_CHARGING | 388 | #if CONFIG_CHARGING |
386 | &car_adapter_mode, | 389 | &car_adapter_mode, |
387 | #endif | 390 | #endif |
391 | #ifdef HAVE_ACCESSORY_SUPPLY | ||
392 | &accessory_supply, | ||
393 | #endif | ||
388 | #ifdef HAVE_BUTTON_LIGHT | 394 | #ifdef HAVE_BUTTON_LIGHT |
389 | &buttonlight_timeout, | 395 | &buttonlight_timeout, |
390 | #endif | 396 | #endif |