Remove org.ofono.at.Manager

1 files changed, 0 insertions, 313 deletions

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index a8eb1dc7..c2324e5d 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -31,49 +31,8 @@
 
 #include <ofono/plugin.h>
 #include <ofono/log.h>
-#include <ofono/dbus.h>
 #include <ofono/modem.h>
-#include <ofono/call-barring.h>
-#include <ofono/call-forwarding.h>
-#include <ofono/call-meter.h>
-#include <ofono/call-settings.h>
-#include <ofono/devinfo.h>
-#include <ofono/message-waiting.h>
-#include <ofono/netreg.h>
-#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 "at.h"
-#include "session.h"
-
-#define AT_MANAGER_INTERFACE "org.ofono.at.Manager"
-
-static GSList *g_sessions = NULL;
-static GSList *g_pending = NULL;
-
-DBusMessage *__ofono_error_invalid_args(DBusMessage *msg);
-DBusMessage *__ofono_error_invalid_format(DBusMessage *msg);
-DBusMessage *__ofono_error_failed(DBusMessage *msg);
-DBusMessage *__ofono_error_not_found(DBusMessage *msg);
-
-static void modem_list(const char ***modems)
-{
-	GSList *l;
-	int i;
-	struct at_data *at;
-
-	*modems = g_new0(const char *, g_slist_length(g_sessions) + 1);
-
-	for (l = g_sessions, i = 0; l; l = l->next, i++) {
-		at = l->data;
-
-		(*modems)[i] = ofono_modem_get_path(at->modem);
-	}
-}
 
 void dump_response(const char *func, gboolean ok, GAtResult *result)
 {
@@ -97,274 +56,8 @@ void decode_at_error(struct ofono_error *error, const char *final)
 	}
 }
 
