[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Felix Huber]

The following commit has been merged in the debian branch:
commit 8c115dfb94405885d37a41d7e3042171a63b5a81
Author: Felix Huber <felix.huber at schyf.de>
Date:   Sun Sep 12 11:34:58 2010 +0200

    ogsmd ti_calypso: automatic adjust sysfs node to kernel version

diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
index bc48052..52e105f 100644
--- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
@@ -15,9 +15,9 @@ __version__ = "0.9.9.10"
 MODULE_NAME = "ogsmd.modems.ti_calypso"
 
 DEVICE_CALYPSO_PATH             = "/dev/ttySAC0"
-SYSFS_CALYPSO_POWER_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/power_on"
-SYSFS_CALYPSO_RESET_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/reset"
-SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/gta02-pm-gsm.0/flowcontrolled"
+SYSFS_CALYPSO_POWER_PATH        = "/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on"
+SYSFS_CALYPSO_RESET_PATH        = "/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
+SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/neo1973-pm-gsm.0/flowcontrolled"
 
 import mediator
 
@@ -41,11 +41,21 @@ import serial
 import logging
 logger = logging.getLogger( MODULE_NAME )
 
+import os
+
 #=========================================================================#
 class TiCalypso( AbstractModem ):
 #=========================================================================#
 
     def __init__( self, *args, **kwargs ):
+        # kernel specific paths                                                                                  
+        kernel_release = os.uname()[2]                                                                           
+        if kernel_release >= "2.6.32":                                                                           
+           SYSFS_CALYPSO_POWER_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/power_on"                 
+           SYSFS_CALYPSO_RESET_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/reset"                    
+           SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/gta02-pm-gsm.0/flowcontrolled"           
+           logger.info( "Kernel >=2.6.32, gsm sysfs path updated" ) 
+
         AbstractModem.__init__( self, *args, **kwargs )
 
         self._channelmap = { "ogsmd.call":1, "ogsmd.unsolicited":2, "ogsmd.misc":3, "ogsmd.gprs":4 }

-- 
FSO frameworkd Debian packaging