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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-02-24 08:43:35 +0200 (Tue, 24 Feb 2009)
New Revision: 17497

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-disable.sh
   projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
   projects/haf/trunk/ke-recv/src/pcsuite-enable.sh
Log:
Patch from Yauheni to emit upstart signals for USB modules


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-02-23 14:42:04 UTC (rev 17496)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-02-24 06:43:35 UTC (rev 17497)
@@ -12,8 +12,11 @@
   * Disable D-Bus interface for memory card repairing.
   * Replace the memory card repair interface test with check interface test
     in ke-recv-test.
+  * Added emission of Upstart signals G_FILE_STORAGE_REMOVE, G_NOKIA_READY,
+    G_NOKIA_REMOVE and G_FILE_STORAGE_READY to USB module loading/unloading
+    shell scripts. Patch from Yauheni Kaliuta.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 13 Feb 2009 11:00:18 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 24 Feb 2009 08:25:34 +0200
 
 ke-recv (3.8-1) unstable; urgency=low
 

Modified: projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-disable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-disable.sh	2009-02-23 14:42:04 UTC (rev 17496)
+++ projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-disable.sh	2009-02-24 06:43:35 UTC (rev 17497)
@@ -30,6 +30,8 @@
   exit 0
 fi
 
+initctl emit G_FILE_STORAGE_REMOVE
+
 GADGETPATH='/sys/devices/platform/musb_hdrc/gadget'
 LUN0='gadget-lun0'
 LUN1='gadget-lun1'

Modified: projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2009-02-23 14:42:04 UTC (rev 17496)
+++ projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2009-02-24 06:43:35 UTC (rev 17497)
@@ -25,24 +25,8 @@
 if [ $? = 0 ]; then
     echo "$0: removing g_nokia"
 
-    PNATD_PID=`pidof pnatd`
-    if [ $? = 0 ]; then
-        kill $PNATD_PID
-    else
-        echo "$0: pnatd is not running"
-    fi
-    OBEXD_PID=`pidof obexd`
-    if [ $? = 0 ]; then
-        kill $OBEXD_PID
-    else
-        echo "$0: obexd is not running"
-    fi
-    SYNCD_PID=`pidof syncd`
-    if [ $? = 0 ]; then
-        kill $SYNCD_PID
-    else
-        echo "$0: syncd is not running"
-    fi
+    initctl emit G_NOKIA_REMOVE
+
     sleep 1
     /sbin/rmmod g_nokia
 fi
@@ -58,6 +42,8 @@
     exit 1
 fi
 
+initctl emit --no-wait G_FILE_STORAGE_READY
+
 if [ $# -gt 1 ]; then
     echo "$0: only one argument supported"
     exit 1

Modified: projects/haf/trunk/ke-recv/src/pcsuite-enable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/pcsuite-enable.sh	2009-02-23 14:42:04 UTC (rev 17496)
+++ projects/haf/trunk/ke-recv/src/pcsuite-enable.sh	2009-02-24 06:43:35 UTC (rev 17497)
@@ -22,6 +22,7 @@
 /sbin/lsmod | grep g_file_storage > /dev/null
 if [ $? = 0 ]; then
     echo "$0: removing g_file_storage"
+    initctl emit G_FILE_STORAGE_REMOVE
     /sbin/rmmod g_file_storage
 fi
 
@@ -39,21 +40,6 @@
     sleep 2
 fi
 
-# TODO: wait for the devices
+initctl emit --no-wait G_NOKIA_READY
 
-OBEXD_PID=`pidof obexd`
-if [ $? != 0 ]; then
-    echo "$0: obexd is not running"
-else
-    kill -USR1 $OBEXD_PID
-fi
-
-SYNCD_PID=`pidof syncd`
-if [ $? != 0 ]; then
-    echo "$0: failed to get syncd's PID"
-    exit 1
-fi
-
-kill -USR1 $SYNCD_PID
-
 exit 0