ssn: remove SSN atom completely

22 files changed, 2 insertions, 1013 deletions

diff --git a/Makefile.am b/Makefile.am
index 3f20717f..b607b0dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/dbus.h include/modem.h include/types.h \
 			include/call-barring.h include/call-forwarding.h \
 			include/call-meter.h include/call-settings.h \
-			include/phonebook.h include/ssn.h include/ussd.h \
+			include/phonebook.h include/ussd.h \
 			include/sms.h include/sim.h include/message-waiting.h \
 			include/netreg.h include/voicecall.h include/devinfo.h \
 			include/cbs.h include/call-volume.h \
@@ -126,7 +126,6 @@ builtin_sources += $(gisi_sources) \
 				drivers/isimodem/cbs.c \
 				drivers/isimodem/sim.c \
 				drivers/isimodem/sim.h \
-				drivers/isimodem/ssn.c \
 				drivers/isimodem/ussd.c \
 				drivers/isimodem/call-forwarding.c \
 				drivers/isimodem/call-settings.c \
@@ -172,7 +171,6 @@ builtin_sources += $(gatchat_sources) \
 				drivers/atmodem/voicecall.c \
 				drivers/atmodem/call-barring.c \
 				drivers/atmodem/phonebook.c \
-				drivers/atmodem/ssn.c \
 				drivers/atmodem/devinfo.c \
 				drivers/atmodem/call-volume.c \
 				drivers/atmodem/vendor.h \
@@ -372,7 +370,7 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
 			src/network.c src/voicecall.c src/ussd.c src/sms.c \
 			src/call-settings.c src/call-forwarding.c \
 			src/call-meter.c src/smsutil.h src/smsutil.c \
-			src/ssn.c src/call-barring.c src/sim.c src/stk.c \
+			src/call-barring.c src/sim.c src/stk.c \
 			src/phonebook.c src/history.c src/message-waiting.c \
 			src/simutil.h src/simutil.c src/storage.h \
 			src/storage.c src/cbs.c src/watch.c src/call-volume.c \
diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index e140281c..ce6c10a9 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -41,7 +41,6 @@ static int atmodem_init(void)
 	at_call_meter_init();
 	at_call_settings_init();
 	at_phonebook_init();
-	at_ssn_init();
 	at_ussd_init();
 	at_sms_init();
 	at_sim_init();
@@ -63,7 +62,6 @@ static void atmodem_exit(void)
 	at_sim_exit();
 	at_sms_exit();
 	at_ussd_exit();
-	at_ssn_exit();
 	at_phonebook_exit();
 	at_call_settings_exit();
 	at_call_meter_exit();
diff --git a/drivers/atmodem/atmodem.h b/drivers/atmodem/atmodem.h
index 1b7cf670..a6720d15 100644
--- a/drivers/atmodem/atmodem.h
+++ b/drivers/atmodem/atmodem.h
@@ -54,9 +54,6 @@ extern void at_sms_exit(void);
 extern void at_phonebook_init(void);
 extern void at_phonebook_exit(void);
 
-extern void at_ssn_init(void);
-extern void at_ssn_exit(void);
-
 extern void at_devinfo_init(void);
 extern void at_devinfo_exit(void);
 
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
deleted file mode 100644
index b7a9df4d..00000000
--- a/drivers/atmodem/ssn.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *
- *  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 <glib.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/ssn.h>
-
-#include "gatchat.h"
-#include "gatresult.h"
-
-#include "atmodem.h"
-
-static const char *none_prefix[] = { NULL };
-
-static void cssi_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_ssn *ssn = user_data;
-	GAtResultIter iter;
-	int code1, index;
-
-	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;
-
-	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 void at_ssn_initialized(gboolean ok, GAtResult *result,
-				gpointer user_data)
-{
-	struct ofono_ssn *ssn = user_data;
-	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);
-}
-
-static int at_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
-				void *data)
-{
-	GAtChat *chat = data;
-
-	chat = g_at_chat_clone(chat);
-
-	ofono_ssn_set_data(ssn, chat);
-	g_at_chat_send(chat, "AT+CSSN=1,1", none_prefix,
-			at_ssn_initialized, ssn, NULL);
-
-	return 0;
-}
-
-static void at_ssn_remove(struct ofono_ssn *ssn)
-{
-	GAtChat *chat = ofono_ssn_get_data(ssn);
-
-	g_at_chat_unref(chat);
-	ofono_ssn_set_data(ssn, NULL);
-}
-
-static struct ofono_ssn_driver driver = {
-	.name = "atmodem",
-	.probe = at_ssn_probe,
-	.remove = at_ssn_remove,
-};
-
-void at_ssn_init(void)
-{
-	ofono_ssn_driver_register(&driver);
-}
-
-void at_ssn_exit(void)
-{
-	ofono_ssn_driver_unregister(&driver);
-}
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index ba5cd544..1e3d3f34 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -44,7 +44,6 @@ static int isimodem_init(void)
 	isi_sms_init();
 	isi_cbs_init();
 	isi_sim_init();
