From 850a11250a8c5b6825b080ff843f30fd68cb71f6 Mon Sep 17 00:00:00 2001
From: Andree Buschmann <AndreeBuschmann@t-online.de>
Date: Sun, 20 Apr 2008 18:28:25 +0000
Subject: 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
---
 apps/lang/deutsch.lang     | 14 ++++++++++++++
 apps/lang/english.lang     | 14 ++++++++++++++
 apps/main.c                |  3 +++
 apps/menus/settings_menu.c | 20 +++++++++++++-------
 apps/settings.h            |  3 +++
 apps/settings_list.c       |  4 ++++
 6 files changed, 51 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index c50268c..b77f13c 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -11533,3 +11533,17 @@
     swcodec: "Tastentöne Wiederholung"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ACCESSORY_SUPPLY
+  desc: in keyclick settings menu
+  user:
+  <source>
+    *: "Zubehör Spannungsversorgung"
+  </source>
+  <dest>
+    *: "Zubehör Spannungsversorgung"
+  </dest>
+  <voice>
+    *: "Zubehör Spannungsversorgung"
+  </voice>
+</phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index e3b632f..6a79371 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -11576,3 +11576,17 @@
     swcodec: "Keyclick Repeats"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ACCESSORY_SUPPLY
+  desc: in keyclick settings menu
+  user:
+  <source>
+    *: "Accessory Power Supply"
+  </source>
+  <dest>
+    *: "Accessory Power Supply"
+  </dest>
+  <voice>
+    *: "Accessory Power Supply"
+  </voice>
+</phrase>
diff --git a/apps/main.c b/apps/main.c
index 8b1e2e4..e84a672 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -583,6 +583,9 @@ static void init(void)
 #if CONFIG_CHARGING
     car_adapter_mode_init();
 #endif
+#ifdef HAVE_ACCESSORY_SUPPLY
+    accessory_supply_set(global_settings.accessory_supply);
+#endif
 }
 
 #ifdef CPU_PP
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 9d816c9..635651e 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -34,19 +34,19 @@
 #include "splash.h"
 #include "talk.h"
 #include "sprintf.h"
-#include "powermgmt.h"
-#if CONFIG_CODEC == SWCODEC
-#include "playback.h"
-#endif
+#include "powermgmt.h"
+#if CONFIG_CODEC == SWCODEC
+#include "playback.h"
+#endif
 #ifdef HAVE_RTC_ALARM
 #include "alarm_menu.h"
 #endif
 #if CONFIG_TUNER
 #include "radio.h"
 #endif
-#if CONFIG_RTC
-#include "screens.h"
-#endif
+#if CONFIG_RTC
+#include "screens.h"
+#endif
 
 /***********************************/
 /*    TAGCACHE MENU                */
@@ -348,6 +348,9 @@ MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback);
 #if CONFIG_CHARGING
 MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL);
 #endif
+#ifdef HAVE_ACCESSORY_SUPPLY
+MENUITEM_SETTING(accessory_supply, &global_settings.accessory_supply, NULL);
+#endif
 MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL);
 
 #ifdef HAVE_BUTTON_LIGHT
@@ -385,6 +388,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #if CONFIG_CHARGING
             &car_adapter_mode,
 #endif
+#ifdef HAVE_ACCESSORY_SUPPLY
+            &accessory_supply,
+#endif
 #ifdef HAVE_BUTTON_LIGHT
             &buttonlight_timeout,
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 25314d7..7c32ba2 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -453,6 +453,9 @@ struct user_settings
     bool peak_meter_clipcounter;    /* clipping count indicator */
 #endif
     bool car_adapter_mode; /* 0=off 1=on */
+#ifdef HAVE_ACCESSORY_SUPPLY
+    bool accessory_supply; /* 0=off 1=on, accessory power supply for iPod */
+#endif
 
     /* show status bar */
     bool statusbar;    /* 0=hide, 1=show */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index e72b259..d8b2154 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -512,6 +512,10 @@ const struct settings_list settings[] = {
     OFFON_SETTING(NVRAM(1), car_adapter_mode,
         LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL),
 #endif
+#ifdef HAVE_ACCESSORY_SUPPLY
+    OFFON_SETTING(0, accessory_supply, LANG_ACCESSORY_SUPPLY, 
+        false, "accessory power supply", accessory_supply_set),
+#endif
     /* tuner */
 #if CONFIG_TUNER
     OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE,
-- 
cgit v1.1