11:04 p.m.
Hi,
here's a set of patches adding support for audio settings atom to
the isimodem driver, and for using this in the N900 plugin.
On the N900, this interface can be used to drive the state machine
of the libcmtspeechdata library. See:
http://gitorious.org/+meego-cellular/meego-cellular/libcmtspeechdata
Kai Vehmanen (2):
isimodem: Add support for audio settings
n900: Enable audio settings atom
Makefile.am | 3 +-
drivers/isimodem/audio-settings.c | 148 +++++++++++++++++++++++++++++++++++++
drivers/isimodem/isimodem.c | 2 +
drivers/isimodem/isimodem.h | 3 +
plugins/n900.c | 2 +
5 files changed, 157 insertions(+), 1 deletions(-)
create mode 100644 drivers/isimodem/audio-settings.c
11:04 p.m.
New subject: [PATCH 1/2] isimodem: Add support for audio settings
The audio state is mapped directly to isimodem's call server status
indications. When active, the modem speech path should be opened, and
when closed, the modem speech path may be closed.
---
Makefile.am | 3 +-
drivers/isimodem/audio-settings.c | 148 +++++++++++++++++++++++++++++++++++++
drivers/isimodem/isimodem.c | 2 +
drivers/isimodem/isimodem.h | 3 +
4 files changed, 155 insertions(+), 1 deletions(-)
create mode 100644 drivers/isimodem/audio-settings.c
diff --git a/Makefile.am b/Makefile.am
index a4888fb..cb81ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,8 @@ builtin_sources += $(gisi_sources) \
drivers/isimodem/gss.h \
drivers/isimodem/gprs.c \
drivers/isimodem/gprs-context.c \
- drivers/isimodem/gpds.h
+ drivers/isimodem/gpds.h \
+ drivers/isimodem/audio-settings.c
builtin_modules += isigen
builtin_sources += plugins/isigen.c
diff --git a/drivers/isimodem/audio-settings.c b/drivers/isimodem/audio-settings.c
new file mode 100644
index 0000000..0ec768d
--- /dev/null
+++ b/drivers/isimodem/audio-settings.c
@@ -0,0 +1,148 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/audio-settings.h>
+
+#include <gisi/client.h>
+
+#include "debug.h"
+
+struct audio_settings_data {
+ GIsiClient *client;
+};
+
+static void isi_call_server_status_ind_cb(GIsiClient *client,
+ void const *restrict data,
+ size_t len,
+ uint16_t object,
+ void *_oas)
+{
+ struct ofono_audio_settings *oas = _oas;
+ struct {
+ uint8_t message_id, server_status, sub_blocks;
+ } const *m = data;
+ gboolean call_server_status;
+
+ DBG("Call server status changed");
+
+ if (len < 3)
+ return;
+
+ call_server_status = m->server_status & 0xf ? TRUE : FALSE;
+ ofono_audio_settings_active_notify(oas, call_server_status);
+}
+
+static gboolean isi_call_register(gpointer _oas)
+{
+ struct ofono_audio_settings *oas = _oas;
+ struct audio_settings_data *asd = ofono_audio_settings_get_data(oas);
+ const char *debug = getenv("OFONO_ISI_DEBUG");
+
+ if (debug && (strcmp(debug, "all") == 0) == 0)
+ g_isi_client_set_debug(asd->client, call_debug, NULL);
+
+ g_isi_subscribe(asd->client,
+ CALL_SERVER_STATUS_IND, isi_call_server_status_ind_cb,
+ oas);
+
+ ofono_audio_settings_register(oas);
+
+ return FALSE;
+}
+
+static void isi_call_verify_cb(GIsiClient *client,
+ gboolean alive, uint16_t object, void *ovc)
+{
+ if (!alive) {
+ DBG("Unable to bootstrap audio settings driver");
+ return;
+ }
+
+ DBG("%s (v%03d.%03d) reachable",
+ pn_resource_name(g_isi_client_resource(client)),
+ g_isi_version_major(client),
+ g_isi_version_minor(client));
+
+ g_idle_add(isi_call_register, ovc);
+}
+
+static int isi_audio_settings_probe(struct ofono_audio_settings *as,
+ unsigned int vendor, void *data)
+{
+ GIsiModem *idx = data;
+ struct audio_settings_data *asd =
+ g_try_new0(struct audio_settings_data, 1);
+
+ if (!asd)
+ return -ENOMEM;
+
+ asd->client = g_isi_client_create(idx, PN_CALL);
+ if (!asd->client) {
+ g_free(asd);
+ return -ENOMEM;
+ }
+
+ ofono_audio_settings_set_data(as, asd);
+
+ if (!g_isi_verify(asd->client, isi_call_verify_cb, as))
+ DBG("Unable to verify reachability");
+
+ return 0;
+}
+
+static void isi_audio_settings_remove(struct ofono_audio_settings *as)
+{
+ struct audio_settings_data *asd = ofono_audio_settings_get_data(as);
+
+ ofono_audio_settings_set_data(as, NULL);
+
+ g_free(asd);
+}
+
+static struct ofono_audio_settings_driver driver = {
+ .name = "isimodem",
+ .probe = isi_audio_settings_probe,
+ .remove = isi_audio_settings_remove,
+};
+
+void isi_audio_settings_init()
+{
+ ofono_audio_settings_driver_register(&driver);
+}
+
+void isi_audio_settings_exit()
+{
+ ofono_audio_settings_driver_unregister(&driver);
+}
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index 10d681e..27b25ff 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -53,6 +53,7 @@ static int isimodem_init(void)
isi_radio_settings_init();
isi_gprs_init();
isi_gprs_context_init();
+ isi_audio_settings_init();
return 0;
}
@@ -75,6 +76,7 @@ static void isimodem_exit(void)
isi_radio_settings_exit();
isi_gprs_exit();
isi_gprs_context_exit();
+ isi_audio_settings_exit();
}
OFONO_PLUGIN_DEFINE(isimodem, "PhoNet / ISI modem driver", VERSION,
diff --git a/drivers/isimodem/isimodem.h b/drivers/isimodem/isimodem.h
index 57abcb2..873aca6 100644
--- a/drivers/isimodem/isimodem.h
+++ b/drivers/isimodem/isimodem.h
@@ -68,3 +68,6 @@ extern void isi_gprs_exit();
extern void isi_gprs_context_init();
extern void isi_gprs_context_exit();
+
+extern void isi_audio_settings_init();
+extern void isi_audio_settings_exit();
--
1.7.0.4
11:04 p.m.
New subject: [PATCH 2/2] n900: Enable audio settings atom
---
plugins/n900.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/plugins/n900.c b/plugins/n900.c
index 9be7b09..a9e6b59 100644
--- a/plugins/n900.c
+++ b/plugins/n900.c
@@ -53,6 +53,7 @@
#include <ofono/radio-settings.h>
#include <ofono/gprs.h>
#include <ofono/gprs-context.h>
+#include <ofono/audio-settings.h>
#include "drivers/isimodem/isimodem.h"
#include "drivers/isimodem/isiutil.h"
@@ -480,6 +481,7 @@ static void n900_pre_sim(struct ofono_modem *modem)
ofono_sim_create(isi->modem, 0, "isimodem", isi->idx);
ofono_devinfo_create(isi->modem, 0, "isimodem", isi->idx);
ofono_voicecall_create(isi->modem, 0, "isimodem", isi->idx);
+ ofono_audio_settings_create(isi->modem, 0, "isimodem", isi->idx);
}
static void n900_post_sim(struct ofono_modem *modem)
--
1.7.0.4
12:12 a.m.
New subject: [PATCH 1/2] isimodem: Add support for audio settings
Hi Kai,
2010/10/1 Kai Vehmanen <kai.vehmanen(a)nokia.com>:
diff --git a/drivers/isimodem/audio-settings.c
b/drivers/isimodem/audio-settings.c
new file mode 100644
index 0000000..0ec768d
--- /dev/null
+++ b/drivers/isimodem/audio-settings.c
@@ -0,0 +1,148 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
We have used a bit more elaborate statement, with subsidiaries and all.
+ * This program is free software; you can redistribute it and/or
modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/audio-settings.h>
+
+#include <gisi/client.h>
+
+#include "debug.h"
This seems to be missing includes for isimodem.h and call.h.
+struct audio_settings_data {
+ GIsiClient *client;
+};
+
+static void isi_call_server_status_ind_cb(GIsiClient *client,
+ void const *restrict data,
+ size_t len,
+ uint16_t object,
+ void *_oas)
+{
+ struct ofono_audio_settings *oas = _oas;
+ struct {
+ uint8_t message_id, server_status, sub_blocks;
+ } const *m = data;
+ gboolean call_server_status;
+
+ DBG("Call server status changed");
+
+ if (len < 3)
+ return;
+
+ call_server_status = m->server_status & 0xf ? TRUE : FALSE;
+ ofono_audio_settings_active_notify(oas, call_server_status);
+}
+
+static gboolean isi_call_register(gpointer _oas)
+{
+ struct ofono_audio_settings *oas = _oas;
+ struct audio_settings_data *asd = ofono_audio_settings_get_data(oas);
+ const char *debug = getenv("OFONO_ISI_DEBUG");
+
+ if (debug && (strcmp(debug, "all") == 0) == 0)
+ g_isi_client_set_debug(asd->client, call_debug, NULL);
+
+ g_isi_subscribe(asd->client,
+ CALL_SERVER_STATUS_IND, isi_call_server_status_ind_cb,
+ oas);
+
+ ofono_audio_settings_register(oas);
+
+ return FALSE;
+}
+
+static void isi_call_verify_cb(GIsiClient *client,
+ gboolean alive, uint16_t object, void *ovc)
+{
+ if (!alive) {
+ DBG("Unable to bootstrap audio settings driver");
+ return;
+ }
+
+ DBG("%s (v%03d.%03d) reachable",
+ pn_resource_name(g_isi_client_resource(client)),
+ g_isi_version_major(client),
+ g_isi_version_minor(client));
+
+ g_idle_add(isi_call_register, ovc);
+}
+
+static int isi_audio_settings_probe(struct ofono_audio_settings *as,
+ unsigned int vendor, void *data)
+{
+ GIsiModem *idx = data;
+ struct audio_settings_data *asd =
+ g_try_new0(struct audio_settings_data, 1);
+
+ if (!asd)
+ return -ENOMEM;
+
+ asd->client = g_isi_client_create(idx, PN_CALL);
+ if (!asd->client) {
+ g_free(asd);
+ return -ENOMEM;
+ }
+
+ ofono_audio_settings_set_data(as, asd);
+
+ if (!g_isi_verify(asd->client, isi_call_verify_cb, as))
+ DBG("Unable to verify reachability");
+
+ return 0;
+}
+
+static void isi_audio_settings_remove(struct ofono_audio_settings *as)
+{
+ struct audio_settings_data *asd = ofono_audio_settings_get_data(as);
+
+ ofono_audio_settings_set_data(as, NULL);
Here you need to clean up asd->client as well.
Otherwise looks good.
I went ahead and commit-amended and patched these issues, and pushed
this and the other patch. Thanks!
Cheers,
Aki
1:30 a.m.
New subject: [PATCH 2/2] n900: Enable audio settings atom
Hi,
On 01 Oct 2010, Kai Vehmanen wrote:
Subject: [PATCH 2/2] n900: Enable audio settings atom
plugins/n900.c | 2 ++
FYI, I've now added a minimal test/example application, cmtspeech_test_ofono,
to upstream libcmtspeechdata repository [1]. The app uses oFono (and the new
audio settings atom) to set up the speech data path on e.g. Nokia N900
(currently libcmtspeechdata only supports the N900 modem speech
interface, but the door is open to support other modems as well).
In short, you run this app, make a call with oFono, and once the
call is up, the test app simply loops back any audio from
downlink to uplink (so the remote party will get its uplink
audio routed back).
The app is at:
http://meego.gitorious.org/meego-cellular/libcmtspeechdata/blobs/master/u...
This might be useful if you want to test/develop oFono on
N900, and/or for developing speech path support to other modems (either
with libcmtspeechdata or with some other kernel/lib adaptation).
PS On N900, you need to stop pulseaudio before testing as access to
the speech path kernel driver is exclusive.
[1] http://gitorious.org/+meego-cellular/meego-cellular/libcmtspeechdata
Br,
--
Kai Vehmanen
4365
days inactive
4370
days old
4 comments
3 participants
participants (3)
-
Aki Niemi -
Kai Vehmanen -
Kai.Vehmanen＠nokia.com