[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 9b86c00f22f4c94bd8b2d57ab3c8fd44bba9b55c
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Nov 13 20:23:47 2008 +0100

    ogsmd: [TI CALYPSO] prepare for sending org.freesmartphone.GSM.CipherIndication

diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
index b832557..a79faf5 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/channel.py
@@ -173,6 +173,7 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         c.append( "%CPI=3" ) # call progress indication: enable with call number ID, GSM Cause, and ALS
         c.append( "%CSCN=1,2,1,2" ) # show service change: call control service and supplementary service
         c.append( "%CSQ=1" ) # signal strength: send unsol. code
+        c.append( "%CPRI=1" ) # gsm cipher indication: send unsol. code
         c.append( "%CNIV=1" )
         c.append( "%CGEREP=1" )
         c.append( "%CGREG=3" )
@@ -187,7 +188,6 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         else:
             c.append( "%SLEEP=4" ) # sleep mode: enable all
 
-        # FIXME might enable %CPRI later
         c = self._commands["sim"]
 
         c = self._commands["suspend"]
@@ -205,6 +205,7 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
 
         c.append( sms_no_cb )
         c.append( "%CSQ=0" )
+        c.append( "%CPRI=0" )
         c.append( "%CGEREP=0" )
         c.append( "%CGREG=0" )
         c.append( "%CBHZ=0" ) # home zone cell broadcast: disable
@@ -217,6 +218,7 @@ class UnsolicitedResponseChannel( CalypsoModemChannel ):
         c.append( "+CGEREP=2,1" )
         c += self._commands["sim"] # reenable notifications
         c.append( "%CSQ=1" ) # signal strength: send unsol. code
+        c.append( "%CPRI=1" ) # gsm cipher indication: send unsol. code
         c.append( "%CNIV=1" )
         c.append( "%CGEREP=1" )
         c.append( "%CGREG=3" )
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py b/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
index c7cef3d..294d0bf 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/unsolicited.py
@@ -7,7 +7,7 @@ The Open Device Daemon - Python Implementation
 GPLv2 or later
 """
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"
 
 from framework.config import config
 from ogsmd.modems.abstract.unsolicited import AbstractUnsolicitedResponseDelegate
@@ -222,6 +222,12 @@ class UnsolicitedResponseDelegate( AbstractUnsolicitedResponseDelegate ):
         if msgType in ( "01689" ):
             self._mediator.callHandler.statusChangeFromNetwork( int(callId), info )
 
+    # %CPRI: 1,2
+    def percentCPRI( self, righthandside ):
+        enabled, cipher = safesplit( righthandside, ',' )
+        logger.warning( "unhandled percentCPRI notice: %s" % righthandside )
+        # FIXME: self._object.EncryptionStatus ...
+
     # %CSSN: 1,0,A11502010802013B300D04010F0408AA510C0683C16423
     def percentCSSN( self, righthandside ):
         direction, transPart, ie = safesplit( righthandside, "," )

-- 
FSO frameworkd Debian packaging