-	isi_ssn_init();
 	isi_ussd_init();
 	isi_call_forwarding_init();
 	isi_call_settings_init();
@@ -67,7 +66,6 @@ static void isimodem_exit(void)
 	isi_sms_exit();
 	isi_cbs_exit();
 	isi_sim_exit();
-	isi_ssn_exit();
 	isi_ussd_exit();
 	isi_call_forwarding_exit();
 	isi_call_settings_exit();
diff --git a/drivers/isimodem/isimodem.h b/drivers/isimodem/isimodem.h
index ed64f9d2..f5e1657d 100644
--- a/drivers/isimodem/isimodem.h
+++ b/drivers/isimodem/isimodem.h
@@ -43,9 +43,6 @@ extern void isi_sim_exit(void);
 extern void isi_ussd_init(void);
 extern void isi_ussd_exit(void);
 
-extern void isi_ssn_init(void);
-extern void isi_ssn_exit(void);
-
 extern void isi_call_forwarding_init(void);
 extern void isi_call_forwarding_exit(void);
 
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
deleted file mode 100644
index 316247b5..00000000
--- a/drivers/isimodem/ssn.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
- *  Copyright (C) ST-Ericsson SA 2011.
- *
- *  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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <glib.h>
-
-#include <gisi/client.h>
-#include <gisi/iter.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/ssn.h>
-
-#include "call.h"
-#include "isimodem.h"
-#include "ss.h"
-#include "isiutil.h"
-#include "debug.h"
-
-
-
-struct ssn_data {
-	GIsiClient *client;
-};
-
-static gboolean decode_notify(GIsiSubBlockIter *iter)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	switch (byte) {
-	case CALL_NOTIFY_USER_SUSPENDED:
-		DBG("CALL_NOTIFY_USER_SUSPENDED");
-		break;
-
-	case CALL_NOTIFY_USER_RESUMED:
-		DBG("CALL_NOTIFY_USER_RESUMED");
-		break;
-
-	case CALL_NOTIFY_BEARER_CHANGE:
-		DBG("CALL_NOTIFY_BEARER_CHANGE");
-		break;
-
-	default:
-		DBG("Unknown notification: 0x%02X", byte);
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_ss_code(GIsiSubBlockIter *iter, int *cssi, int *cssu)
-{
-	uint16_t word;
-
-	if (!g_isi_sb_iter_get_word(iter, &word, 2))
-		return FALSE;
-
-	switch (word) {
-	case CALL_SSC_ALL_FWDS:
-		DBG("Call forwarding is active");
-		break;
-
-	case CALL_SSC_ALL_COND_FWD:
-		*cssi = SS_MO_CONDITIONAL_FORWARDING;
-		DBG("Some of conditional call forwardings active");
-		break;
-
-	case CALL_SSC_CFU:
-		*cssi = SS_MO_UNCONDITIONAL_FORWARDING;
-		DBG("Unconditional call forwarding is active");
-		break;
-
-	case CALL_SSC_OUTGOING_BARR_SERV:
-		*cssi = SS_MO_OUTGOING_BARRING;
-		DBG("Outgoing calls are barred");
-		break;
-
-	case CALL_SSC_INCOMING_BARR_SERV:
-		*cssi = SS_MO_INCOMING_BARRING;
-		DBG("Incoming calls are barred");
-		break;
-
-	case CALL_SSC_CALL_WAITING:
-		DBG("Incoming calls are barred");
-		break;
-
-	case CALL_SSC_CLIR:
-		DBG("CLIR connected unknown indication.");
-		break;
-
-	case CALL_SSC_MPTY:
-		*cssu = SS_MT_MULTIPARTY_VOICECALL;
-		DBG("Multiparty call entered.");
-		break;
-
-	case CALL_SSC_CALL_HOLD:
-		*cssu = SS_MT_VOICECALL_HOLD_RELEASED;
-		DBG("Call on hold has been released.");
-		break;
-
-	default:
-		DBG("Unknown/unhandled notification: 0x%02X", word);
-		break;
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_ss_status(GIsiSubBlockIter *iter)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	if (byte & CALL_SS_STATUS_ACTIVE)
-		DBG("CALL_SS_STATUS_ACTIVE");
-
-	if (byte & CALL_SS_STATUS_REGISTERED)
-		DBG("CALL_SS_STATUS_REGISTERED");
-
-	if (byte & CALL_SS_STATUS_PROVISIONED)
-		DBG("CALL_SS_STATUS_PROVISIONED");
-
-	if (byte & CALL_SS_STATUS_QUIESCENT)
-		DBG("CALL_SS_STATUS_QUIESCENT");
-
-	return TRUE;
-}
-
-static gboolean decode_ss_notify(GIsiSubBlockIter *iter, int *cssi, int *cssu)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	if (byte & CALL_SSN_INCOMING_IS_FWD) {
-		*cssu = SS_MT_CALL_FORWARDED;
-		DBG("This is a forwarded call #1.");
-	}
-
-	if (byte & CALL_SSN_INCOMING_FWD)
-		DBG("This is a forwarded call #2.");
-
-	if (byte & CALL_SSN_OUTGOING_FWD) {
-		*cssi = SS_MO_CALL_FORWARDED;
-		DBG("Call has been forwarded.");
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_ss_notify_indicator(GIsiSubBlockIter *iter, int *cssi)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	if (byte & CALL_SSI_CALL_IS_WAITING) {
-		*cssi = SS_MO_CALL_WAITING;
-		DBG("Call is waiting.");
-	}
-
-	if (byte & CALL_SSI_MPTY)
-		DBG("Multiparty call");
-
-	if (byte & CALL_SSI_CLIR_SUPPR_REJ) {
-		*cssi = SS_MO_CLIR_SUPPRESSION_REJECTED;
-		DBG("CLIR suppression rejected");
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_ss_hold_indicator(GIsiSubBlockIter *iter, int *cssu)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	if (byte & CALL_HOLD_IND_RETRIEVED) {
-		*cssu = SS_MT_VOICECALL_RETRIEVED;
-		DBG("Call has been retrieved");
-	}
-
-	if (byte & CALL_HOLD_IND_ON_HOLD) {
-		*cssu = SS_MT_VOICECALL_ON_HOLD;
-		DBG("Call has been put on hold");
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_ss_ect_indicator(GIsiSubBlockIter *iter, int *cssu)
-{
-	uint8_t byte;
-
-	if (!g_isi_sb_iter_get_byte(iter, &byte, 2))
-		return FALSE;
-
-	if (byte & CALL_ECT_CALL_STATE_ALERT) {
-		*cssu = SS_MT_VOICECALL_IN_TRANSFER;
-		DBG("Call is being connected with the remote party in "
-			"alerting state");
-	}
-
-	if (byte & CALL_ECT_CALL_STATE_ACTIVE) {
-		*cssu = SS_MT_VOICECALL_TRANSFERRED;
-		DBG("Call has been connected with the other remote "
-			"party in explicit call transfer operation.");
-	}
-
-	return TRUE;
-}
-
-static gboolean decode_remote_address(GIsiSubBlockIter *iter,
-					struct ofono_phone_number *number,
-					int *index)
-{
-	uint8_t type, len;
-	char *addr;
-
-	if (!g_isi_sb_iter_get_byte(iter, &type, 2))
-		return FALSE;
-
-	if (!g_isi_sb_iter_get_byte(iter, &len, 5))
-		return FALSE;
-
-	if (len > OFONO_MAX_PHONE_NUMBER_LENGTH)
-		return FALSE;
-
-	if (!g_isi_sb_iter_get_alpha_tag(iter, &addr, 2 * len, 6))
-		return FALSE;
-
-	strncpy(number->number, addr, len);
-	number->number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-	number->type = type;
-
-	g_free(addr);
-
-	return TRUE;
-}
-
-static gboolean decode_cug_info(GIsiSubBlockIter *iter, int *index, int *cssu)
-{
-	uint8_t pref;
-	uint8_t access;
-	uint16_t word;
-
-	if (!g_isi_sb_iter_get_byte(iter, &pref, 2))
-		return FALSE;
-
-	if (!g_isi_sb_iter_get_byte(iter, &access, 3))
-		return FALSE;
-
-	if (!g_isi_sb_iter_get_word(iter, &word, 4))
-		return FALSE;
-
-	DBG("Preferential CUG: 0x%02X", pref);
-	DBG("CUG output access: 0x%02X", access);
-
-	*index = word;
-	*cssu = SS_MO_CUG_CALL;
-
-	return TRUE;
-}
-
-static void notification_ind_cb(const GIsiMessage *msg, void *data)
-{
-	struct ofono_ssn *ssn = data;
-	struct ssn_data *sd = ofono_ssn_get_data(ssn);
-	GIsiSubBlockIter iter;
-
-	struct ofono_phone_number number;
-	int index = 0;
-	int cssi = -1;
-	int cssu = -1;
-	uint8_t byte;
-
-	if (ssn == NULL || sd == NULL)
-		return;
-
-	if (g_isi_msg_id(msg) != CALL_GSM_NOTIFICATION_IND)
-		return;
-
-	if (!g_isi_msg_data_get_byte(msg, 0, &byte))
-		return;
-
-	DBG("Received CallServer notification for call: 0x%02X", byte);
-
-	for (g_isi_sb_iter_init(&iter, msg, 2);
-			g_isi_sb_iter_is_valid(&iter);
-			g_isi_sb_iter_next(&iter)) {
-
-		switch (g_isi_sb_iter_get_id(&iter)) {
-		case CALL_GSM_NOTIFY:
-
-			if (!decode_notify(&iter))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_CODE:
-
-			if (!decode_ss_code(&iter, &cssi, &cssu))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_STATUS:
-
-			if (!decode_ss_status(&iter))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_NOTIFY:
-
-			if (!decode_ss_notify(&iter, &cssi, &cssu))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_NOTIFY_INDICATOR:
-
-			if (!decode_ss_notify_indicator(&iter, &cssi))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_HOLD_INDICATOR:
-
-
-			if (!decode_ss_hold_indicator(&iter, &cssu))
-				return;
-
-			break;
-
-		case CALL_GSM_SS_ECT_INDICATOR:
-
-			if (!decode_ss_ect_indicator(&iter, &cssu))
-				return;
-
-			break;
-
-		case CALL_GSM_REMOTE_ADDRESS:
-
-			if (!decode_remote_address(&iter, &number, &index))
-				return;
-
-			break;
-
-		case CALL_GSM_REMOTE_SUBADDRESS:
-			break;
-
-		case CALL_GSM_CUG_INFO:
-
-			if (!decode_cug_info(&iter, &index, &cssu))
-				return;
-
-			break;
-
-		case CALL_ORIGIN_INFO:
-			break;
-
-		case CALL_GSM_ALERTING_PATTERN:
-			break;
-
-		case CALL_ALERTING_INFO:
-			break;
-		}
-	}
-
-	if (cssi != -1)
-		ofono_ssn_cssi_notify(ssn, cssi, index);
-
-	if (cssu != -1)
-		ofono_ssn_cssu_notify(ssn, cssu, index, &number);
-}
-
-static void reachable_cb(const GIsiMessage *msg, void *data)
-{
-	struct ofono_ssn *ssn = data;
-	struct ssn_data *sd = ofono_ssn_get_data(ssn);
-
-	if (g_isi_msg_error(msg) < 0)
-		return;
-
-	if (sd == NULL)
-		return;
-
-	ISI_VERSION_DBG(msg);
-
-	g_isi_client_ind_subscribe(sd->client, CALL_GSM_NOTIFICATION_IND,
-					notification_ind_cb, ssn);
-
-	ofono_ssn_register(ssn);
-}
-
-static int probe_by_resource(struct ofono_ssn *ssn, uint8_t resource,
-				void *user)
-{
-	GIsiModem *modem = user;
-	struct ssn_data *sd;
-
-	sd = g_try_new0(struct ssn_data, 1);
-	if (sd == NULL)
-		return -ENOMEM;
-
-	sd->client = g_isi_client_create(modem, resource);
-	if (sd->client == NULL) {
-		g_free(sd);
-		return -ENOMEM;
-	}
-
-	g_isi_client_verify(sd->client, reachable_cb, ssn, NULL);
-
-	ofono_ssn_set_data(ssn, sd);
-
-	return 0;
-}
-
-static int isi_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
-				void *user)
-{
-	return probe_by_resource(ssn, PN_CALL, user);
-}
-
-static int wg_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
-				void *user)
-{
-	return probe_by_resource(ssn, PN_MODEM_CALL, user);
-}
-
-static void isi_ssn_remove(struct ofono_ssn *ssn)
-{
-	struct ssn_data *data = ofono_ssn_get_data(ssn);
-
-	ofono_ssn_set_data(ssn, NULL);
-
-	if (data == NULL)
-		return;
-
-	g_isi_client_destroy(data->client);
-	g_free(data);
-}
-
-static struct ofono_ssn_driver driver = {
-		.name			= "isimodem",
-		.probe			= isi_ssn_probe,
-		.remove			= isi_ssn_remove
-};
-
-static struct ofono_ssn_driver wgdriver = {
-		.name			= "wgmodem2.5",
-		.probe			= wg_ssn_probe,
-		.remove			= isi_ssn_remove
-};
-
-void isi_ssn_init(void)
-{
-	ofono_ssn_driver_register(&driver);
-	ofono_ssn_driver_register(&wgdriver);
-}
-
-void isi_ssn_exit(void)
-{
-	ofono_ssn_driver_unregister(&driver);
-	ofono_ssn_driver_unregister(&wgdriver);
-}
diff --git a/include/ssn.h b/include/ssn.h
deleted file mode 100644
index d640cad9..00000000
--- a/include/ssn.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- *  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
- *
- */
-
-#ifndef __OFONO_SSN_H
-#define __OFONO_SSN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ofono/types.h>
-
-struct ofono_ssn;
-
-struct ofono_ssn_driver {
-	const char *name;
-	int (*probe)(struct ofono_ssn *ssn, unsigned int vendor, void *data);
-	void (*remove)(struct ofono_ssn *ssn);
-};
-
-/* SSN notifications (CSSI and CSSU).  */
-void ofono_ssn_cssi_notify(struct ofono_ssn *ssn, int code, int index);
-void ofono_ssn_cssu_notify(struct ofono_ssn *ssn, int code, int index,
-				const struct ofono_phone_number *number);
-
-int ofono_ssn_driver_register(const struct ofono_ssn_driver *d);
-void ofono_ssn_driver_unregister(const struct ofono_ssn_driver *d);
-
-struct ofono_ssn *ofono_ssn_create(struct ofono_modem *modem,
-					unsigned int vendor,
-					const char *driver, void *data);
-
-void ofono_ssn_register(struct ofono_ssn *ssn);
-void ofono_ssn_remove(struct ofono_ssn *ssn);
-
-void ofono_ssn_set_data(struct ofono_ssn *ssn, void *data);
-void *ofono_ssn_get_data(struct ofono_ssn *ssn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __OFONO_SSN_H */
diff --git a/plugins/calypso.c b/plugins/calypso.c
index 0e29256a..e0145810 100644
--- a/plugins/calypso.c
+++ b/plugins/calypso.c
@@ -52,7 +52,6 @@
 #include <ofono/phonebook.h>
 #include <ofono/sim.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 #include <ofono/stk.h>
@@ -534,7 +533,6 @@ static void calypso_post_sim(struct ofono_modem *modem)
 				data->dlcs[NETREG_DLC]);
 	ofono_call_meter_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_call_barring_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
-	ofono_ssn_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_call_volume_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 
 	mw = ofono_message_waiting_create(modem);
diff --git a/plugins/g1.c b/plugins/g1.c
index 22bacdc4..b8824634 100644
--- a/plugins/g1.c
+++ b/plugins/g1.c
@@ -45,7 +45,6 @@
 #include <ofono/phonebook.h>
 #include <ofono/sim.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 
@@ -184,7 +183,6 @@ static void g1_post_sim(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "atmodem", chat);
 	ofono_call_meter_create(modem, 0, "atmodem", chat);
 	ofono_call_barring_create(modem, 0, "atmodem", chat);
-	ofono_ssn_create(modem, 0, "atmodem", chat);
 	ofono_sms_create(modem, OFONO_VENDOR_QUALCOMM_MSM, "atmodem", chat);
 	ofono_phonebook_create(modem, 0, "atmodem", chat);
 
diff --git a/plugins/huawei.c b/plugins/huawei.c
index afa804d5..cb200c8e 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -48,7 +48,6 @@
 #include <ofono/call-forwarding.h>
 #include <ofono/call-settings.h>
 #include <ofono/call-barring.h>
-#include <ofono/ssn.h>
 #include <ofono/phonebook.h>
 #include <ofono/message-waiting.h>
 #include <ofono/log.h>
@@ -681,7 +680,6 @@ static void huawei_post_online(struct ofono_modem *modem)
 		ofono_call_forwarding_create(modem, 0, "atmodem", data->pcui);
 		ofono_call_settings_create(modem, 0, "atmodem", data->pcui);
 		ofono_call_barring_create(modem, 0, "atmodem", data->pcui);
-		ofono_ssn_create(modem, 0, "atmodem", data->pcui);
 
 		mw = ofono_message_waiting_create(modem);
 		if (mw)
diff --git a/plugins/ifx.c b/plugins/ifx.c
index 527a8c4d..37cd2bbd 100644
--- a/plugins/ifx.c
+++ b/plugins/ifx.c
@@ -47,7 +47,6 @@
 #include <ofono/call-settings.h>
 #include <ofono/call-volume.h>
 #include <ofono/message-waiting.h>
-#include <ofono/ssn.h>
 #include <ofono/sim.h>
 #include <ofono/cbs.h>
 #include <ofono/sms.h>
@@ -717,7 +716,6 @@ static void ifx_post_online(struct ofono_modem *modem)
 	ofono_cbs_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_ussd_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 
-	ofono_ssn_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_call_settings_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_call_meter_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_call_barring_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
diff --git a/plugins/isiusb.c b/plugins/isiusb.c
index 2d17b434..7252d26a 100644
--- a/plugins/isiusb.c
+++ b/plugins/isiusb.c
@@ -46,7 +46,6 @@
 #include <ofono/cbs.h>
 #include <ofono/sim.h>
 #include <ofono/ussd.h>
-#include <ofono/ssn.h>
 #include <ofono/call-forwarding.h>
 #include <ofono/call-settings.h>
 #include <ofono/call-barring.h>
@@ -431,7 +430,6 @@ static void isiusb_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "wgmodem2.5", isi->modem);
 	ofono_sms_create(modem, 0, "isimodem", isi->modem);
 	ofono_cbs_create(modem, 0, "isimodem", isi->modem);
-	ofono_ssn_create(modem, 0, "isimodem", isi->modem);
 	ofono_ussd_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_settings_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_barring_create(modem, 0, "isimodem", isi->modem);
diff --git a/plugins/linktop.c b/plugins/linktop.c
index 2fb3896c..953f6340 100644
--- a/plugins/linktop.c
+++ b/plugins/linktop.c
@@ -44,7 +44,6 @@
 #include <ofono/sim.h>
 #include <ofono/cbs.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/call-volume.h>
 #include <ofono/voicecall.h>
@@ -313,7 +312,6 @@ static void linktop_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, OFONO_VENDOR_MBM, "atmodem", data->control);
 	ofono_call_meter_create(modem, 0, "atmodem", data->control);
 	ofono_call_barring_create(modem, 0, "atmodem", data->control);
-	ofono_ssn_create(modem, 0, "atmodem", data->control);
 	ofono_call_volume_create(modem, 0, "atmodem", data->control);
 	ofono_cbs_create(modem, 0, "atmodem", data->control);
 
diff --git a/plugins/n900.c b/plugins/n900.c
index c6852663..b6af2cb2 100644
--- a/plugins/n900.c
+++ b/plugins/n900.c
@@ -45,7 +45,6 @@
 #include <ofono/cbs.h>
 #include <ofono/sim.h>
 #include <ofono/ussd.h>
-#include <ofono/ssn.h>
 #include <ofono/call-forwarding.h>
 #include <ofono/call-settings.h>
 #include <ofono/call-barring.h>
@@ -509,7 +508,6 @@ static void n900_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "isimodem", isi->modem);
 	ofono_sms_create(modem, 0, "isimodem", isi->modem);
 	ofono_cbs_create(modem, 0, "isimodem", isi->modem);