-static void at_destroy(struct at_data *at)
-{
-	if (at->parser)
-		g_at_chat_unref(at->parser);
-
-	if (at->driver)
-		g_free(at->driver);
-
-	g_free(at);
-}
-
-static void manager_free(gpointer user)
-{
-	GSList *l;
-
-	for (l = g_pending; l; l = l->next)
-		g_io_channel_unref(l->data);
-
-	g_slist_free(g_pending);
-
-	for (l = g_sessions; l; l = l->next) {
-		struct at_data *at = l->data;
-
-		ofono_modem_unregister(at->modem);
-
-		at_destroy(at);
-	}
-
-	g_slist_free(g_sessions);
-}
-
-static void send_init_commands(const char *vendor, GAtChat *parser)
-{
-	if (!strcmp(vendor, "ti_calypso")) {
-		g_at_chat_set_wakeup_command(parser, "\r", 1000, 5000);
-
-		g_at_chat_send(parser, "AT%CUNS=0", NULL, NULL, NULL, NULL);
-		g_at_chat_send(parser, "AT+CFUN=1", NULL, NULL, NULL, NULL);
-	}
-}
-
-static void msg_destroy(gpointer user)
-{
-	DBusMessage *msg = user;
-
-	dbus_message_unref(msg);
-}
-
-static void at_debug(const char *str, gpointer user)
-{
-	ofono_debug("%s", str);
-}
-
-static void create_cb(GIOChannel *io, gboolean success, gpointer user)
-{
-	DBusConnection *conn = ofono_dbus_get_connection();
-	DBusMessage *msg = user;
-	DBusMessage *reply;
-	struct at_data *at = NULL;
-	const char *path;
-	const char *target, *driver;
-	const char **modems;
-	GAtSyntax *syntax;
-	struct ofono_message_waiting *mw;
-
-	g_pending = g_slist_remove(g_pending, io);
-
-	if (success == FALSE)
-		goto out;
-
-	syntax = g_at_syntax_new_gsmv1();
-
-	at = g_new0(struct at_data, 1);
-
-	at->parser = g_at_chat_new(io, syntax);
-	g_at_syntax_unref(syntax);
-
-	if (at->parser == NULL)
-		goto out;
-
-	if (getenv("OFONO_AT_DEBUG") != NULL)
-		g_at_chat_set_debug(at->parser, at_debug, NULL);
-
-	ofono_debug("Seting up AT channel");
-
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &target,
-				DBUS_TYPE_STRING, &driver, DBUS_TYPE_INVALID);
-
-	send_init_commands(driver, at->parser);
-
-	at->modem = ofono_modem_register();
-
-	if (!at->modem)
-		goto out;
-
-	ofono_modem_set_data(at->modem, at);
-
-	ofono_devinfo_create(at->modem, "generic_at", at->parser);
-	ofono_ussd_create(at->modem, "generic_at", at->parser);
-	ofono_sim_create(at->modem, "generic_at", at->parser);
-	ofono_call_forwarding_create(at->modem, "generic_at", at->parser);
-	ofono_call_settings_create(at->modem, "generic_at", at->parser);
-	ofono_netreg_create(at->modem, "generic_at", at->parser);
-	ofono_voicecall_create(at->modem, "generic_at", at->parser);
-	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);
-	ofono_sms_create(at->modem, "generic_at", at->parser);
-	ofono_phonebook_create(at->modem, "generic_at", at->parser);
-
-	mw = ofono_message_waiting_create(at->modem);
-	if (mw)
-		ofono_message_waiting_register(mw);
-
-	at->io = io;
-	at->driver = g_strdup(driver);
-
-	g_pending = g_slist_remove(g_pending, io);
-	g_sessions = g_slist_prepend(g_sessions, at);
-
-	path = ofono_modem_get_path(at->modem);
-
-	reply = dbus_message_new_method_return(msg);
-
-	dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path,
-					DBUS_TYPE_INVALID);
-
-	g_dbus_send_message(conn, reply);
-
-	modem_list(&modems);
-	ofono_dbus_signal_array_property_changed(conn, "/", AT_MANAGER_INTERFACE,
-						"Modems", DBUS_TYPE_OBJECT_PATH,
-						&modems);
-	g_free(modems);
-
-	return;
-
-out:
-	if (at)
-		at_destroy(at);
-
-	reply = __ofono_error_failed(msg);
-	g_dbus_send_message(conn, reply);
-}
-
-static DBusMessage *manager_create(DBusConnection *conn, DBusMessage *msg,
-					void *data)
-{
-	const char *target;
-	const char *driver;
-	GIOChannel *io;
-
-	if (!dbus_message_get_args(msg, NULL,
-					DBUS_TYPE_STRING, &target,
-					DBUS_TYPE_STRING, &driver,
-					DBUS_TYPE_INVALID))
-		return __ofono_error_invalid_args(msg);
-
-	io = modem_session_create(target, create_cb, msg, msg_destroy);
-
-	if (!io)
-		return __ofono_error_invalid_format(msg);
-
-	dbus_message_ref(msg);
-
-	g_pending = g_slist_prepend(g_pending, io);
-
-	return NULL;
-}
-
-static DBusMessage *manager_destroy(DBusConnection *conn, DBusMessage *msg,
-					void *data)
-{
-	const char *path;
-	GSList *l;
-
-	if (!dbus_message_get_args(msg, NULL,
-					DBUS_TYPE_OBJECT_PATH, &path,
-					DBUS_TYPE_INVALID))
-		return __ofono_error_invalid_args(msg);
-
-	for (l = g_sessions; l; l = l->next) {
-		struct at_data *at = l->data;
-		const char **modems;
-
-		if (strcmp(ofono_modem_get_path(at->modem), path))
-			continue;
-
-		ofono_modem_unregister(at->modem);
-
-		g_sessions = g_slist_remove(g_sessions, at);
-		at_destroy(at);
-
-		modem_list(&modems);
-		ofono_dbus_signal_array_property_changed(conn, "/",
-						AT_MANAGER_INTERFACE,
-						"Modems", DBUS_TYPE_OBJECT_PATH,
-						&modems);
-		g_free(modems);
-
-		return dbus_message_new_method_return(msg);
-	}
-
-	return __ofono_error_not_found(msg);
-}
-
-static DBusMessage *manager_get_properties(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessageIter iter;
-	DBusMessageIter dict;
-	DBusMessage *reply;
-	const char **modems;
-
-	reply = dbus_message_new_method_return(msg);
-
-	if (!reply)
-		return NULL;
-
-	modem_list(&modems);
-
-	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_open_container(&iter,  DBUS_TYPE_ARRAY,
-					OFONO_PROPERTIES_ARRAY_SIGNATURE,
-					&dict);
-
-	ofono_dbus_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH,
-					&modems);
-
-	g_free(modems);
-
-	dbus_message_iter_close_container(&iter, &dict);
-
-	return reply;
-}
-
-static GDBusMethodTable manager_methods[] = {
-	{ "Create",		"ss",	"o",		manager_create,
-							G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Destroy",		"o",	"",		manager_destroy },
-	{ "GetProperties",	"",	"a{sv}",	manager_get_properties },
-	{ }
-};
-
-static GDBusSignalTable manager_signals[] = {
-	{ "PropertyChanged",	"sv" },
-	{ }
-};
-
-static int manager_init(DBusConnection *conn)
-{
-	if (g_dbus_register_interface(conn, "/", AT_MANAGER_INTERFACE,
-					manager_methods, manager_signals,
-					NULL, NULL, manager_free) == FALSE)
-		return -1;
-
-	return 0;
-}
-
-static void manager_exit(DBusConnection *conn)
-{
-	g_dbus_unregister_interface(conn, "/", AT_MANAGER_INTERFACE);
-}
-
 static int atmodem_init(void)
 {
-	DBusConnection *conn = ofono_dbus_get_connection();
-
 	at_voicecall_init();
 	at_devinfo_init();
 	at_call_barring_init();
@@ -378,17 +71,11 @@ static int atmodem_init(void)
 	at_sim_init();
 	at_netreg_init();
 
-	manager_init(conn);
-
 	return 0;
 }
 
 static void atmodem_exit(void)
 {
-	DBusConnection *conn = ofono_dbus_get_connection();
-
-	manager_exit(conn);
-
 	at_sim_exit();
 	at_sms_exit();
 	at_ussd_exit();