[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82
Michael 'Mickey' Lauer
mickey at vanille-media.de
Mon Feb 2 18:51:47 UTC 2009
The following commit has been merged in the master branch:
commit 82c7c6a4d3749973bec306d56e6a3ce782193fb3
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Sat Dec 27 14:32:29 2008 +0100
ogmsd: Refactor Modem.dataOptions() into "pppd-configuration" attribute in modem data storage.
diff --git a/ChangeLog b/ChangeLog
index f0fe525..5b27334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-27 Michael Lauer <mickey at openmoko.org>
+
+ * [ogsmd] Refactored Modem.dataOptions() into "pppd-configuration" attribute in modem data storage.
+
2008-12-24 Daniel Willmann <daniel at totalueberwachung.de>
* [ogsmd] Added network access type to Provider Info (WARNING, breaks API!)
diff --git a/framework/subsystems/ogsmd/modems/abstract/modem.py b/framework/subsystems/ogsmd/modems/abstract/modem.py
index 075fc6d..365dda5 100644
--- a/framework/subsystems/ogsmd/modems/abstract/modem.py
+++ b/framework/subsystems/ogsmd/modems/abstract/modem.py
@@ -17,7 +17,7 @@ __version__ = "0.9.9.2"
MODULE_NAME = "ogsmd.modem.abstract"
import gobject
-import types
+import sys, types
import logging
logger = logging.getLogger( MODULE_NAME )
@@ -53,6 +53,31 @@ class AbstractModem( object ):
self._data["sms-direct-cb"] = "2,2,2,1,1" # what about a,3,c,d,e?
self._data["sms-direct-nocb"] = "2,2,0,0,0" # dito
+ self._data["pppd-configuration"] = [ \
+ '115200',
+ 'nodetach',
+ 'crtscts',
+ 'defaultroute',
+ 'debug',
+ 'hide-password',
+ 'holdoff', '3',
+ 'ipcp-accept-local',
+ 'ktune',
+ #'lcp-echo-failure', '10',
+ #'lcp-echo-interval', '20',
+ 'ipcp-max-configure', '4',
+ 'lock',
+ 'noauth',
+ #'demand',
+ 'noipdefault',
+ 'novj',
+ 'novjccomp',
+ #'persist',
+ 'proxyarp',
+ 'replacedefaultroute',
+ 'usepeerdns',
+ ]
+
self._timeouts = { \
"SIMAUTH": 15,
"SIMACCESS": 10,
@@ -131,7 +156,7 @@ class AbstractModem( object ):
"""
Returns the communication channel for certain command category.
"""
- assert False, "pure virtual method called"
+ sys.exit( -1 ) # pure virtual method called
def channels( self ):
"""
diff --git a/framework/subsystems/ogsmd/modems/abstract/pdp.py b/framework/subsystems/ogsmd/modems/abstract/pdp.py
index cccd07e..b19b7bc 100644
--- a/framework/subsystems/ogsmd/modems/abstract/pdp.py
+++ b/framework/subsystems/ogsmd/modems/abstract/pdp.py
@@ -13,7 +13,7 @@ Module: pdp
"""
-__version__ = "0.2.0"
+__version__ = "0.2.1"
from .mediator import AbstractMediator
from .overlay import OverlayFile
@@ -50,7 +50,7 @@ class Pdp( AbstractMediator ):
self.ppp = None
self.overlays = []
- #KObjectDispatcher.addMatch( "*", "/devices/virtual/net", self._onInterfaceChange )
+ KObjectDispatcher.addMatch( "*", "/class/net", self._onInterfaceChange )
def _onInterfaceChange( action, path, **kwargs ):
logger.debug( "detected interface change", action, path )
@@ -65,7 +65,7 @@ class Pdp( AbstractMediator ):
apn, user, password = str(apn), str(user), str(password)
# merge with modem specific options
- self.ppp_options = self.__class__.PPP_OPTIONS_GENERAL + self._object.modem.dataOptions( "ppp" )
+ self.ppp_options = self.__class__.PPP_OPTIONS_GENERAL + self._object.modem.data( "pppd-configuration" )
# merge with user and password settings
if user:
diff --git a/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
index e8041a1..f57c1dc 100644
--- a/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
+++ b/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
@@ -44,6 +44,29 @@ class EricssonF3507g( AbstractModem ):
# configure channel
self._channels["SINGLE"].setDelegate( UnsolicitedResponseDelegate( self._object, mediator ) )
+ self._data["pppd-configuration"] = [ \
+ "115200",
+ "nodetach",
+ "crtscts",
+ "noipdefault",
+ ":10.0.0.1",
+ "local",
+ 'defaultroute',
+ 'debug',
+ 'hide-password',
+ 'ipcp-accept-local',
+ #"lcp-echo-failure", "10",
+ #"lcp-echo-interval", "3",
+ "noauth",
+ #"demand",
+ "noipdefault",
+ "novj",
+ "novjccomp",
+ "persist",
+ ]
+
+
+
def open( self, on_ok, on_error ):
"""
Power on modem
@@ -69,28 +92,3 @@ class EricssonF3507g( AbstractModem ):
def dataPort( self ):
# FIXME remove duplication and just use pathfactory
return "/dev/ttyACM1"
-
- def dataOptions( self, category ):
- if category == "ppp":
- return [
- '115200',
- 'nodetach',
- 'crtscts',
- "noipdefault",
- ":10.0.0.1",
- "local",
- 'defaultroute',
- 'debug',
- 'hide-password',
- 'ipcp-accept-local',
- 'lcp-echo-failure', '10',
- 'lcp-echo-interval', '3',
- 'noauth',
- #'demand',
- 'noipdefault',
- 'novj',
- 'novjccomp',
- 'persist',
- ]
- else:
- return []
diff --git a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
index cc74484..6fce2ec 100644
--- a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
+++ b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
@@ -92,31 +92,3 @@ class FreescaleNeptune( AbstractModem ):
def pathfactory( self, name ):
return name
-
- def dataOptions( self, category ):
- if category == "ppp":
- return [
- '115200',
- 'nodetach',
- 'crtscts',
- 'defaultroute',
- 'debug',
- 'hide-password',
- 'holdoff', '3',
- 'ipcp-accept-local',
- 'ktune',
- 'lcp-echo-failure', '8',
- 'lcp-echo-interval', '3',
- 'ipcp-max-configure', '32',
- 'lock',
- 'noauth',
- #'demand',
- 'noipdefault',
- 'novj',
- 'novjccomp',
- #'persist',
- 'proxyarp',
- 'replacedefaultroute',
- 'usepeerdns' ]
- else:
- return []
diff --git a/framework/subsystems/ogsmd/modems/option/modem.py b/framework/subsystems/ogsmd/modems/option/modem.py
index 4d6ba53..614aefd 100644
--- a/framework/subsystems/ogsmd/modems/option/modem.py
+++ b/framework/subsystems/ogsmd/modems/option/modem.py
@@ -37,6 +37,26 @@ class Option( AbstractModem ):
# configure channels
self._channels["UNSOL"].setDelegate( UnsolicitedResponseDelegate( self._object, mediator ) )
+ self._data["pppd-configuration"] = [ \
+ "115200",
+ "nodetach",
+ "crtscts",
+ "noipdefault",
+ ":10.0.0.1",
+ "local",
+ 'defaultroute',
+ 'debug',
+ 'hide-password',
+ 'ipcp-accept-local',
+ #"lcp-echo-failure", "10",
+ #"lcp-echo-interval", "3",
+ "noauth",
+ #"demand",
+ "noipdefault",
+ "novj",
+ "novjccomp",
+ "persist" ]
+
def channel( self, category ):
return self._channels["UNSOL"]
@@ -46,29 +66,3 @@ class Option( AbstractModem ):
def dataPort( self ):
# FIXME remove duplication and just use pathfactory
return "/dev/ttyUSB0"
-
- def dataOptions( self, category ):
- if category == "ppp":
- return [
- '115200',
- 'nodetach',
- 'crtscts',
- "noipdefault",
- ":10.0.0.1",
- "local",
- 'defaultroute',
- 'debug',
- 'hide-password',
- 'ipcp-accept-local',
- 'lcp-echo-failure', '10',
- 'lcp-echo-interval', '3',
- 'noauth',
- #'demand',
- 'noipdefault',
- 'novj',
- 'novjccomp',
- 'persist',
- ]
- else:
- return []
-
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
index 25eb9b7..45f9bfd 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
@@ -11,7 +11,7 @@ Module: modem
"""
-__version__ = "0.9.9.5"
+__version__ = "0.9.9.6"
MODULE_NAME = "ogsmd.modems.ti_calypso"
SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/neo1973-pm-gsm.0/flowcontrolled"
@@ -89,34 +89,6 @@ class TiCalypso( AbstractModem ):
muxer = self._bus.get_object( "org.pyneo.muxer", "/org/pyneo/Muxer" )
return muxer.AllocChannel( "ogsmd.gprs", dbus_interface="org.freesmartphone.GSM.MUX" )
- def dataOptions( self, category ):
- if category == "ppp":
- return [
- '115200',
- 'nodetach',
- 'crtscts',
- 'defaultroute',
- 'debug',
- 'hide-password',
- 'holdoff', '3',
- 'ipcp-accept-local',
- 'ktune',
- #'lcp-echo-failure', '10',
- #'lcp-echo-interval', '20',
- 'ipcp-max-configure', '4',
- 'lock',
- 'noauth',
- #'demand',
- 'noipdefault',
- 'novj',
- 'novjccomp',
- #'persist',
- 'proxyarp',
- 'replacedefaultroute',
- 'usepeerdns' ]
- else:
- return []
-
def prepareForSuspend( self, ok_callback, error_callback ):
"""overridden for internal purposes"""
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list