[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 497d9feef7d7c64261bbea5299af47a5d9d0b9bd
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Nov 13 16:41:32 2008 +0100

    ogsmd: [TI CALYPSO] use callbacks for sending +CNMI and %CBHZ

diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
index 235a54b..b832557 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
@@ -188,10 +188,7 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
             c.append( "%SLEEP=4" ) # sleep mode: enable all
 
         # FIXME might enable %CPRI later
-
         c = self._commands["sim"]
-        # FIXME reenable if someone wants homezone support
-        #c.append( "%CBHZ=1" ) # home zone cell broadcast: activate automatic (send frequently, not just once)
 
         c = self._commands["suspend"]
         c.append( "+CTZU=0" )
@@ -199,10 +196,14 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         c.append( "+CREG=0" )
         c.append( "+CGREG=0" )
         c.append( "+CGEREP=0,0" )
-        if self._modem.data( "sim-buffers-sms" ):
-            c.append( "+CNMI=%s" % self._modem.data( "sms-buffered-nocb" ) )
-        else:
-            c.append( "+CNMI=%s" % self._modem.data( "sms-direct-nocb" ) )
+
+        def sms_no_cb( self=self ):
+            if self._modem.data( "sim-buffers-sms" ):
+                return "+CNMI=%s" % self._modem.data( "sms-buffered-nocb" )
+            else:
+                return "+CNMI=%s" % self._modem.data( "sms-direct-nocb" )
+
+        c.append( sms_no_cb )
         c.append( "%CSQ=0" )
         c.append( "%CGEREP=0" )
         c.append( "%CGREG=0" )
@@ -220,6 +221,11 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         c.append( "%CGEREP=1" )
         c.append( "%CGREG=3" )
 
+        def homezone( self=self ):
+            return "%CBHZ=1" if self._modem.data( "homezone-enabled", False ) else "%CBHZ=0"
+
+        c.append( homezone )
+
     def close( self ):
         if self.delegate.checkForRecamping:
             if not self.delegate.recampingTimeout is None:
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py b/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
index 0644d1e..c0ae20e 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/mediator.py
@@ -10,7 +10,7 @@ Package: ogsmd.modems.ti_calypso
 Module: mediator
 """
 
-__version__ = "0.9.9.0"
+__version__ = "0.9.9.1"
 
 from ogsmd.modems.abstract import mediator
 from ogsmd.gsm import error, const
@@ -56,7 +56,12 @@ class CbSetCellBroadcastSubscriptions( CbSetCellBroadcastSubscriptions ): # s
                     firstChannel = lastChannel = int( self.channels )
 
             logger.debug( "listening to cell broadcasts on channels %d - %d" % ( firstChannel, lastChannel ) )
-            self._commchannel.enqueue( "%CBHZ=1" if firstChannel <= 221 <= lastChannel else "%CBHZ=0" )
+            homezone = firstChannel <= 221 <= lastChannel
+            self._object.modem.setData( "homezone-enabled", homezone )
+            if homezone:
+                self._commchannel.enqueue( "%CBHZ=1" )
+            else:
+                self._commchannel.enqueue( "%CBHZ=0" )
             self._ok()
 
 #=========================================================================#

-- 
FSO frameworkd Debian packaging