7 files changed, 45 insertions, 19 deletions
diff --git a/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
new file mode 100644
index 0000000000..d48bc0815c
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
@@ -0,0 +1,30 @@
+[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/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index ee155e64a6..a16831281e 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.4.9+gitr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 inherit distutils update-rc.d
 
diff --git a/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
index 2ff579d730..67da210396 100644
--- a/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
+++ b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
@@ -1,16 +1,15 @@
 [omuxerd]
-# set to 1, when the first AllocChannel request opens a session
 autoopen = 1
-# set to 1, when the last ReleaseChannel closes the session
 autoclose = 1
-# set to 1, when closing the session should close the program
 autoexit = 1
 
 [session]
-# set 0 for 07.10 basic multiplexing, 1 for advanced
 mode = 1
-# set maximum 07.10 frame size
 framesize = 98
-# configure modem port
 port = /dev/ttySAC0
 speed = 115200
+
+[device]
+wakeup_threshold = 6
+wakeup_waitms = 200
+
diff --git a/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
index 2ff579d730..67da210396 100644
--- a/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
+++ b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
@@ -1,16 +1,15 @@
 [omuxerd]
-# set to 1, when the first AllocChannel request opens a session
 autoopen = 1
-# set to 1, when the last ReleaseChannel closes the session
 autoclose = 1
-# set to 1, when closing the session should close the program
 autoexit = 1
 
 [session]
-# set 0 for 07.10 basic multiplexing, 1 for advanced
 mode = 1
-# set maximum 07.10 frame size
 framesize = 98
-# configure modem port
 port = /dev/ttySAC0
 speed = 115200
+
+[device]
+wakeup_threshold = 6
+wakeup_waitms = 200
+
diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb
index 3cfff7dc9a..20f68c0ad0 100644
--- a/packages/freesmartphone/fso-abyss_git.bb
+++ b/packages/freesmartphone/fso-abyss_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib libgsm0710"
 LICENSE = "GPL"
-PV = "0.3.0+gitr${SRCREV}"
+PV = "0.3.1+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "\
diff --git a/packages/freesmartphone/fso-monitord_git.bb b/packages/freesmartphone/fso-monitord_git.bb
index a13456dcfd..c7bbbe06c1 100644
--- a/packages/freesmartphone/fso-monitord_git.bb
+++ b/packages/freesmartphone/fso-monitord_git.bb
@@ -1,9 +1,8 @@
 DESCRIPTION = "FSO monitor daemon"
-AUTHOR = "M. Lauer et. al."
 SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib"
 LICENSE = "GPL"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.2.0+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master"
diff --git a/packages/freesmartphone/libgsm0710_git.bb b/packages/freesmartphone/libgsm0710_git.bb
index bc4e59ea34..b9d9b36010 100644
--- a/packages/freesmartphone/libgsm0710_git.bb
+++ b/packages/freesmartphone/libgsm0710_git.bb
@@ -1,14 +1,13 @@
 DESCRIPTION = "A GSM 07.10 Protocol Engine"
 LICENSE = "GPL"
 SECTION = "devel"
-PV = "1.0.0+gitr${SRCREV}"
+PV = "1.1.0+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools autotools_stage pkgconfig
+inherit autotools_stage pkgconfig
 
 # ship vapi file
 FILES_${PN}-dev += "${datadir}/vala"
-