summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-24 22:26:03 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-24 22:26:03 +0000
commitfc3b97418571ca401dfa3fda18bbbca9d9875914 (patch)
treeac1ab74d4f2cedee4e8a953e81e85e743e6655aa
parentdc10f3e60a09d1df1aa9d38c2508c60de5fe3d52 (diff)
frameworkd git update revision to ms3 RC1, catch up framework configurations
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--packages/freesmartphone/frameworkd/a780/frameworkd.conf7
-rw-r--r--packages/freesmartphone/frameworkd/frameworkd.conf16
-rw-r--r--packages/freesmartphone/frameworkd/magician/frameworkd.conf11
-rw-r--r--packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf14
-rw-r--r--packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf23
-rw-r--r--packages/freesmartphone/frameworkd_git.bb7
7 files changed, 61 insertions, 19 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cf5aab27d8..a06fe7e5ed 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b"
+SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf
index 4499acc47e..a619bf1c5a 100644
--- a/packages/freesmartphone/frameworkd/a780/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/a780/frameworkd.conf
@@ -1,4 +1,5 @@
-[idlenotifier]
+[frameworkd]
+version = 1
[input]
# keys (copied from Openmoko, need to adjust)
@@ -13,3 +14,7 @@ modemtype = freescale_neptune
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf
index 3d0bbc3c1c..1cd9ddf904 100644
--- a/packages/freesmartphone/frameworkd/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/frameworkd.conf
@@ -1,17 +1,18 @@
-[odeviced]
+[frameworkd]
+version = 1
-[kernel26]
+[odeviced.kernel26]
# set 1 to disable the module
disable = 0
-[idlenotifier]
+[odeviced.idlenotifier]
# set 1 to disable the module
disable = 0
-# add inut nodes to ignore for idle activity
+# add input nodes to ignore for idle activity
ignoreinput = 2,3,4
-[powercontrol-neo]
-disable = 0
+[odeviced.powercontrol-neo]
+disable = 1
[ogsmd]
# specify your modemtype here
@@ -19,3 +20,6 @@ modemtype = ti_calypso
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
index cbafb1925f..b7e40c0654 100644
--- a/packages/freesmartphone/frameworkd/magician/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
@@ -1,6 +1,7 @@
-[idlenotifier]
+[frameworkd]
+version = 1
-[input]
+[odeviced.input]
# magician doesn't have AUX, use the CAMERA key for now
# (it's in about the same place as AUX on gta01/02)
report1 = AUX,key,212,1
@@ -9,9 +10,13 @@ report2 = POWER,key,116,1
report3 = CHARGER,key,356,0
report4 = HEADSET,switch,2,0
-[ophoned]
+[ogsmd]
# Magician has TI Calypso
modemtype = ti_calypso
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
index d985bb342e..c25805b36f 100644
--- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
@@ -1,6 +1,13 @@
-[idlenotifier]
+[frameworkd]
+version = 1
-[input]
+[odeviced.audio]
+# set default alsa scenario
+default_scenario = stereoout
+# set path to alsa scenario files
+scenario_dir = /usr/share/openmoko/scenarios
+
+[odeviced.input]
# Keys
report1 = AUX,key,169,1
report2 = POWER,key,116,1
@@ -18,3 +25,6 @@ path = 6000
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
index cbeedf3da7..45bb12f6a8 100644
--- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
@@ -1,13 +1,19 @@
-[idlenotifier]
+[frameworkd]
+version = 1
+
+[odeviced.audio]
+# set default alsa scenario
+default_scenario = stereoout
+# set path to alsa scenario files
+scenario_dir = /usr/share/openmoko/scenarios
+
+[odeviced.idlenotifier]
# don't read from accellerometers for GTA02
ignoreinput=2,3
-[input]
+[odeviced.input]
# don't read from accellerometers for GTA02
ignoreinput=2,3
-
-# specify accellerometer type
-accelerometer_type = gta02
# keys
report1 = AUX,key,169,1
report2 = POWER,key,116,1
@@ -15,8 +21,9 @@ report3 = CHARGER,key,356,0
report4 = HEADSET,switch,2,0
# disable accelerometer since it uses LOADS of CPU resources
-[accelerometer]
+[odeviced.accelerometer]
disable = 1
+accelerometer_type = gta02
[ogsmd]
# GTA02 has TI Calypso
@@ -29,3 +36,7 @@ path = /dev/ttySAC1
[opreferencesd]
rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 0f364c0dd7..fa669ced18 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -37,6 +37,13 @@ RDEPENDS_${PN} += "\
${PN}-config \
"
+RRECOMMENDS_${PN} += "\
+ alsa-utils-amixer \
+ ppp \
+"
+
+RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd"
+RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd"
PACKAGES =+ "${PN}-config"