-	ofono_ssn_create(modem, 0, "isimodem", isi->modem);
 	ofono_ussd_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_settings_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_barring_create(modem, 0, "isimodem", isi->modem);
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 2b36fe0c..76832dd5 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -54,7 +54,6 @@
 #include <ofono/sim.h>
 #include <ofono/stk.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 #include <ofono/gprs.h>
@@ -651,7 +650,6 @@ static void phonesim_post_online(struct ofono_modem *modem)
 
 	ofono_call_meter_create(modem, 0, "atmodem", data->chat);
 	ofono_call_barring_create(modem, 0, "atmodem", data->chat);
-	ofono_ssn_create(modem, 0, "atmodem", data->chat);
 	ofono_call_volume_create(modem, 0, "atmodem", data->chat);
 
 	if (!data->calypso)
diff --git a/plugins/ste.c b/plugins/ste.c
index efae5737..36b31484 100644
--- a/plugins/ste.c
+++ b/plugins/ste.c
@@ -50,7 +50,6 @@
 #include <ofono/sim.h>
 #include <ofono/cbs.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/call-volume.h>
 #include <ofono/voicecall.h>
@@ -470,7 +469,6 @@ static void ste_post_online(struct ofono_modem *modem)
 					"atmodem", data->chat[AT_NET]);
 	ofono_call_meter_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]);
 	ofono_call_barring_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]);
