freesmartphone: catch up with milestone5.5 and SHR/import

9 files changed, 45 insertions, 183 deletions

diff --git a/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf
index 36359a9f34..d50d498ab0 100644
--- a/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf
@@ -20,3 +20,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
index 3581064245..463caf6ae9 100644
--- a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf
@@ -36,3 +36,11 @@ rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevent
 
 [opimd]
 disable = 1
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/frameworkd b/recipes/freesmartphone/frameworkd/frameworkd
index 08b782e402..63d6a79475 100644
--- a/recipes/freesmartphone/frameworkd/frameworkd
+++ b/recipes/freesmartphone/frameworkd/frameworkd
@@ -32,7 +32,7 @@ case "$1" in
         $0 start
         ;;
     *)
-        echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}"
+        echo "Usage: /etc/init.d/frameworkd {start|stop|restart|force-reload}"
         exit 1
         ;;
 esac
diff --git a/recipes/freesmartphone/frameworkd/frameworkd.conf b/recipes/freesmartphone/frameworkd/frameworkd.conf
index 39e60d632b..7748740b4a 100644
--- a/recipes/freesmartphone/frameworkd/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/frameworkd.conf
@@ -25,3 +25,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
diff --git a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
deleted file mode 100644
index a50172c7f5..0000000000
--- a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
+++ /dev/null
@@ -1,152 +0,0 @@
-[frameworkd]
-# indicates this configuration version, do not change
-version = 1
-# the default log_level, if not specified per module
-log_level = INFO
-# the global log_destination. Uncomment to enable
-log_to = stderr
-#log_to = file
-#log_to = syslog
-# if logging to a file, specify the destination
-log_destination = /tmp/frameworkd.log
-# persistance format, one of "pickle", "yaml"
-persist_format = pickle
-rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
-# specify how subsystems scan for their plugins,
-# either "auto" (via filesystem scan) or "config" (via config section check)
-# the default is "auto" (slow).
-scantype = auto
-
-#
-# Subsystem configuration for oeventsd
-#
-[odeviced]
-# set log level for a subsystem or for an individual module
-# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
-log_level = INFO
-
-[odeviced.accelerometer]
-disable = 1
-
-[odeviced.audio]
-# set directory where the alsa audio scenarios are stored
-scenario_dir = /usr/share/openmoko/scenarios
-# set default scenario loaded at startup
-default_scenario = stereoout
-
-[odeviced.idlenotifier]
-# configure timeouts (in seconds) here. A value of 0
-# means 'never fall into this state' (except programatically)
-idle = 10
-idle_dim = 20
-idle_prelock = 12
-lock = 2
-suspend = 2
-
-[odeviced.input]
-# format is <keyname>,<type>,<input device keycode>,<report held seconds in addition to press/release>
-report1 = AUX,key,169,1
-report2 = POWER,key,116,1
-report3 = CHARGER,key,356,0
-report4 = HEADSET,switch,2,0
-
-[odeviced.kernel26]
-# set 1 to disable a module
-disable = 0
-# poll capacity once every 5 minutes
-# (usually, you do not have to change this)
-capacity_check_timeout = 300
-# set 0 to disable FB_BLANK ioctl to blank framebuffer
-# (if you have problems on Openmoko GTA02)
-fb_blank = 1
-
-[odeviced.powercontrol_ibm]
-disable = 1
-
-[odeviced.powercontrol_neo]
-disable = 1
-
-#
-# Subsystem configuration for oeventsd
-#
-[oeventsd]
-log_level = DEBUG
-disable = 0
-
-[oeventsd.oevents]
-
-#
-# Subsystem configuration for ogspd
-#
-[ogpsd]
-# possible options are NMEADevice, UBXDevice, GTA02Device, EtenDevice
-device = GTA02Device
-# possible options are SerialChannel, GllinChannel, UDPChannel, FileChannel
-channel = SerialChannel
-# For UDPChannel the path defines the port to listen to
-path = /dev/ttySAC1
-log_level = INFO
-
-[ogpsd.factory]
-
-#
-# Subsystem configuration for ogsmd
-#
-[ogsmd]
-disable = 0
-modemtype = qualcomm_msm
-
-#
-# Subsystem configuration for onetworkd
-#
-[onetworkd]
-
-[onetworkd.network]
-
-#
-# Subsystem configuration for ophoned
-#
-[ophoned]
-
-[ophoned.ophoned]
-
-#
-# Subsystem configuration for opimd
-#
-[opimd]
-contacts_default_backend = CSV-Contacts
-messages_default_folder = Unfiled
-messages_trash_folder = Trash
-sim_messages_default_folder = SMS
-rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmartphone/opim
-
-[opimd.opimd]
-
-#
-# Subsystem configuration for opreferencesd
-#
-[opreferencesd]
-log_level = DEBUG
-disable = 0
-# log_level = DEBUG
-
-[opreferencesd.opreferences]
-
-#
-# Subsystem configuration for otimed
-#
-[otimed]
-# a list of time/zone sources to use or NONE
-timesources = GPS,NTP
-zonesources = GSM
-
-[otimed.otimed]
-
-#
-# Subsystem configuration for ousaged
-#
-[ousaged]
-# choose whether resources should be disabled at startup, at shutdown, always (default), or never.
-sync_resources_with_lifecycle = always
-
-[ousaged.generic]
diff --git a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf b/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
index eb22030550..e8f6606b5b 100644
--- a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/magician/frameworkd.conf
@@ -22,3 +22,10 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
deleted file mode 100644
index d48bc0815c..0000000000
--- a/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[frameworkd]
-version = 1
-log_level = INFO
-log_to = syslog
-
-[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
-report3 = USB,key,356,0
-report4 = HEADSET,switch,2,0
-
-[ogsmd]
-# GTA03 has a Cinterion MC75i
-modemtype = cinterion_mc75
-
-[ogpsd]
-disable = 1
-
-[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/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
index b2a817aa66..89ff0a627f 100644
--- a/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf
@@ -31,3 +31,11 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u
 
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+
diff --git a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
index 796d4fb88a..7ffe9d8a7d 100644
--- a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf
@@ -46,3 +46,10 @@ rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevent
 [opimd]
 disable = 1
 
+[ousaged]
+disable = 1
+
+[fsousage]
+[fsousage.controller]
+
+