[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Stefan Schmidt]

The following commit has been merged in the master branch:
commit b0056eadb12efdf5702e63fa0df6f1e7bd425d08
Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Sun Dec 7 04:15:32 2008 +0100

    ogsmd: [ericsson_F3507g] Add skeleton driver
    
    * Modem used on a MiniPCIe card
    * Featuring HSPA and GPS

diff --git a/framework/patterns/__init__.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/__init__.py
similarity index 100%
copy from framework/patterns/__init__.py
copy to framework/subsystems/ogsmd/modems/ericsson_F3507g/__init__.py
diff --git a/framework/subsystems/ogsmd/modems/sierra/channel.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/channel.py
similarity index 93%
copy from framework/subsystems/ogsmd/modems/sierra/channel.py
copy to framework/subsystems/ogsmd/modems/ericsson_F3507g/channel.py
index 4ca40a7..37ba370 100644
--- a/framework/subsystems/ogsmd/modems/sierra/channel.py
+++ b/framework/subsystems/ogsmd/modems/ericsson_F3507g/channel.py
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 """
-The Open Device Daemon - Python Implementation
+The Open GSM Daemon - Python Implementation
 
-(C) 2007-2008 M. Dietrich
 (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 (C) 2008 Openmoko, Inc.
 GPLv2 or later
 
-Package: ogsmd.modems.sierra
+Package: ogsmd.modems.ericsson_F3507g
 Module: channel
 """
 
@@ -15,7 +14,7 @@ from ogsmd.gsm.decor import logged
 from ogsmd.modems.abstract.channel import AbstractModemChannel
 
 #=========================================================================#
-class SierraChannel( AbstractModemChannel ):
+class EricssonChannel( AbstractModemChannel ):
 #=========================================================================#
 
     def _populateCommands( self ):
diff --git a/framework/subsystems/ogsmd/modems/option/mediator.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/mediator.py
similarity index 73%
copy from framework/subsystems/ogsmd/modems/option/mediator.py
copy to framework/subsystems/ogsmd/modems/ericsson_F3507g/mediator.py
index dc7844a..cf4d308 100644
--- a/framework/subsystems/ogsmd/modems/option/mediator.py
+++ b/framework/subsystems/ogsmd/modems/ericsson_F3507g/mediator.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 """
-The Open Device Daemon - Python Implementation
+The GSM Daemon - Python Implementation
 
 (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 (C) 2008 Openmoko, Inc.
 GPLv2 or later
 
-Package: ogsmd.modems.option
+Package: ogsmd.modems.ericsson_F3507g
 Module: mediator
 """
 
diff --git a/framework/subsystems/ogsmd/modems/sierra/modem.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
similarity index 78%
copy from framework/subsystems/ogsmd/modems/sierra/modem.py
copy to framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
index 74caf1a..6cca528 100644
--- a/framework/subsystems/ogsmd/modems/sierra/modem.py
+++ b/framework/subsystems/ogsmd/modems/ericsson_F3507g/modem.py
@@ -1,22 +1,22 @@
 #!/usr/bin/env python
 """
-The Open Device Daemon - Python Implementation
+The Open GSM Daemon - Python Implementation
 
 (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 GPLv2 or later
 
-Package: ogsmd.modems.sierra
+Package: ogsmd.modems.ericsson_F3507g
 Module: modem
 """
 
 __version__ = "0.1.0"
-MODULE_NAME = "ogsmd.modems.sierra"
+MODULE_NAME = "ogsmd.modems.ericsson_F3507g"
 
 import mediator
 
 from ..abstract.modem import AbstractModem
 
-from .channel import SierraChannel
+from .channel import EricssonChannel
 from .unsolicited import UnsolicitedResponseDelegate
 
 from ogsmd.gsm.decor import logged
@@ -31,7 +31,7 @@ class Sierra( AbstractModem ):
         AbstractModem.__init__( self, *args, **kwargs )
 
         # The one and only serial line
-        self._channels["SINGLE"] = SierraChannel( self.pathfactory, "/dev/ttyUSB0", modem=self )
+        self._channels["SINGLE"] = EricssonChannel( self.pathfactory, "/dev/ttyACM0", modem=self )
         # configure channels
         self._channels["SINGLE"].setDelegate( UnsolicitedResponseDelegate( self._object, mediator ) )
 
diff --git a/framework/subsystems/ogsmd/modems/sierra/unsolicited.py b/framework/subsystems/ogsmd/modems/ericsson_F3507g/unsolicited.py
similarity index 80%
copy from framework/subsystems/ogsmd/modems/sierra/unsolicited.py
copy to framework/subsystems/ogsmd/modems/ericsson_F3507g/unsolicited.py
index c92b613..ee20160 100644
--- a/framework/subsystems/ogsmd/modems/sierra/unsolicited.py
+++ b/framework/subsystems/ogsmd/modems/ericsson_F3507g/unsolicited.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 """
-The Open Device Daemon - Python Implementation
+The GSM Daemon - Python Implementation
 
 (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 (C) 2008 Openmoko, Inc.
 GPLv2 or later
 
-Package: ogsmd.modems.sierra
+Package: ogsmd.modems.ericsson_F3507g
 Module: unsolicited
 """
 

-- 
FSO frameworkd Debian packaging