[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 33cb38aceda76118b13374bd2945dbfdd0b50d11
Merge: ac7d1b1df1b8ae149823d945daf5482dd8ff714a afa83bf037dcf207eac706c3dbd092f9aa67e9bf
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Nov 27 23:51:09 2008 +0100

    Merge commit 'origin/stabilization/milestone4'
    
    Conflicts:
    	framework/subsystems/ogsmd/helpers.py

diff --combined framework/subsystems/ogsmd/helpers.py
index 8a852c8,4cb3230..31a3e68
--- a/framework/subsystems/ogsmd/helpers.py
+++ b/framework/subsystems/ogsmd/helpers.py
@@@ -1,8 -1,6 +1,6 @@@
  #!/usr/bin/env python
  # -*- coding: iso-8859-15 -*-
  """
- The Open Device Daemon - Python Implementation
- 
  (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
  (C) 2008 Openmoko, Inc.
  GPLv2 or later
@@@ -12,24 -10,14 +10,26 @@@ Module: helper
  
  """
  
+ import os, signal
+ 
 +import logging
 +logger = logging.getLogger('ogsmd')
 +
 +#========================================================================#
 +def writeToFile( path, value ):
 +#========================================================================#
 +    logger.debug( "(writing '%s' to '%s')" % ( value, path ) )
 +    try:
 +        f = open( path, 'w' )
 +    except IOError, e:
 +        logger.warning( "(could not write to '%s': %s)" % ( path, e ) )
 +    else:
 +        f.write( "%s\n" % value )
 +
  #=========================================================================#
  def safesplit( string, delim, max=-1 ):
  #=========================================================================#
-     """A split function which is quote sign aware"""
 -    """
 -    A split function which is quote sign aware.
 -    """
++    """A split function which is quote sign aware."""
      items = string.split(delim)
      safeitems = []
      safeitem = ""
@@@ -46,7 -34,7 +46,7 @@@
  #=========================================================================#
  class BiDict( object ):
  #=========================================================================#
--    """A bidirectional dictionary"""
++    """A bidirectional dictionary."""
  
      AUTOINVERSE = False
  
@@@ -110,6 -98,23 +110,23 @@@
              return self._d.keys() + self._back.keys()
  
  #=========================================================================#
+ def processIterator():
+ #=========================================================================#
+     for entry in os.listdir( "/proc" ):
+         try:
+             pid = int( entry )
+         except ValueError:
+             continue
+         else:
+             name = open( "/proc/%s/cmdline" % pid ).read().split( '\0' )[0]
+             yield name, pid
+ 
+ #=========================================================================#
+ def killall( nameToKill ):
+ #=========================================================================#
+     [ os.kill( pid, signal.SIGTERM ) for name, pid in processIterator() if name == nameToKill ]
+ 
+ #=========================================================================#
  if __name__ == "__main__":
  #=========================================================================#
      d = BiDict( {"x":"y" } )
diff --combined framework/subsystems/ogsmd/modems/ti_calypso/modem.py
index 6207f0f,6cd9172..efbbc0f
--- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
@@@ -11,7 -11,7 +11,7 @@@ Module: mode
  
  """
  
- __version__ = "0.9.9.2"
+ __version__ = "0.9.9.3"
  
  import mediator
  
@@@ -22,9 -22,8 +22,9 @@@ from .unsolicited import UnsolicitedRes
  
  from ogsmd.gsm.decor import logged
  from ogsmd.gsm.channel import AtCommandChannel
 +from ogsmd.helpers import writeToFile
  
- import subprocess
+ from ogsmd.helpers import killall
  
  #=========================================================================#
  class TiCalypso( AbstractModem ):
@@@ -56,7 -55,7 +56,7 @@@
          AbstractModem.close( self )
          # FIXME ok this is a bit hefty. gsm0710muxd has open/close dbus calls,
          # but last time I checked they weren't working.
-         subprocess.call( "killall gsm0710muxd", shell=True )
+         killall( "gsm0710muxd" )
  
      def channel( self, category ):
          """
@@@ -112,18 -111,3 +112,18 @@@
                      'usepeerdns' ]
          else:
              return []
 +
 +    def prepareForSuspend( self, ok_callback, error_callback ):
 +        """overridden for internal purposes"""
 +
 +        # FIXME still no error handling here
 +
 +        def post_ok( ok_callback=ok_callback ):
 +            writeToFile( "/sys/devices/platform/neo1973-pm-gsm.0/flowcontrolled", "1" )
 +            ok_callback()
 +
 +        AbstractModem.prepareForSuspend( self, post_ok, error_callback )
 +
 +    def recoverFromSuspend( self, ok_callback, error_callback ):
 +        writeToFile( "/sys/devices/platform/neo1973-pm-gsm.0/flowcontrolled", "0" )
 +        AbstractModem.recoverFromSuspend( self, ok_callback, error_callback )

-- 
FSO frameworkd Debian packaging