-	ofono_ssn_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]);
 	ofono_call_volume_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]);
 	ofono_cbs_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]);
 
diff --git a/plugins/tc65.c b/plugins/tc65.c
index f58f33de..257113e8 100644
--- a/plugins/tc65.c
+++ b/plugins/tc65.c
@@ -44,7 +44,6 @@
 #include <ofono/phonebook.h>
 #include <ofono/sim.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 
@@ -208,7 +207,6 @@ static void tc65_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "atmodem", chat);
 	ofono_call_meter_create(modem, 0, "atmodem", chat);
 	ofono_call_barring_create(modem, 0, "atmodem", chat);
-	ofono_ssn_create(modem, 0, "atmodem", chat);
 
 	gprs = ofono_gprs_create(modem, 0, "atmodem", chat);
 	gc = ofono_gprs_context_create(modem, 0, "atmodem", chat);
diff --git a/plugins/u8500.c b/plugins/u8500.c
index 73bd9b16..d47d8545 100644
--- a/plugins/u8500.c
+++ b/plugins/u8500.c
@@ -48,7 +48,6 @@
 #include <ofono/cbs.h>
 #include <ofono/sim.h>
 #include <ofono/ussd.h>
-#include <ofono/ssn.h>
 #include <ofono/call-forwarding.h>
 #include <ofono/call-settings.h>
 #include <ofono/call-barring.h>
