From 639872d0884c87035097c21b9f2cb007e97bda1b Mon Sep 17 00:00:00 2001
From: Paul Fertser <fercerpav@gmail.com>
Date: Thu, 11 Dec 2008 03:40:13 +0300
Subject: [PATCH] Modify /sys paths to work with andy-tracking kernel
---
etc/freesmartphone/oevents/rules.yaml | 8 ++++----
framework/subsystems/odeviced/accelerometer.py | 2 +-
framework/subsystems/odeviced/kernel26.py | 2 +-
framework/subsystems/odeviced/powercontrol_neo.py | 4 ++--
framework/subsystems/ogpsd/om.py | 2 +-
framework/subsystems/ousaged/generic.py | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/etc/freesmartphone/oevents/rules.yaml b/etc/freesmartphone/oevents/rules.yaml
index 74bc6ef..1bc1bed 100644
|
a
|
b
|
|
| 46 | 46 | filters: Not(CallListContains("active")) |
| 47 | 47 | actions: |
| 48 | 48 | - RingTone() |
| 49 | | - SetDisplayBrightness("pcf50633_bl", 90) |
| | 49 | - SetDisplayBrightness("gta02_bl", 90) |
| 50 | 50 | - |
| 51 | 51 | while: CallStatus() |
| 52 | 52 | filters: Or(HasAttr(status, "outgoing"), HasAttr(status, "active")) |
| … |
… |
|
| 111 | 111 | # |
| 112 | 112 | trigger: IdleState() |
| 113 | 113 | filters: HasAttr(status, "busy") |
| 114 | | actions: SetDisplayBrightness("pcf50633_bl", 90) |
| | 114 | actions: SetDisplayBrightness("gta02_bl", 90) |
| 115 | 115 | - |
| 116 | 116 | trigger: IdleState() |
| 117 | 117 | filters: HasAttr(status, "idle_dim") |
| 118 | | actions: SetDisplayBrightness("pcf50633_bl", 20) |
| | 118 | actions: SetDisplayBrightness("gta02_bl", 20) |
| 119 | 119 | - |
| 120 | 120 | trigger: IdleState() |
| 121 | 121 | filters: HasAttr(status, "idle_prelock") |
| 122 | | actions: SetDisplayBrightness("pcf50633_bl", 0) |
| | 122 | actions: SetDisplayBrightness("gta02_bl", 0) |
diff --git a/framework/subsystems/odeviced/accelerometer.py b/framework/subsystems/odeviced/accelerometer.py
index 4ecc0e1..b4848e1 100644
|
a
|
b
|
class Gta02Accelerometer(InputDevAccelerometer): |
| 116 | 116 | """ |
| 117 | 117 | |
| 118 | 118 | INPUT_DEV = '/dev/input/event3' |
| 119 | | SYS_SAMPLE_RATE = '/sys/devices/platform/spi_s3c24xx_gpio.1/spi0.1/sample_rate' |
| | 119 | SYS_SAMPLE_RATE = '/sys/class/i2c-adapter/i2c-0/0-0073/lis302dl.2/sample_rate' |
| 120 | 120 | |
| 121 | 121 | def __init__(self, device=None, sample_rate=None): |
| 122 | 122 | if device is None: |
diff --git a/framework/subsystems/odeviced/kernel26.py b/framework/subsystems/odeviced/kernel26.py
index b4a5004..cb35044 100644
|
a
|
b
|
class PowerSupply( dbus.service.Object ): |
| 176 | 176 | self.ueventsock = s = socket.socket( socket.AF_NETLINK, socket.SOCK_DGRAM, socket.NETLINK_KOBJECT_UEVENT ) |
| 177 | 177 | # this only works as root |
| 178 | 178 | try: |
| 179 | | s.bind( ( os.getpid(), 1 ) ) |
| | 179 | s.bind( ( 0, 1 ) ) |
| 180 | 180 | except socket.error, e: |
| 181 | 181 | logger.exception( "Could not bind to netlink kobject. Power supply reporting will not work." ) |
| 182 | 182 | else: |
diff --git a/framework/subsystems/odeviced/powercontrol_neo.py b/framework/subsystems/odeviced/powercontrol_neo.py
index 16729f5..9429afc 100644
|
a
|
b
|
class NeoUsbHostPowerControl( GenericPowerControl ): |
| 53 | 53 | def __init__( self, bus, node ): |
| 54 | 54 | super( NeoUsbHostPowerControl, self ).__init__( bus, "UsbHost", node ) |
| 55 | 55 | # node to provide 5V/100mA to USB gadgets, only present on Neo FreeRunner |
| 56 | | self.powernode = "/sys/devices/platform/neo1973-pm-host.0/hostmode" |
| | 56 | self.powernode = "/sys/class/i2c-adapter/i2c-0/0-0073/neo1973-pm-host.0/hostmode" |
| 57 | 57 | # mode switching |
| 58 | 58 | self.modenode = "/sys/devices/platform/s3c2410-ohci/usb_mode" |
| 59 | 59 | |
| … |
… |
def factory( prefix, controller ): |
| 93 | 93 | |
| 94 | 94 | objects = [] |
| 95 | 95 | # scan for device nodes |
| 96 | | devicespath = "/sys/devices/platform" |
| | 96 | devicespath = "/sys/class/i2c-adapter" |
| 97 | 97 | walk.lookForBT = True |
| 98 | 98 | walk.lookForUSB = True |
| 99 | 99 | os.path.walk( devicespath, walk, objects ) |
diff --git a/framework/subsystems/ogpsd/om.py b/framework/subsystems/ogpsd/om.py
index f2836a8..c7778b5 100644
|
a
|
b
|
Open GPS Daemon |
| 9 | 9 | GPLv2 or later |
| 10 | 10 | """ |
| 11 | 11 | |
| 12 | | DEVICE_POWER_PATH = "/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/neo1973-pm-gps.0/pwron" |
| | 12 | DEVICE_POWER_PATH = "/sys/class/i2c-adapter/i2c-0/0-0073/pcf50633-regltr.7/neo1973-pm-gps.0/pwron" |
| 13 | 13 | |
| 14 | 14 | from ubx import UBXDevice |
| 15 | 15 | from ubx import CLIDPAIR |
diff --git a/framework/subsystems/ousaged/generic.py b/framework/subsystems/ousaged/generic.py
index da84ab3..52546eb 100644
|
a
|
b
|
class GenericUsageControl( dbus.service.Object ): |
| 291 | 291 | yield resource._suspend() |
| 292 | 292 | |
| 293 | 293 | # FIXME Play apmd and then use the sysfs interface |
| 294 | | os.system( "apm -s" ) |
| | 294 | os.system( "echo mem > /sys/power/state" ) |
| 295 | 295 | |
| 296 | 296 | logger.info( "resuming all resources" ) |
| 297 | 297 | for resource in self.resources.values(): |