[maemo-commits] [maemo-commits] r19159 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-19 17:26:27 +0300 (Wed, 19 Aug 2009)
New Revision: 19159

Modified:
   projects/haf/trunk/ke-recv/debian/init.d
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
don't use startup script to insert g_nokia, but wait for the cable.


Modified: projects/haf/trunk/ke-recv/debian/init.d
===================================================================
--- projects/haf/trunk/ke-recv/debian/init.d	2009-08-19 12:51:53 UTC (rev 19158)
+++ projects/haf/trunk/ke-recv/debian/init.d	2009-08-19 14:26:27 UTC (rev 19159)
@@ -60,20 +60,6 @@
 	# Start daemons
 	echo -n "Starting $DESC: "
 
-        # check if this is TA image
-        if [ -x /usr/bin/sysinfo-tool ]; then
-                sysinfo-tool -g /device/sw-release-ver | grep -q _TA_
-                if [ $? = 0 ]; then
-                        export TA_IMAGE=1
-                fi
-        fi
-
-        STATE="x$(cat /tmp/STATE)x"
-        if [ $STATE != "xACT_DEADx" ]; then
-                # modprobe g_nokia by default, unless in ACT_DEAD
-                /usr/sbin/pcsuite-enable.sh
-        fi
-
 	if [ -x $DTOOL ]; then
         	$DTOOL -U $USER -n -1 -t $DAEMON
 	else

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-08-19 12:51:53 UTC (rev 19158)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-08-19 14:26:27 UTC (rev 19159)
@@ -1825,11 +1825,8 @@
         if (state == S_HOST) {
                 handle_usb_event(E_ENTER_HOST_MODE);
         } else if (state == S_PERIPHERAL_WAIT) {
-                if (getenv("TA_IMAGE"))
-                        /* in TA image, we don't wait for user's decision */
-                        handle_usb_event(E_ENTER_PCSUITE_MODE);
-                else
-                        handle_usb_event(E_ENTER_PERIPHERAL_WAIT_MODE);
+                /* go directly to PC Suite mode whenever cable is plugged */
+                handle_usb_event(E_ENTER_PCSUITE_MODE);
         } else if (state == S_CABLE_DETACHED) {
                 handle_usb_event(E_CABLE_DETACHED);
         }
@@ -3028,7 +3025,8 @@
                         break;
                 case E_ENTER_MASS_STORAGE_MODE:
                         if (usb_state == S_PERIPHERAL_WAIT ||
-                            usb_state == S_CHARGING) {
+                            usb_state == S_CHARGING ||
+                            usb_state == S_PCSUITE) {
                                 usb_state_t orig = usb_state;
                                 usb_state = S_MASS_STORAGE;
                                 if (!e_plugged_helper()) {
@@ -3045,7 +3043,8 @@
                 case E_ENTER_PCSUITE_MODE:
                         if (usb_state == S_PERIPHERAL_WAIT ||
                             usb_state == S_CHARGING ||
-                            usb_state == S_CABLE_DETACHED) {
+                            usb_state == S_CABLE_DETACHED ||
+                            usb_state == S_MASS_STORAGE) {
                                 usb_state = S_PCSUITE;
                                 if (!enable_pcsuite()) {
                                         ULOG_ERR_F("Couldn't enable PC Suite");
@@ -3056,12 +3055,14 @@
                         }
                         break;
                 case E_ENTER_CHARGING_MODE:
+#if 0
                         if (usb_state == S_PERIPHERAL_WAIT) {
                                 usb_state = S_CHARGING;
                         } else {
                                 ULOG_WARN_F("E_ENTER_CHARGING_MODE in %d!",
                                             usb_state);
                         }
+#endif
                         break;
                 default:
                         ULOG_ERR_F("unknown event %d", e);