Update the AT modem SSN driver to the new API

5 files changed, 148 insertions, 66 deletions

diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index b4d44269..28fde60a 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -10,7 +10,8 @@ builtin_sources += atmodem/atmodem.c atmodem/at.h \
 			atmodem/call-forwarding.c atmodem/call-meter.c \
 			atmodem/network-registration.c atmodem/sim.c \
 			atmodem/ussd.c atmodem/voicecall.c \
-			atmodem/call-barring.c atmodem/phonebook.c
+			atmodem/call-barring.c atmodem/phonebook.c \
+			atmodem/ssn.c
 
 builtin_modules += isimodem
 builtin_sources += isimodem/isimodem.c isimodem/isi.h isimodem/isiphonebook.c
diff --git a/drivers/atmodem/at.h b/drivers/atmodem/at.h
index 8f106abb..767635af 100644
--- a/drivers/atmodem/at.h
+++ b/drivers/atmodem/at.h
@@ -94,3 +94,6 @@ extern void at_sms_exit(struct ofono_modem *modem);
 
 extern void at_phonebook_init();
 extern void at_phonebook_exit();
+
+extern void at_ssn_init();
+extern void at_ssn_exit();
diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 07af1c4c..9ff10cce 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -368,6 +368,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user)
 	at_voicecall_init(at->modem);
 	ofono_call_meter_create(at->modem, "generic_at", at->parser);
 	ofono_call_barring_create(at->modem, "generic_at", at->parser);
+	ofono_ssn_create(at->modem, "generic_at", at->parser);
 	at_sms_init(at->modem);
 	ofono_phonebook_create(at->modem, "generic_at", at->parser);
 
@@ -531,6 +532,7 @@ static int atmodem_init(void)
 	at_call_meter_init();
 	at_call_settings_init();
 	at_phonebook_init();
+	at_ssn_init();
 
 	manager_init(conn);
 
@@ -543,6 +545,7 @@ static void atmodem_exit(void)
 
 	manager_exit(conn);
 
+	at_ssn_exit();
 	at_phonebook_exit();
 	at_call_settings_exit();
 	at_call_meter_exit();
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
new file mode 100644
index 00000000..c8f23b69
--- /dev/null
+++ b/drivers/atmodem/ssn.c
@@ -0,0 +1,140 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  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 <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/ssn.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "at.h"
+
+static void cssi_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_ssn *ssn = user_data;
+	GAtResultIter iter;
+	int code1, index;
+
+	dump_response("cssi_notify", TRUE, result);
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CSSI:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &code1))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &index))
+		index = 0;
+
+	ofono_ssn_cssi_notify(ssn, code1, index);
+}
+
+static void cssu_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_ssn *ssn = user_data;
+	GAtResultIter iter;
+	int code2;
+	int index = -1;
+	const char *num;
+	struct ofono_phone_number ph;
+
+	ph.number[0] = '\0';
+	ph.type = 129;
+
+	dump_response("cssu_notify", TRUE, result);
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CSSU:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &code2))
+		return;
+
+	/* This field is optional, if we can't read it, try to skip it */
+	if (!g_at_result_iter_next_number(&iter, &index) &&
+			!g_at_result_iter_skip_next(&iter))
+		goto out;
+
+	if (!g_at_result_iter_next_string(&iter, &num))
+		goto out;
+
+	strncpy(ph.number, num, OFONO_MAX_PHONE_NUMBER_LENGTH);
+
+	if (!g_at_result_iter_next_number(&iter, &ph.type))
+		return;
+
+out:
+	ofono_ssn_cssu_notify(ssn, code2, index, &ph);
+}
+
+static gboolean at_ssn_register(gpointer user)
+{
+	struct ofono_ssn *ssn = user;
+	GAtChat *chat = ofono_ssn_get_data(ssn);
+
+	g_at_chat_register(chat, "+CSSI:", cssi_notify, FALSE, ssn, NULL);
+	g_at_chat_register(chat, "+CSSU:", cssu_notify, FALSE, ssn, NULL);
+
+	ofono_ssn_register(ssn);
+
+	return FALSE;
+}
+
+static int at_ssn_probe(struct ofono_ssn *ssn)
+{
+	g_idle_add(at_ssn_register, ssn);
+
+	return 0;
+}
+
+static int at_ssn_remove(struct ofono_ssn *ssn)
+{
+	return 0;
+}
+
+static struct ofono_ssn_driver driver = {
+	.name = "generic_at",
+	.probe = at_ssn_probe,
+	.remove = at_ssn_remove,
+};
+
+void at_ssn_init()
+{
+	ofono_ssn_driver_register(&driver);
+}
+
+void at_ssn_exit()
+{
+	ofono_ssn_driver_unregister(&driver);
+}
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 07e19870..cb2a8d40 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -975,67 +975,6 @@ static void busy_notify(GAtResult *result, gpointer user_data)
 					clcc_poll_cb, modem, NULL);
 }
 
-static void cssi_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	GAtResultIter iter;
-	int code1, index;
-
-	dump_response("cssi_notify", TRUE, result);
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CSSI:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &code1))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &index))
-		index = 0;
-
-	ofono_cssi_notify(modem, code1, index);
-}
-
-static void cssu_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	GAtResultIter iter;
-	int code2;
-	int index = -1;
-	const char *num;
-	struct ofono_phone_number ph;
-
-	ph.number[0] = '\0';
-	ph.type = 129;
-
-	dump_response("cssu_notify", TRUE, result);
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CSSU:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &code2))
-		return;
-
-	/* This field is optional, if we can't read it, try to skip it */
-	if (!g_at_result_iter_next_number(&iter, &index) &&
-			!g_at_result_iter_skip_next(&iter))
-		goto out;
-
-	if (!g_at_result_iter_next_string(&iter, &num))
-		goto out;
-
-	strncpy(ph.number, num, OFONO_MAX_PHONE_NUMBER_LENGTH);
-
-	if (!g_at_result_iter_next_number(&iter, &ph.type))
-		return;
-
-out:
-	ofono_cssu_notify(modem, code2, index, &ph);
-}
-
 static struct ofono_voicecall_ops ops = {
 	.dial			= at_dial,
 	.answer			= at_answer,
@@ -1070,10 +1009,6 @@ static void at_voicecall_initialized(gboolean ok, GAtResult *result,
 				clip_notify, FALSE, modem, NULL);
 	g_at_chat_register(at->parser, "+CCWA:",
 				ccwa_notify, FALSE, modem, NULL);
-	g_at_chat_register(at->parser, "+CSSI:",
-				cssi_notify, FALSE, modem, NULL);
-	g_at_chat_register(at->parser, "+CSSU:",
-				cssu_notify, FALSE, modem, NULL);
 
 	/* Modems with 'better' call progress indicators should
 	 * probably not even bother registering to these