[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone5.1

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 7d358eceb89bfe7e1ad5bbe87958c80149db4bdf
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Feb 19 15:22:19 2009 +0100

    ogsmd: [TI CALYPSO] use fso-abyss

diff --git a/framework/subsystems/ogsmd/modems/cinterion_mc75/modem.py b/framework/subsystems/ogsmd/modems/cinterion_mc75/modem.py
index f0516e3..b152a4c 100644
--- a/framework/subsystems/ogsmd/modems/cinterion_mc75/modem.py
+++ b/framework/subsystems/ogsmd/modems/cinterion_mc75/modem.py
@@ -10,7 +10,7 @@ Package: ogsmd.modems.cinterion_mc75
 Module: modem
 """
 
-__version__ = "0.0.0"
+__version__ = "0.1.0"
 MODULE_NAME = "ogsmd.modems.cinterion_mc75"
 
 import mediator
@@ -49,10 +49,9 @@ class CinterionMc75( AbstractModem ):
 
         Overridden for internal purposes.
         """
-        muxer = self._bus.get_object( "org.pyneo.muxer", "/org/pyneo/Muxer" )
-        return str( muxer.AllocChannel( name, dbus_interface="org.freesmartphone.GSM.MUX" ) )
+        muxer = self._bus.get_object( "org.freesmartphone.omuxerd", "/org/freesmartphone/GSM/Muxer" )
+        port, channel = muxer.AllocChannel( name, 0, dbus_interface="org.freesmartphone.GSM.MUX" )
+        return str( port )
 
     def dataPort( self ):
-        # FIXME remove duplication and just use pathfactory
-        muxer = self._bus.get_object( "org.pyneo.muxer", "/org/pyneo/Muxer" )
-        return muxer.AllocChannel( "ogsmd.gprs", dbus_interface="org.freesmartphone.GSM.MUX" )
+        return self.pathfactory( "ogsmd.gprs" )

-- 
FSO frameworkd Debian packaging