@@ -460,7 +459,6 @@ static void u8500_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "wgmodem2.5", isi->modem);
 	ofono_sms_create(modem, 0, "isimodem", isi->modem);
 	ofono_cbs_create(modem, 0, "isimodem", isi->modem);
-	ofono_ssn_create(modem, 0, "wgmodem2.5", isi->modem);
 	ofono_ussd_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_settings_create(modem, 0, "isimodem", isi->modem);
 	ofono_call_barring_create(modem, 0, "isimodem", isi->modem);
diff --git a/plugins/wavecom.c b/plugins/wavecom.c
index cb55f850..4d234e4b 100644
--- a/plugins/wavecom.c
+++ b/plugins/wavecom.c
@@ -44,7 +44,6 @@
 #include <ofono/phonebook.h>
 #include <ofono/sim.h>
 #include <ofono/sms.h>
-#include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 
@@ -156,7 +155,6 @@ static void wavecom_post_sim(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "atmodem", chat);
 	ofono_call_meter_create(modem, 0, "atmodem", chat);
 	ofono_call_barring_create(modem, 0, "atmodem", chat);
-	ofono_ssn_create(modem, 0, "atmodem", chat);
 	ofono_sms_create(modem, 0, "atmodem", chat);
 	ofono_phonebook_create(modem, 0, "atmodem", chat);
 
