[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:28 UTC 2009
The following commit has been merged in the master branch:
commit 87a53672b66b2f7f8cac392b8e558000f9fd6ba5
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Sat Nov 29 15:45:14 2008 +0100
ogsmd: cosmetics
diff --git a/framework/subsystems/ogsmd/device.py b/framework/subsystems/ogsmd/device.py
index ebdbc64..e07b119 100644
--- a/framework/subsystems/ogsmd/device.py
+++ b/framework/subsystems/ogsmd/device.py
@@ -14,6 +14,7 @@ MODULE_NAME = "ogsmd.device"
__version__ = "0.9.5"
from framework import resource
+from modems import allModems
import dbus
import dbus.service
@@ -69,6 +70,12 @@ class Device( resource.Resource ):
"""
Enable (inherited from Resource)
"""
+ if self.modemtype not in allModems():
+ estring = "Modem %s not in available modems: %s" % ( self.modemtype, allModems() )
+ logger.error( estring )
+ on_error( resource.ResourceError( estring ) )
+ return
+
if self.modemtype == "singleline":
from modems.singleline.modem import SingleLine as Modem
global mediator
@@ -94,8 +101,8 @@ class Device( resource.Resource ):
global mediator
import modems.option.mediator as mediator
else:
- logger.error( "Unsupported modem type %s", self.modemtype )
- return
+ assert False, "must never reach this"
+ sys.exit( -1 )
self.modem = Modem( self, self.bus )
self.modem.open( on_ok, on_error )
@@ -622,7 +629,7 @@ class Device( resource.Resource ):
def factory( prefix, controller ):
#=========================================================================#
sys.path.append( os.path.dirname( os.path.dirname( __file__ ) ) )
- modemtype = controller.config.get( "ogsmd", "modemtype" )
+ modemtype = controller.config.getValue( "ogsmd", "modemtype", "unspecified" )
device = Device( controller.bus, modemtype )
return [ device ]
diff --git a/framework/subsystems/ogsmd/modems/__init__.py b/framework/subsystems/ogsmd/modems/__init__.py
index f2a05a5..77c692b 100644
--- a/framework/subsystems/ogsmd/modems/__init__.py
+++ b/framework/subsystems/ogsmd/modems/__init__.py
@@ -1,4 +1,26 @@
-# FIXME compute this automatically
+#!/usr/bin/env python
+"""
+freesmartphone.org ogsmd - Python Implementation
-def allModems():
- return "singleline muxed4line freescale_neptune ti_calypso option".split()
+(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2008 Openmoko, Inc.
+GPLv2 or later
+
+Package: ogsmd.modems
+"""
+
+import os
+
+import logging
+logger = logging.getLogger( "ogsmd.modems" )
+
+modemmap = { \
+ "freescale_neptune": "FreescaleNeptune",
+ "muxed4line": "Muxed4Line",
+ "option": "Option",
+ "sierra": "Sierra",
+ "singleline": "SingleLine",
+ "ti_calypso": "TiCalypso",
+ }
+
+allModems = modemmap.keys
diff --git a/framework/subsystems/ogsmd/modems/abstract/modem.py b/framework/subsystems/ogsmd/modems/abstract/modem.py
index 9a2d7d7..85e134f 100644
--- a/framework/subsystems/ogsmd/modems/abstract/modem.py
+++ b/framework/subsystems/ogsmd/modems/abstract/modem.py
@@ -16,7 +16,6 @@ Module: modem
__version__ = "0.9.9.1"
MODULE_NAME = "ogsmd.modem.abstract"
-
from ogsmd.gsm.decor import logged
import gobject
diff --git a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
index 25f8acd..441a431 100644
--- a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
+++ b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
@@ -12,6 +12,7 @@ Freescale Neptune modem class
"""
__version__ = "0.1.0"
+MODULE_NAME = "ogsmd.modems.freescale_neptune"
import mediator
diff --git a/framework/subsystems/ogsmd/modems/muxed4line/mediator.py b/framework/subsystems/ogsmd/modems/muxed4line/mediator.py
index c13f5df..48e86e9 100644
--- a/framework/subsystems/ogsmd/modems/muxed4line/mediator.py
+++ b/framework/subsystems/ogsmd/modems/muxed4line/mediator.py
@@ -10,21 +10,7 @@ Package: ogsmd.modems.muxed4line
Module: mediator
"""
-from ogsmd.modems.abstract import mediator
-
-# Ok, now this is a bit of magic...:
-# We suck everything from the abstract mediator into this and overload on-demand.
-# Think inheritage on a module-base... :M:
-
-import types
-
-for key, val in mediator.__dict__.items():
- #print key, "=", type( val )
- if type( val ) == types.TypeType:
- execstring = "global %s; %s = mediator.%s" % ( key, key, key )
- #print execstring
- exec execstring
-del mediator
+from ogsmd.modems.abstract.mediator import *
# add overrides here
diff --git a/framework/subsystems/ogsmd/modems/muxed4line/modem.py b/framework/subsystems/ogsmd/modems/muxed4line/modem.py
index f4688d8..b53c356 100644
--- a/framework/subsystems/ogsmd/modems/muxed4line/modem.py
+++ b/framework/subsystems/ogsmd/modems/muxed4line/modem.py
@@ -10,6 +10,9 @@ Package: ogsmd.modems.muxed4line
Module: modem
"""
+__version__ = "1.0.0"
+MODULE_NAME = "ogsmd.modems.muxed4line"
+
import mediator
from ogsmd.modems.abstract.modem import AbstractModem
diff --git a/framework/subsystems/ogsmd/modems/option/mediator.py b/framework/subsystems/ogsmd/modems/option/mediator.py
index 0de6ec2..dc7844a 100644
--- a/framework/subsystems/ogsmd/modems/option/mediator.py
+++ b/framework/subsystems/ogsmd/modems/option/mediator.py
@@ -10,21 +10,7 @@ Package: ogsmd.modems.option
Module: mediator
"""
-from ogsmd.modems.abstract import mediator
-
-# Ok, now this is a bit of magic...:
-# We suck everything from the abstract mediator into this and overload on-demand.
-# Think inheritage on a module-base... :M:
-
-import types
-
-for key, val in mediator.__dict__.items():
- #print key, "=", type( val )
- if type( val ) == types.TypeType:
- execstring = "global %s; %s = mediator.%s" % ( key, key, key )
- #print execstring
- exec execstring
-del mediator
+from ogsmd.modems.abstract.mediator import *
# add overrides here
diff --git a/framework/subsystems/ogsmd/modems/option/modem.py b/framework/subsystems/ogsmd/modems/option/modem.py
index 3c5af86..5edc0f0 100644
--- a/framework/subsystems/ogsmd/modems/option/modem.py
+++ b/framework/subsystems/ogsmd/modems/option/modem.py
@@ -7,10 +7,13 @@ The Open Device Daemon - Python Implementation
(C) 2008 Openmoko, Inc.
GPLv2 or later
-Package: ogsmd.modems.sierra
+Package: ogsmd.modems.option
Module: modem
"""
+__version__ = "0.1.0"
+MODULE_NAME = "ogsmd.modems.option"
+
import mediator
from ..abstract.modem import AbstractModem
@@ -69,4 +72,3 @@ class Option( AbstractModem ):
else:
return []
-
diff --git a/framework/subsystems/ogsmd/modems/sierra/mediator.py b/framework/subsystems/ogsmd/modems/sierra/mediator.py
index d19b5c3..d9b386a 100644
--- a/framework/subsystems/ogsmd/modems/sierra/mediator.py
+++ b/framework/subsystems/ogsmd/modems/sierra/mediator.py
@@ -10,21 +10,7 @@ Package: ogsmd.modems.sierra
Module: mediator
"""
-from ogsmd.modems.abstract import mediator
-
-# Ok, now this is a bit of magic...:
-# We suck everything from the abstract mediator into this and overload on-demand.
-# Think inheritage on a module-base... :M:
-
-import types
-
-for key, val in mediator.__dict__.items():
- #print key, "=", type( val )
- if type( val ) == types.TypeType:
- execstring = "global %s; %s = mediator.%s" % ( key, key, key )
- #print execstring
- exec execstring
-del mediator
+from ogsmd.modems.abstract.mediator import *
# add overrides here
diff --git a/framework/subsystems/ogsmd/modems/sierra/modem.py b/framework/subsystems/ogsmd/modems/sierra/modem.py
index c4fb4c4..74caf1a 100644
--- a/framework/subsystems/ogsmd/modems/sierra/modem.py
+++ b/framework/subsystems/ogsmd/modems/sierra/modem.py
@@ -3,13 +3,15 @@
The Open Device Daemon - Python Implementation
(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-(C) 2008 Openmoko, Inc.
GPLv2 or later
Package: ogsmd.modems.sierra
Module: modem
"""
+__version__ = "0.1.0"
+MODULE_NAME = "ogsmd.modems.sierra"
+
import mediator
from ..abstract.modem import AbstractModem
diff --git a/framework/subsystems/ogsmd/modems/singleline/mediator.py b/framework/subsystems/ogsmd/modems/singleline/mediator.py
index 124311a..3f0751e 100644
--- a/framework/subsystems/ogsmd/modems/singleline/mediator.py
+++ b/framework/subsystems/ogsmd/modems/singleline/mediator.py
@@ -10,21 +10,7 @@ Package: ogsmd.modems.singleline
Module: mediator
"""
-from ogsmd.modems.abstract import mediator
-
-# Ok, now this is a bit of magic...:
-# We suck everything from the abstract mediator into this and overload on-demand.
-# Think inheritage on a module-base... :M:
-
-import types
-
-for key, val in mediator.__dict__.items():
- #print key, "=", type( val )
- if type( val ) == types.TypeType:
- execstring = "global %s; %s = mediator.%s" % ( key, key, key )
- #print execstring
- exec execstring
-del mediator
+from ogsmd.modems.abstract.mediator import *
# add overrides here
diff --git a/framework/subsystems/ogsmd/modems/singleline/modem.py b/framework/subsystems/ogsmd/modems/singleline/modem.py
index 7e5a10f..cbcbe30 100644
--- a/framework/subsystems/ogsmd/modems/singleline/modem.py
+++ b/framework/subsystems/ogsmd/modems/singleline/modem.py
@@ -10,6 +10,9 @@ Package: ogsmd.modems.singleline
Module: modem
"""
+__version__ = "1.0.0"
+MODULE_NAME = "singleline"
+
import mediator
from ..abstract.modem import AbstractModem
diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
index efbbc0f..369d0ee 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
@@ -6,12 +6,13 @@ The Open Device Daemon - Python Implementation
(C) 2008 Openmoko, Inc.
GPLv2 or later
-Package: ogsmd.modems.muxed4line
+Package: ogsmd.modems.ti_calypso
Module: modem
"""
__version__ = "0.9.9.3"
+MODULE_NAME = "ogsmd.modems.ti_calypso"
import mediator
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list