8 files changed, 90 insertions, 4 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index c5240d0de8..99c00fa1eb 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -78,6 +78,9 @@
 #include "spdif.h"
 #endif
 #endif
+#ifdef IRIVER_H300_SERIES
+#include "pcf50606.h"   /* for pcf50606_read */
+#endif
 
 #ifdef IAUDIO_X5
 #include "lcd-remote-target.h"
@@ -1059,6 +1062,16 @@ bool dbg_ports(void)
         lcd_puts(0, line++, buf);
         snprintf(buf, sizeof(buf), "GPIO1_ENABLE:   %08x", gpio1_enable);
         lcd_puts(0, line++, buf);
+#if defined(IRIVER_H300_SERIES)
+        snprintf(buf, sizeof(buf), "GPOOD0:         %08x", (unsigned int)pcf50606_read(0x37));
+        lcd_puts(0, line++, buf);
+        snprintf(buf, sizeof(buf), "GPOOD1:         %08x", (unsigned int)pcf50606_read(0x38));
+        lcd_puts(0, line++, buf);
+        snprintf(buf, sizeof(buf), "GPOOD2:         %08x", (unsigned int)pcf50606_read(0x39));
+        lcd_puts(0, line++, buf);
+        snprintf(buf, sizeof(buf), "GPOOD3:         %08x", (unsigned int)pcf50606_read(0x3A));
+        lcd_puts(0, line++, buf);
+#endif
 
         adc_buttons = adc_read(ADC_BUTTONS);
         adc_remote  = adc_read(ADC_REMOTE);
@@ -1422,6 +1435,14 @@ static bool view_battery(void)
                 snprintf(buf, 30, "long delta: %d", long_delta);
                 lcd_puts(0, 6, buf);
                 lcd_puts(0, 7, power_message);
+                snprintf(buf, 30, "USB Inserted: %s",
+                         usb_inserted() ? "yes" : "no");
+                lcd_puts(0, 8, buf);
+#if defined IRIVER_H300_SERIES
+                snprintf(buf, 30, "USB Charging Enabled: %s",
+                         usb_charging_enabled() ? "yes" : "no");
+                lcd_puts(0, 9, buf);
+#endif
 #else /* CONFIG_CHARGING != CHARGING_CONTROL */
 #if defined IPOD_NANO || defined IPOD_VIDEO
                 int usb_pwr  = (GPIOL_INPUT_VAL & 0x10)?true:false;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index ae8bba0538..2f6dfafc81 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -143,7 +143,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
 
     bar->info.battlevel = battery_level();
 #ifdef HAVE_USB_POWER
-    bar->info.usb_power = usb_powered();
+    bar->info.usb_inserted = usb_inserted();
 #endif
 #ifdef CONFIG_CHARGING
     bar->info.inserted = (charger_input_state == CHARGER);
@@ -238,7 +238,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
             gui_statusbar_icon_battery(display, bar->info.battlevel, 
                                        bar->info.batt_charge_step);
 #ifdef HAVE_USB_POWER
-        if (bar->info.usb_power)
+        if (bar->info.usb_inserted)
             display->mono_bitmap(bitmap_icons_7x8[Icon_USBPlug],
                                  STATUSBAR_PLUG_X_POS,
                                  STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH,
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 5ab97d09ea..516598dd00 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -44,7 +44,7 @@ struct status_info {
     bool inserted;
 #endif
 #ifdef HAVE_USB_POWER
-    bool usb_power;
+    bool usb_inserted;
 #endif
     bool battery_state;
     bool shuffle;
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index d9481b9dca..4ae438f64d 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -3570,6 +3570,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_USB_CHARGING
+  desc: in Battery menu
+  user:
+  <source>
+    *: "Charge During USB Connection"
+  </source>
+  <dest>
+    *: "Laden bei USB-Verbindung"
+  </dest>
+  <voice>
+    *: "Laden bei U S B Verbindung"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_DISPLAY_GRAPHIC
   desc: Label for type of icon display
   user:
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 3f1fb11b35..e9c9f4c50c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3611,6 +3611,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_USB_CHARGING
+  desc: in Battery menu
+  user:
+  <source>
+    *: "Charge During USB Connection"
+  </source>
+  <dest>
+    *: "Charge During USB Connection"
+  </dest>
+  <voice>
+    *: "Charge During U S B Connection"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_DISPLAY_GRAPHIC
   desc: Label for type of icon display
   user:
diff --git a/apps/settings.h b/apps/settings.h
index 7b7f91abe0..e8db3289a1 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -611,6 +611,12 @@ struct user_settings
     unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */
 #endif
 
+#ifdef HAVE_USB_POWER
+#ifdef CONFIG_CHARGING
+    bool usb_charging;
+#endif
+#endif
+
 #ifdef HAVE_WM8758
     bool eq_hw_enabled;            /* Enable hardware equalizer */
     
diff --git a/apps/settings_list.c b/apps/settings_list.c
index a0651be4f3..6243607264 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -690,7 +690,11 @@ const struct settings_list settings[] = {
 #ifdef HAVE_LCD_BITMAP
     FILENAME_SETTING(0,kbd_file,"kbd","",ROCKBOX_DIR "/",".kbd",MAX_FILENAME+1),
 #endif
-
+#ifdef HAVE_USB_POWER
+#ifdef CONFIG_CHARGING
+    OFFON_SETTING(0,usb_charging,LANG_USB_CHARGING,false,"usb charging",NULL),
+#endif
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 0b599ca0c6..b1204e2c1a 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -405,6 +405,12 @@ static bool clear_main_backdrop(void)
 }
 #endif
 
+#ifdef HAVE_USB_POWER
+#ifdef CONFIG_CHARGING
+#include "usb.h"
+#endif
+#endif
+
 #ifdef HAVE_LCD_COLOR
 /**
  * Menu for fore/back colors
@@ -444,6 +450,22 @@ static bool reset_color(void)
 }
 #endif
 
+#ifdef HAVE_USB_POWER
+#ifdef CONFIG_CHARGING
+/**
+ * Menu to switch the USB charging on or off
+ */
+static bool usb_charging(void)
+{
+    bool rc = set_bool(str(LANG_USB_CHARGING),
+                       &global_settings.usb_charging);
+    /* if (usb_charging_enabled() != global_settings.usb_charging) */
+    usb_charging_enable(global_settings.usb_charging);
+    return rc;
+}
+#endif
+#endif
+
 /**
  * Menu to configure the battery display on status bar
  */
@@ -2083,6 +2105,11 @@ static bool battery_settings_menu(void)
 #if BATTERY_TYPES_COUNT > 1
         { ID2P(LANG_BATTERY_TYPE),     battery_type },
 #endif
+#ifdef HAVE_USB_POWER
+#ifdef CONFIG_CHARGING
+        { ID2P(LANG_USB_CHARGING),    usb_charging },
+#endif
+#endif
 #else
         { "Dummy", NULL }, /* to have an entry at all, in the simulator */
 #endif