diff --git a/src/ofono.h b/src/ofono.h
index 995a1a57..1628df3b 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -346,23 +346,6 @@ struct sms;
 int __ofono_sms_sim_download(struct ofono_stk *stk, const struct sms *msg,
 				__ofono_sms_sim_download_cb_t cb, void *data);
 
-#include <ofono/ssn.h>
-
-typedef void (*ofono_ssn_mo_notify_cb)(int index, void *user);
-typedef void (*ofono_ssn_mt_notify_cb)(int index,
-					const struct ofono_phone_number *ph,
-					void *user);
-
-unsigned int __ofono_ssn_mo_watch_add(struct ofono_ssn *ssn, int code1,
-					ofono_ssn_mo_notify_cb cb, void *user,
-					ofono_destroy_func destroy);
-gboolean __ofono_ssn_mo_watch_remove(struct ofono_ssn *ssn, unsigned int id);
-
-unsigned int __ofono_ssn_mt_watch_add(struct ofono_ssn *ssn, int code2,
-					ofono_ssn_mt_notify_cb cb, void *user,
-					ofono_destroy_func destroy);
-gboolean __ofono_ssn_mt_watch_remove(struct ofono_ssn *ssn, unsigned int id);
-
 #include <ofono/ussd.h>
 
 typedef gboolean (*ofono_ussd_ssc_cb_t)(int type,
diff --git a/src/ssn.c b/src/ssn.c
deleted file mode 100644
index 64c94b78..00000000
--- a/src/ssn.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *
- *  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
-
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <glib.h>
-
-#include "ofono.h"
-
-#include "common.h"
-
-static GSList *g_drivers = NULL;
-
-struct ssn_handler {
-	struct ofono_watchlist_item item;
-	int code;
-};
-
-struct ofono_ssn {
-	struct ofono_watchlist *mo_handler_list;
-	struct ofono_watchlist *mt_handler_list;
-	const struct ofono_ssn_driver *driver;
-	void *driver_data;
-	struct ofono_atom *atom;
-};
-
-static unsigned int add_ssn_handler(struct ofono_watchlist *watchlist,
-					int code, void *notify, void *data,
-					ofono_destroy_func destroy)
-{
-	struct ssn_handler *handler;
-
-	if (notify == NULL)
-		return 0;
-
-	handler = g_new0(struct ssn_handler, 1);
-
-	handler->code = code;
-	handler->item.notify = notify;
-	handler->item.notify_data = data;
-	handler->item.destroy = destroy;
-
-	return __ofono_watchlist_add_item(watchlist,
-				(struct ofono_watchlist_item *)handler);
-}
-
-unsigned int __ofono_ssn_mo_watch_add(struct ofono_ssn *ssn, int code1,
-					ofono_ssn_mo_notify_cb cb, void *user,
-					ofono_destroy_func destroy)
-{
-	if (ssn == NULL)
-		return 0;
-
-	DBG("%p, %d", ssn, code1);
-
-	return add_ssn_handler(ssn->mo_handler_list, code1, cb, user, destroy);
-}
-
-gboolean __ofono_ssn_mo_watch_remove(struct ofono_ssn *ssn, unsigned int id)
-{
-	if (ssn == NULL)
-		return FALSE;
-
-	DBG("%p, %u", ssn, id);
-
-	return __ofono_watchlist_remove_item(ssn->mo_handler_list, id);
-}
-
-unsigned int __ofono_ssn_mt_watch_add(struct ofono_ssn *ssn, int code2,
-					ofono_ssn_mt_notify_cb cb, void *user,
-					ofono_destroy_func destroy)
-{
-	if (ssn == NULL)
-		return 0;
-
-	DBG("%p, %d", ssn, code2);
-
-	return add_ssn_handler(ssn->mt_handler_list, code2, cb, user, destroy);
-}
-
-gboolean __ofono_ssn_mt_watch_remove(struct ofono_ssn *ssn, unsigned int id)
-{
-	if (ssn == NULL)
-		return FALSE;
-
-	DBG("%p, %u", ssn, id);
-
-	return __ofono_watchlist_remove_item(ssn->mt_handler_list, id);
-}
-
-void ofono_ssn_cssi_notify(struct ofono_ssn *ssn, int code1, int index)
-{
-	struct ssn_handler *h;
-	GSList *l;
-	ofono_ssn_mo_notify_cb notify;
-
-	for (l = ssn->mo_handler_list->items; l; l = l->next) {
-		h = l->data;
-		notify = h->item.notify;
-
-		if (h->code == code1)
-			notify(index, h->item.notify_data);
-	}
-}
-
-void ofono_ssn_cssu_notify(struct ofono_ssn *ssn, int code2, int index,
-				const struct ofono_phone_number *ph)
-{
-	struct ssn_handler *h;
-	GSList *l;
-	ofono_ssn_mt_notify_cb notify;
-
-	for (l = ssn->mt_handler_list->items; l; l = l->next) {
-		h = l->data;
-		notify = h->item.notify;
-
-		if (h->code == code2)
-			notify(index, ph, h->item.notify_data);
-	}
-}
-
-int ofono_ssn_driver_register(const struct ofono_ssn_driver *d)
-{
-	DBG("driver: %p, name: %s", d, d->name);
-
-	if (d->probe == NULL)
-		return -EINVAL;
-
-	g_drivers = g_slist_prepend(g_drivers, (void *) d);
-
-	return 0;
-}
-
-void ofono_ssn_driver_unregister(const struct ofono_ssn_driver *d)
-{
-	DBG("driver: %p, name: %s", d, d->name);
-
-	g_drivers = g_slist_remove(g_drivers, (void *) d);
-}
-
-static void ssn_unregister(struct ofono_atom *atom)
-{
-	struct ofono_ssn *ssn = __ofono_atom_get_data(atom);
-
-	__ofono_watchlist_free(ssn->mo_handler_list);
-	ssn->mo_handler_list = NULL;
-
-	__ofono_watchlist_free(ssn->mt_handler_list);
-	ssn->mt_handler_list = NULL;
-}
-
-static void ssn_remove(struct ofono_atom *atom)
-{
-	struct ofono_ssn *ssn = __ofono_atom_get_data(atom);
-
-	DBG("atom: %p", atom);
-
-	if (ssn == NULL)
-		return;
-
-	if (ssn->driver && ssn->driver->remove)
-		ssn->driver->remove(ssn);
-
-	g_free(ssn);
-}
-
-struct ofono_ssn *ofono_ssn_create(struct ofono_modem *modem,
-					unsigned int vendor,
-					const char *driver,
-					void *data)
-{
-	struct ofono_ssn *ssn;
-	GSList *l;
-
-	if (driver == NULL)
-		return NULL;
-
-	ssn = g_try_new0(struct ofono_ssn, 1);
-
-	if (ssn == NULL)
-		return NULL;
-
-	ssn->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_SSN,
-						ssn_remove, ssn);
-
-	for (l = g_drivers; l; l = l->next) {
-		const struct ofono_ssn_driver *drv = l->data;
-
-		if (g_strcmp0(drv->name, driver))
-			continue;
-
-		if (drv->probe(ssn, vendor, data) < 0)
-			continue;
-
-		ssn->driver = drv;
-		break;
-	}
-
-	return ssn;
-}
-
-void ofono_ssn_register(struct ofono_ssn *ssn)
-{
-	ssn->mo_handler_list = __ofono_watchlist_new(g_free);
-	ssn->mt_handler_list = __ofono_watchlist_new(g_free);
-
-	__ofono_atom_register(ssn->atom, ssn_unregister);
-}
-
-void ofono_ssn_remove(struct ofono_ssn *ssn)
-{
-	__ofono_atom_free(ssn->atom);
-}
-
-void ofono_ssn_set_data(struct ofono_ssn *ssn, void *data)
-{
-	ssn->driver_data = data;
-}
-
-void *ofono_ssn_get_data(struct ofono_ssn *ssn)
-{
-	return ssn->driver_data;
-}