[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 2965b931f4693323fea4b2f6aaf7ad15025e8b30
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Dec 19 10:39:02 2008 +0100

    ousaged: Check resume reason and launch emergency shutdown, if we
    woke up due to low battery. NOTE: This is only supported on Openmoko
    devices now. As there is no standard infrastructure for that in the
    kernel, we have to deal with device-specific solutions in lowlevel.py

diff --git a/ChangeLog b/ChangeLog
index c505736..43332fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-18	Michael Lauer	<mickey at openmoko.org>
+
+	* [ousaged] Check resume reason and launch emergency shutdown, if we
+	  woke up due to low battery. NOTE: This is only supported on Openmoko
+	  devices now. As there is no standard infrastructure for that in the
+	  kernel, we have to deal with device-specific solutions in lowlevel.py
+
 2008-12-17	Jan Luebbe      <jluebbe at debian.org>
 
 	* [otimed] Add simple timesync to NTP and GPS
diff --git a/framework/subsystems/ogsmd/modems/abstract/calling.py b/framework/subsystems/ogsmd/modems/abstract/calling.py
index 9781fb4..ce81fb7 100644
--- a/framework/subsystems/ogsmd/modems/abstract/calling.py
+++ b/framework/subsystems/ogsmd/modems/abstract/calling.py
@@ -12,7 +12,7 @@ Module: calling
 New style abstract call handling
 """
 
-__version__ = "0.9.1.0"
+__version__ = "0.9.1.2"
 MODULE_NAME = "ogsmd.callhandler"
 
 from ogsmd.gsm import error, const
@@ -199,7 +199,8 @@ class CallHandler( object ):
 
     def state_outgoing_release( self, action, *args, **kwargs ):
         if action == "release" and kwargs["index"] == 1:
-            kwargs["channel"].cancelCurrentCommand()
+            command = self._object.modem.data( "cancel-outgoing-call" )
+            kwargs["channel"].enqueue( command )
             return True
 
     def state_active_release( self, action, *args, **kwargs ):
diff --git a/framework/subsystems/ogsmd/modems/abstract/modem.py b/framework/subsystems/ogsmd/modems/abstract/modem.py
index 420669e..cf6116b 100644
--- a/framework/subsystems/ogsmd/modems/abstract/modem.py
+++ b/framework/subsystems/ogsmd/modems/abstract/modem.py
@@ -13,11 +13,9 @@ Module: modem
 
 # FIXME: The modem should really be a sigleton
 
-__version__ = "0.9.9.1"
+__version__ = "0.9.9.2"
 MODULE_NAME = "ogsmd.modem.abstract"
 
-from ogsmd.gsm.decor import logged
-
 import gobject
 
 import logging
@@ -31,7 +29,6 @@ class AbstractModem( object ):
     """This class abstracts a GSM Modem."""
     instance = None
 
-    @logged
     def __init__( self, dbus_object, bus, *args, **kwargs ):
         """
         Initialize
@@ -65,6 +62,8 @@ class AbstractModem( object ):
             "RING":         04,
             }
 
+        self._data["cancel-outgoing-call"] = "H" # default will kill all connections
+
     def open( self, on_ok, on_error ):
         """
         Triggers opening the channels on this modem.
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
index 486dc11..25eb9b7 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
@@ -11,7 +11,7 @@ Module: modem
 
 """
 
-__version__ = "0.9.9.4"
+__version__ = "0.9.9.5"
 MODULE_NAME = "ogsmd.modems.ti_calypso"
 
 SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/neo1973-pm-gsm.0/flowcontrolled"
@@ -23,7 +23,6 @@ from ogsmd.modems.abstract.modem import AbstractModem
 from .channel import CallChannel, UnsolicitedResponseChannel, MiscChannel
 from .unsolicited import UnsolicitedResponseDelegate
 
-from ogsmd.gsm.decor import logged
 from ogsmd.gsm.channel import AtCommandChannel
 from ogsmd.helpers import writeToFile
 
@@ -33,7 +32,6 @@ from ogsmd.helpers import killall
 class TiCalypso( AbstractModem ):
 #=========================================================================#
 
-    @logged
     def __init__( self, *args, **kwargs ):
         AbstractModem.__init__( self, *args, **kwargs )
 
@@ -49,6 +47,9 @@ class TiCalypso( AbstractModem ):
         # configure channels
         self._channels["UNSOL"].setDelegate( UnsolicitedResponseDelegate( self._object, mediator ) )
 
+        # configure behaviour using special commands
+        self._data["cancel-outgoing-call"] = "%CHLD=I"
+
     def close( self ): # SYNC
         """
         Close modem.

-- 
FSO frameworkd Debian packaging