ifxmodem: Add support for audio settings

diff --git a/Makefile.am b/Makefile.am
index 0b27942..378dbca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -211,6 +211,7 @@ builtin_sources += drivers/atmodem/atutil.h \
                        drivers/ifxmodem/ifxmodem.h \
                        drivers/ifxmodem/ifxmodem.c \
                        drivers/ifxmodem/voicecall.c \
+                       drivers/ifxmodem/audio-settings.c \
                        drivers/ifxmodem/radio-settings.c \
                        drivers/ifxmodem/stk.c
 

diff --git a/drivers/ifxmodem/audio-settings.c b/drivers/ifxmodem/audio-settings.c
new file mode 100644 (file)
index 0000000..4e6df9b
--- /dev/null
+++ b/drivers/ifxmodem/audio-settings.c
@@ -0,0 +1,149 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2010  Intel 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 "gatchat.h"
+#include "gatresult.h"
+
+#include "ifxmodem.h"
+
+static const char *none_prefix[] = { NULL };
+static const char *xprogress_prefix[] = { "+XPROGRESS:", NULL };
+
+struct audio_settings_data {
+       GAtChat *chat;
+};
+
+static void xprogress_notify(GAtResult *result, gpointer user_data)
+{
+       struct ofono_audio_settings *as = user_data;
+       GAtResultIter iter;
+       int id, status;
+
+       g_at_result_iter_init(&iter, result);
+
+       if (g_at_result_iter_next(&iter, "+XPROGRESS:") == FALSE)
+               return;
+
+       if (g_at_result_iter_next_number(&iter, &id) == FALSE)
+               return;
+
+       if (g_at_result_iter_next_number(&iter, &status) == FALSE)
+               return;
+
+       switch (status) {
+       case 0:
+       case 1:
+       case 4:
+       case 9:
+       case 10:
+       case 11:
+               ofono_audio_settings_notify(as, FALSE);
+               break;
+       case 2:
+       case 3:
+       case 5:
+       case 6:
+       case 7:
+       case 8:
+               ofono_audio_settings_notify(as, TRUE);
+               break;
+       }
+}
+
+static void xprogress_support_cb(gboolean ok, GAtResult *result,
+                                               gpointer user_data)
+{
+       struct ofono_audio_settings *as = user_data;
+       struct audio_settings_data *asd = ofono_audio_settings_get_data(as);
+
+       if (!ok)
+               return;
+
+       g_at_chat_register(asd->chat, "+XPROGRESS:", xprogress_notify,
+                                                       FALSE, as, NULL);
+
+       g_at_chat_send(asd->chat, "AT+XPROGRESS=1", none_prefix,
+                                               NULL, NULL, NULL);
+
+       ofono_audio_settings_register(as);
+}
+
+static int ifx_audio_settings_probe(struct ofono_audio_settings *as,
+                                       unsigned int vendor, void *data)
+{
+       GAtChat *chat = data;
+       struct audio_settings_data *asd;
+
+       asd = g_try_new0(struct audio_settings_data, 1);
+       if (!asd)
+               return -ENOMEM;
+
+       asd->chat = g_at_chat_clone(chat);
+
+       ofono_audio_settings_set_data(as, asd);
+
+       g_at_chat_send(asd->chat, "AT+XPROGRESS=?", xprogress_prefix,
+                                       xprogress_support_cb, as, NULL);
+
+       return 0;
+}
+
+static void ifx_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_at_chat_unref(asd->chat);
+       g_free(asd);
+}
+
+static struct ofono_audio_settings_driver driver = {
+       .name           = "ifxmodem",
+       .probe          = ifx_audio_settings_probe,
+       .remove         = ifx_audio_settings_remove,
+};
+
+void ifx_audio_settings_init()
+{
+       ofono_audio_settings_driver_register(&driver);
+}
+
+void ifx_audio_settings_exit()
+{
+       ofono_audio_settings_driver_unregister(&driver);
+}

diff --git a/drivers/ifxmodem/ifxmodem.c b/drivers/ifxmodem/ifxmodem.c
index cfcf6de..83b2192 100644 (file)
--- a/drivers/ifxmodem/ifxmodem.c
+++ b/drivers/ifxmodem/ifxmodem.c
@@ -35,6 +35,7 @@
 static int ifxmodem_init(void)
 {
        ifx_voicecall_init();
+       ifx_audio_settings_init();
        ifx_radio_settings_init();
        ifx_stk_init();
 
@@ -45,6 +46,7 @@ static void ifxmodem_exit(void)
 {
        ifx_stk_exit();
        ifx_radio_settings_exit();
+       ifx_audio_settings_exit();
        ifx_voicecall_exit();
 }
 

diff --git a/drivers/ifxmodem/ifxmodem.h b/drivers/ifxmodem/ifxmodem.h
index 2450a44..ae09299 100644 (file)
--- a/drivers/ifxmodem/ifxmodem.h
+++ b/drivers/ifxmodem/ifxmodem.h
@@ -24,6 +24,9 @@
 extern void ifx_voicecall_init();
 extern void ifx_voicecall_exit();
 
+extern void ifx_audio_settings_init();
+extern void ifx_audio_settings_exit();
+
 extern void ifx_radio_settings_init();
 extern void ifx_radio_settings_exit();