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

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit f2d61c35f9c2af189586470e2b518fe2be668933
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Tue Dec 30 17:44:09 2008 +0100

    odeviced: Register objects under /org/freesmartphone/Device/Display/ also
    with an numerical incremental alias -- e.g. the first display can now
    also be accessed via /org/freesmartphone/Device/Display/0.
    rules: Adjust the default backlight brightness rule to use display "0".
    NOTE: This should be the last missing step to support Openmoko kernel
    versions 2.6.24 and also >= 2.6.27 for GTA01 and GTA02.

diff --git a/ChangeLog b/ChangeLog
index 72e3e64..604aabf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2008-12-30	Michael Lauer	<mickey at openmoko.org>
+
+	* [odeviced] Register objects under /org/freesmartphone/Device/Display/ also
+	  with an numerical incremental alias -- e.g. the first display can now 
+	  also be accessed via /org/freesmartphone/Device/Display/0.
+	* [rules] Adjust the default backlight brightness rule to use display "0".
+
 2008-12-29	Michael lauer	<mickey at openmoko.org>
 
 	* Support external subsystems. If you add a section with an 'external' attribute, then
-	the section will be treated as an external subsystem to launch with the path given
-	as attribute:
+	the section will be treated as an external subsystem to launch with the path given as an attribute:
 	[mysubsystem]
 	external=/foo/bar
 	TODO: Add 'relaunch' attribute.
@@ -138,9 +144,9 @@
 2008-11-14	Michael Lauer	<mickey at openmoko.org>
 
 	* Implement org.freesmartphone.GSM.Network.GetCountryCode() -> ss
-    * [odeviced] Added kernel26 option called 'fb_blank' (default=1).
-      If you suffer from the Om bug WSOD (white screen of death), try
-      setting this option to 0.
+	* [odeviced] Added kernel26 option called 'fb_blank' (default=1).
+	  If you suffer from the Om bug WSOD (white screen of death), try
+	  setting this option to 0.
 
 2008-11-02	Michael Lauer	<mickey at openmoko.org>
 
diff --git a/docs/TODO b/docs/TODO
index 945f300..6e7e703 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,5 +1,6 @@
 == controller / general ==
 * introduce dbus subsystem or dbus object inter-dependencies and honor the dependency graph on startup
+* add dbus-introspectiond
 
 == odeviced ==
 * add more device-specific modules
diff --git a/etc/freesmartphone/oevents/rules.yaml b/etc/freesmartphone/oevents/rules.yaml
index 74bc6ef..df8e010 100644
--- a/etc/freesmartphone/oevents/rules.yaml
+++ b/etc/freesmartphone/oevents/rules.yaml
@@ -44,9 +44,9 @@
 -
     while: CallListContains("incoming")
     filters: Not(CallListContains("active"))
-    actions: 
+    actions:
              - RingTone()
-             - SetDisplayBrightness("pcf50633_bl", 90)
+             - SetDisplayBrightness("0", 90)
 -
     while: CallStatus()
     filters: Or(HasAttr(status, "outgoing"), HasAttr(status, "active"))
@@ -111,12 +111,12 @@
     #
     trigger: IdleState()
     filters: HasAttr(status, "busy")
-    actions: SetDisplayBrightness("pcf50633_bl", 90)
+    actions: SetDisplayBrightness("0", 90)
 -
     trigger: IdleState()
     filters: HasAttr(status, "idle_dim")
-    actions: SetDisplayBrightness("pcf50633_bl", 20)
+    actions: SetDisplayBrightness("0", 20)
 -
     trigger: IdleState()
     filters: HasAttr(status, "idle_prelock")
-    actions: SetDisplayBrightness("pcf50633_bl", 0)
+    actions: SetDisplayBrightness("0", 0)
diff --git a/framework/subsystems/odeviced/kernel26.py b/framework/subsystems/odeviced/kernel26.py
index 7de0925..f586f65 100644
--- a/framework/subsystems/odeviced/kernel26.py
+++ b/framework/subsystems/odeviced/kernel26.py
@@ -8,7 +8,7 @@ GPLv2 or later
 """
 
 MODULE_NAME = "odeviced.kernel26"
-__version__ = "0.9.9.1"
+__version__ = "0.9.9.2"
 
 from helpers import DBUS_INTERFACE_PREFIX, DBUS_PATH_PREFIX, readFromFile, writeToFile, cleanObjectName
 from framework.config import config
@@ -43,6 +43,8 @@ class Display( dbus.service.Object ):
     """A Dbus Object implementing org.freesmartphone.Device.Display
     using the kernel 2.6 backlight class device"""
     DBUS_INTERFACE = DBUS_INTERFACE_PREFIX + ".Display"
+    SUPPORTS_MULTIPLE_OBJECT_PATHS = True
+    OBJECT_PATH_COUNTER = 0
 
     def __init__( self, bus, index, node ):
         self.interface = self.DBUS_INTERFACE
@@ -55,6 +57,10 @@ class Display( dbus.service.Object ):
         logger.debug( "current brightness %d, max brightness %d" % ( self.current, self.max ) )
         self.fbblank = config.getBool( MODULE_NAME, "fb_blank", True )
         logger.info( "framebuffer blanking %s" % ( "enabled" if self.fbblank else "disabled" ) )
+        # also register object under an incremental path
+        self.path2 = DBUS_PATH_PREFIX + "/Display/%d" % self.__class__.OBJECT_PATH_COUNTER
+        self.add_to_connection( self._connection, self.path2  )
+        self.__class__.OBJECT_PATH_COUNTER += 1
 
     def _valueToPercent( self, value ):
         """

-- 
FSO frameworkd Debian packaging