Gigabeat S: Implement charging and power control to charge from AC or USB. Hold MENU while plugging USB cable to charge from USB without connecting. Under Windows, plugging USB for charging only but not connecting still needs to be properly handled (driver popup issue) but it will charge when connected normally-- no issue under Linux. Some accomodating changes made to powermgmt.c will soon be made nicer.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19547 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 13 insertions, 12 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
index e6238112d1..fc9ad719a6 100644
--- a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
@@ -28,6 +28,7 @@
 #include "button-target.h"
 #include "usb-target.h"
 #include "power-imx31.h"
+#include "powermgmt-target.h"
 
 /* Gigabeat S definitions for static MC13783 event registration */
 
@@ -45,26 +46,26 @@ static const struct mc13783_event mc13783_events[] =
         .mask = MC13783_ONOFD1M,
         .callback = button_power_event,
     },
-#ifdef HAVE_HEADPHONE_DETECTION
-    [MC13783_ONOFD2_EVENT] = /* Headphone jack */
-    {
-        .set  = MC13783_EVENT_SET1,
-        .mask = MC13783_ONOFD2M,
-        .callback = headphone_detect_event,
-    },
-#endif
-    [MC13783_CHGDET_EVENT] = /* Charger detection */
+    [MC13783_SE1_EVENT] = /* Main charger detection */
     {
         .set  = MC13783_EVENT_SET0,
-        .mask = MC13783_CHGDETM,
-        .callback = charger_detect_event,
+        .mask = MC13783_SE1M,
+        .callback = charger_main_detect_event,
     },
-    [MC13783_USB4V4_EVENT] = /* USB insertion */
+    [MC13783_USB_EVENT] = /* USB insertion/USB charger detection */
     {
         .set  = MC13783_EVENT_SET0,
         .mask = MC13783_USBM,
         .callback = usb_connect_event,
     },
+#ifdef HAVE_HEADPHONE_DETECTION
+    [MC13783_ONOFD2_EVENT] = /* Headphone jack */
+    {
+        .set  = MC13783_EVENT_SET1,
+        .mask = MC13783_ONOFD2M,
+        .callback = headphone_detect_event,
+    },
+#endif
 };
 
 const struct mc13783_event_list mc13783_event_list =