[maemo-commits] [maemo-commits] r19516 - in projects/haf/tags/ke-recv/3.19-13: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-11-24 13:11:26 +0200 (Tue, 24 Nov 2009)
New Revision: 19516

Modified:
   projects/haf/tags/ke-recv/3.19-13/debian/changelog
   projects/haf/tags/ke-recv/3.19-13/src/ke-recv.c
Log:
  * Remount cards in case we are in S_PERIPHERAL_WAIT and the cable is
    disconnected, because we could have a partially enabled mass storage mode.


Modified: projects/haf/tags/ke-recv/3.19-13/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-13/debian/changelog	2009-11-24 11:03:36 UTC (rev 19515)
+++ projects/haf/tags/ke-recv/3.19-13/debian/changelog	2009-11-24 11:11:26 UTC (rev 19516)
@@ -1,3 +1,10 @@
+ke-recv (3.19-13) unstable; urgency=low
+
+  * Remount cards in case we are in S_PERIPHERAL_WAIT and the cable is
+    disconnected, because we could have a partially enabled mass storage mode.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 24 Nov 2009 13:03:32 +0200
+
 ke-recv (3.19-12) unstable; urgency=low
 
   David Kedves:

Modified: projects/haf/tags/ke-recv/3.19-13/src/ke-recv.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-13/src/ke-recv.c	2009-11-24 11:03:36 UTC (rev 19515)
+++ projects/haf/tags/ke-recv/3.19-13/src/ke-recv.c	2009-11-24 11:11:26 UTC (rev 19516)
@@ -2911,6 +2911,15 @@
                         } else if (usb_state == S_PERIPHERAL_WAIT) {
                                 ULOG_INFO_F("E_CABLE_DETACHED in "
                                             "S_PERIPHERAL_WAIT");
+                                /* in case e_plugged_helper failed when we
+                                 * tried enabling mass storage, we need to
+                                 * remount the cards */
+                                usb_state = S_MASS_STORAGE;
+                                handle_event(E_DETACHED, &ext_mmc, NULL);
+                                if (int_mmc_enabled) {
+                                        handle_event(E_DETACHED, &int_mmc,
+                                                     NULL);
+                                }
                         } else if (usb_state == S_CHARGING) {
                                 ULOG_INFO_F("E_CABLE_DETACHED in "
                                             "S_CHARGING");