[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 1a4abcb52a4482b54fef792be02ac5d79bc5df05
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Dec 20 16:16:44 2008 +0100

    ogsmd: [ABSTRACT] strip " in response to +CPIN since some modems return this as a string

diff --git a/framework/subsystems/ogsmd/gsm/channel.py b/framework/subsystems/ogsmd/gsm/channel.py
index df898b5..e2f28cf 100644
--- a/framework/subsystems/ogsmd/gsm/channel.py
+++ b/framework/subsystems/ogsmd/gsm/channel.py
@@ -14,7 +14,8 @@ This module provides communication channel abstractions that
 transport their data over a (virtual) serial line.
 """
 
-__version__ = "0.9.9.2"
+__version__ = "0.9.9.3"
+MODULE_NAME = "ogsmd.channel"
 
 from ogsmd.gsm.decor import logged
 import parser
@@ -25,7 +26,7 @@ import serial # pyserial
 import Queue, fcntl, os, time, types # stdlib
 
 import logging
-logger = logging.getLogger( "ogsmd" )
+logger = logging.getLogger( MODULE_NAME )
 
 #=========================================================================#
 class PeekholeQueue( Queue.Queue ):
diff --git a/framework/subsystems/ogsmd/modems/abstract/channel.py b/framework/subsystems/ogsmd/modems/abstract/channel.py
index 4de46e3..28a89e2 100644
--- a/framework/subsystems/ogsmd/modems/abstract/channel.py
+++ b/framework/subsystems/ogsmd/modems/abstract/channel.py
@@ -11,13 +11,15 @@ Package: ogsmd.modems.abstract
 Module: channel
 """
 
+__version__ = "0.9.0"
+MODULE_NAME = "ogsmd.modems.abstract.channel"
+
 from ogsmd.gsm.decor import logged
 from ogsmd.gsm.channel import AtCommandChannel
 import gobject
 
 import logging
-logger = logging.getLogger( 'ogsmd' )
-
+logger = logging.getLogger( MODULE_NAME )
 
 #=========================================================================#
 class AbstractModemChannel( AtCommandChannel ):
@@ -45,8 +47,13 @@ class AbstractModemChannel( AtCommandChannel ):
     def modemStateSimUnlocked( self ):
         """
         Called, when the modem signalizes the SIM being unlocked.
+
+        Override this in your concrete class to issue sending
+        org.freesmartphone.GSM.SIM.ReadyStatus( true ) eventually.
         """
 
+        # FIXME we might want to make this a 'pure virtual' method
+
         # don't hammer modem too early with the additional commands
         # FIXME it's actually modem specific whether we can send the command directly
         # after +CPIN: READY or not, so we should not have this here
diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 52476b9..1c22f39 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -21,7 +21,7 @@ TODO:
  * refactor parameter validation
 """
 
-__version__ = "0.9.11.0"
+__version__ = "0.9.11.1"
 MODULE_NAME = "ogsmd.modems.abstract.mediator"
 
 from ogsmd.gsm import error, const, convert
@@ -313,7 +313,7 @@ class DeviceSetAntennaPower( DeviceMediator ):
         if not response[-1] == "OK":
             pin_state = "UNKNOWN"
         else:
-            pin_state = self._rightHandSide( response[0] )
+            pin_state = self._rightHandSide( response[0] ).strip( '"' ) # some modems include "
             if pin_state != self._object.modem._simPinState:
                 self._object.AuthStatus( pin_state )
 
@@ -333,7 +333,7 @@ class DeviceSetAntennaPower( DeviceMediator ):
             # unknown PIN state
             pin_state = "UNKNOWN"
         else:
-            pin_state = self._rightHandSide( response[0] )
+            pin_state = self._rightHandSide( response[0] ).strip( '"' ) # some modems include "
             if pin_state != self._object.modem._simPinState:
                 self._object.AuthStatus( pin_state )
 

-- 
FSO frameworkd Debian packaging