Remove outdated modem helper library

3 files changed, 1 insertions, 496 deletions

diff --git a/plugins/hso.c b/plugins/hso.c
index 21df00df..0afff30c 100644
--- a/plugins/hso.c
+++ b/plugins/hso.c
@@ -32,98 +32,10 @@
 #define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
 #include <connman/device.h>
-#include <connman/resolver.h>
 #include <connman/log.h>
 
-#include "modem.h"
-
 struct hso_data {
 	int index;
-	struct modem_data *modem;
-};
-
-static void owandata_callback(const char *buf, void *user_data)
-{
-	//struct hso_data *data = user_data;
-	char *str, ip[16], nm[16], ns1[16], ns2[16], ns3[16], ns4[16], val[20];
-	int err, num;
-
-	str = g_strrstr(buf, "_OWANDATA");
-	if (str == NULL || strstr(buf, "ERROR") != NULL)
-		return;
-
-	err = sscanf(str, "_OWANDATA: %d, %[^,], %[^,], "
-					"%[^,], %[^,], %[^,], %[^,], %s",
-				&num, ip, nm, ns1, ns2, ns3, ns4, val);
-
-	if (err != 8) {
-		DBG("parsed %d arguments", err);
-		return;
-	}
-
-	DBG("ip %s dns %s %s val %s", ip, ns1, ns2, val);
-
-	//connman_resolver_append(data->iface, NULL, ns1);
-	//connman_resolver_append(data->iface, NULL, ns2);
-}
-
-static void owancall_callback(const char *buf, void *user_data)
-{
-	struct hso_data *data = user_data;
-
-	DBG("");
-
-	if (g_strrstr(buf, "_OWANCALL: 1, 3") != NULL) {
-		DBG("%s", buf);
-		//modem_command(modem, owancall_callback, data,
-		//			"_OWANCALL", "%d,%d,%d", 1, 1, 1);
-	}
-
-	if (g_strrstr(buf, "_OWANCALL: 1, 1") != NULL) {
-		DBG("%s", buf);
-		modem_command(data->modem, owandata_callback, data,
-						"_OWANDATA", "%d", 1);
-	}
-
-	if (g_strrstr(buf, "\r\nOK\r\n") != NULL) {
-		modem_command(data->modem, owandata_callback, data,
-						"_OWANDATA", "%d", 1);
-	}
-}
-
-static int network_probe(struct connman_network *network)
-{
-	DBG("network %p", network);
-
-	return 0;
-}
-
-static void network_remove(struct connman_network *network)
-{
-	DBG("network %p", network);
-}
-
-static int network_connect(struct connman_network *network)
-{
-	DBG("network %p", network);
-
-	return 0;
-}
-
-static int network_disconnect(struct connman_network *network)
-{
-	DBG("network %p", network);
-
-	return 0;
-}
-
-static struct connman_network_driver network_driver = {
-	.name		= "hso-network",
-	.type		= CONNMAN_NETWORK_TYPE_HSO,
-	.probe		= network_probe,
-	.remove		= network_remove,
-	.connect	= network_connect,
-	.disconnect	= network_disconnect,
 };
 
 static int hso_probe(struct connman_device *device)
@@ -138,17 +50,8 @@ static int hso_probe(struct connman_device *device)
 
 	data->index = connman_device_get_index(device);
 
-	data->modem = modem_create("/dev/ttyHS0");
-	if (data->modem == NULL) {
-		g_free(data);
-		return -EIO;
-	}
-
 	connman_device_set_data(device, data);
 
-	modem_add_callback(data->modem, "_OWANCALL",
-						owancall_callback, data);
-
 	return 0;
 }
 
@@ -160,53 +63,24 @@ static void hso_remove(struct connman_device *device)
 
 	connman_device_set_data(device, NULL);
 
-	modem_destroy(data->modem);
-
 	g_free(data);
 }
 
 static int hso_enable(struct connman_device *device)
 {
-	struct hso_data *data = connman_device_get_data(device);
-	struct connman_network *network;
-	int err;
-
 	DBG("device %p", device);
 
-	err = modem_open(data->modem);
-	if (err < 0)
-		return err;
-
 	connman_device_set_powered(device, TRUE);
 
-	modem_command(data->modem, NULL, NULL, "Z", NULL);
-	modem_command(data->modem, NULL, NULL, "I", NULL);
-
-	modem_command(data->modem, owancall_callback, data,
-					"_OWANCALL", "%d,%d,%d", 1, 1, 1);
-
-	network = connman_network_create("internet", CONNMAN_NETWORK_TYPE_HSO);
-	connman_device_add_network(device, network);
-
 	return 0;
 }
 
 static int hso_disable(struct connman_device *device)
 {
-	struct hso_data *data = connman_device_get_data(device);
-	//const char *iface = connman_device_get_interface(device);
-
 	DBG("device %p", device);
 
-	//connman_resolver_remove_all(iface);
-
-	modem_command(data->modem, owancall_callback, data,
-					"_OWANCALL", "%d,%d,%d", 1, 0, 0);
-
 	connman_device_set_powered(device, FALSE);
 
-	modem_close(data->modem);
-
 	return 0;
 }
 
@@ -221,25 +95,12 @@ static struct connman_device_driver hso_driver = {
 
 static int hso_init(void)
 {
-	int err;
-
-	err = connman_network_driver_register(&network_driver);
-	if (err < 0)
-		return err;
-
-	err = connman_device_driver_register(&hso_driver);
-	if (err < 0) {
-		connman_network_driver_unregister(&network_driver);
-		return err;
-	}
-
-	return 0;
+	return connman_device_driver_register(&hso_driver);
 }
 
 static void hso_exit(void)
 {
 	connman_device_driver_unregister(&hso_driver);
-	connman_network_driver_register(&network_driver);
 }
 
 CONNMAN_PLUGIN_DEFINE(hso, "Option HSO device plugin", VERSION,
diff --git a/plugins/modem.c b/plugins/modem.c
deleted file mode 100644
index 4c8a3e3d..00000000
--- a/plugins/modem.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2007-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
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-#include <termios.h>
-
-#include <glib.h>
-
-#include <connman/log.h>
-
-#include "modem.h"
-
-struct modem_data {
-	char *device;
-	GIOChannel *channel;
-	guint watch;
-	GSList *callbacks;
-	GSList *commands;
-	char buf[1024];
-	int offset;
-};
-
-struct modem_callback {
-	char *command;
-	modem_cb_t function;
-	void *user_data;
-};
-
-struct modem_cmd {
-	char *cmd;
-	char *arg;
-	modem_cb_t callback;
-	void *user_data;
-};
-
-static int send_command(struct modem_data *modem, struct modem_cmd *cmd)
-{
-	char *buf;
-	int fd, err;
-
-	if (cmd->arg == NULL) {
-		DBG("AT%s", cmd->cmd);
-		buf = g_strdup_printf("AT%s\r\n", cmd->cmd);
-	} else {
-		DBG("AT%s=%s", cmd->cmd, cmd->arg);
-		buf = g_strdup_printf("AT%s=%s\r\n", cmd->cmd, cmd->arg);
-	}
-
-	fd = g_io_channel_unix_get_fd(modem->channel);
-	err = write(fd, buf, strlen(buf));
-
-	fsync(fd);
-
-	g_free(buf);
-
-	return err;
-}
-
-static int queue_command(struct modem_data *modem, struct modem_cmd *cmd)
-{
-	modem->commands = g_slist_append(modem->commands, cmd);
-
-	if (g_slist_length(modem->commands) > 1)
-		return 0;
-
-	return send_command(modem, cmd);
-}
-
-struct modem_data *modem_create(const char *device)
-{
-	struct modem_data *modem;
-
-	DBG("device %s", device);
-
-	modem = g_try_new0(struct modem_data, 1);
-	if (modem == NULL)
-		return NULL;
-
-	modem->device = g_strdup(device);
-
-	DBG("modem %p", modem);
-
-	return modem;
-}
-
-void modem_destroy(struct modem_data *modem)
-{
-	DBG("modem %p", modem);
-
-	if (modem == NULL)
-		return;
-
-	g_free(modem->device);
-	g_free(modem);
-}
-
-static gboolean modem_event(GIOChannel *channel,
-				GIOCondition condition, gpointer user_data)
-{
-	struct modem_data *modem = user_data;
-	struct modem_cmd *cmd;
-	GSList *list;
-	gsize len;
-	GIOError err;
-
-	if (condition & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
-		return FALSE;
-
-	err = g_io_channel_read(channel, modem->buf + modem->offset,
-				sizeof(modem->buf) - modem->offset, &len);
-	if (err) {
-		if (err == G_IO_ERROR_AGAIN)
-			return TRUE;
-		return FALSE;
-	}
-
-	DBG("Read %zu bytes (offset %d)", len, modem->offset);
-
-	if (g_str_has_suffix(modem->buf, "\r\n") == TRUE) {
-		for (list = modem->callbacks; list; list = list->next) {
-			struct modem_callback *callback = list->data;
-
-			if (callback->function == NULL)
-				continue;
-
-			if (g_strrstr(modem->buf, callback->command) != NULL)
-				callback->function(modem->buf,
-							callback->user_data);
-		}
-	}
-
-	if (g_strrstr(modem->buf, "\r\nERROR\r\n") == NULL &&
-				g_strrstr(modem->buf, "\r\nOK\r\n") == NULL) {
-		modem->offset += len;
-		return TRUE;
-	}
-
-	memset(modem->buf, 0, sizeof(modem->buf));
-	modem->offset = 0;
-
-	cmd = g_slist_nth_data(modem->commands, 0);
-	if (cmd == NULL)
-		return TRUE;
-
-	modem->commands = g_slist_remove(modem->commands, cmd);
-
-	DBG("AT%s", cmd->cmd);
-
-	if (cmd->callback)
-		cmd->callback(modem->buf, cmd->user_data);
-
-	g_free(cmd->arg);
-	g_free(cmd->cmd);
-	g_free(cmd);
-
-	cmd = g_slist_nth_data(modem->commands, 0);
-	if (cmd == NULL)
-		return TRUE;
-
-	send_command(modem, cmd);
-
-	return TRUE;
-}
-
-static int open_device(const char *device)
-{
-	struct termios ti;
-	int fd;
-
-	fd = open(device, O_RDWR | O_NOCTTY);
-	if (fd < 0)
-		return -1;
-
-	tcflush(fd, TCIOFLUSH);
-
-	/* Switch TTY to raw mode */
-	memset(&ti, 0, sizeof(ti));
-	cfmakeraw(&ti);
-
-	tcsetattr(fd, TCSANOW, &ti);
-
-	return fd;
-}
-
-int modem_open(struct modem_data *modem)
-{
-	int fd, try = 5;
-
-	DBG("modem %p", modem);
-
-	if (modem == NULL)
-		return -ENOENT;
-
-	while (try-- > 0) {
-		fd = open_device(modem->device);
-		if (fd < 0) {
-			sleep(1);
-			continue;
-		}
-		try = 0;
-	}
-
-	if (fd < 0) {
-		connman_error("Can't open %s device", modem->device);
-		return -EIO;
-	}
-
-	modem->channel = g_io_channel_unix_new(fd);
-	g_io_channel_set_close_on_unref(modem->channel, TRUE);
-
-	modem->watch = g_io_add_watch(modem->channel,
-				G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
-							modem_event, modem);
-
-	return 0;
-}
-
-int modem_close(struct modem_data *modem)
-{
-	DBG("modem %p", modem);
-
-	if (modem == NULL)
-		return -ENOENT;
-
-	g_source_remove(modem->watch);
-	modem->watch = 0;
-
-	g_io_channel_unref(modem->channel);
-	modem->channel = NULL;
-
-	return 0;
-}
-
-int modem_add_callback(struct modem_data *modem, const char *command,
-					modem_cb_t function, void *user_data)
-{
-	struct modem_callback *callback;
-
-	callback = g_try_new0(struct modem_callback, 1);
-	if (callback == NULL)
-		return -ENOMEM;
-
-	callback->command   = g_strdup(command);
-	callback->function  = function;
-	callback->user_data = user_data;
-
-	modem->callbacks = g_slist_append(modem->callbacks, callback);
-
-	return 0;
-}
-
-static int modem_command_valist(struct modem_data *modem, modem_cb_t callback,
-					void *user_data, const char *command,
-					const char *format, va_list var_args)
-{
-	struct modem_cmd *cmd;
-
-	cmd = g_try_new0(struct modem_cmd, 1);
-	if (cmd == NULL)
-		return -ENOMEM;
-
-	cmd->cmd = g_strdup(command);
-	if (format != NULL)
-		cmd->arg = g_strdup_vprintf(format, var_args);
-
-	cmd->callback  = callback;
-	cmd->user_data = user_data;
-
-	return queue_command(modem, cmd);
-}
-
-int modem_command(struct modem_data *modem,
-				modem_cb_t callback, void *user_data,
-				const char *command, const char *format, ...)
-{
-	va_list args;
-	int err;
-
-	DBG("modem %p", modem);
-
-	if (modem == NULL)
-		return -ENOENT;
-
-	va_start(args, format);
-	err = modem_command_valist(modem, callback, user_data,
-						command, format, args);
-	va_end(args);
-
-	return err;
-}
diff --git a/plugins/modem.h b/plugins/modem.h
deleted file mode 100644
index f26425cf..00000000
--- a/plugins/modem.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2007-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
- *
- */
-
-typedef struct modem_data modem_t;
-
-struct modem_data;
-
-struct modem_data *modem_create(const char *device);
-void modem_destroy(struct modem_data *modem);
-
-int modem_open(struct modem_data *modem);
-int modem_close(struct modem_data *modem);
-
-typedef void (* modem_cb_t) (const char *buf, void *user_data);
-
-int modem_add_callback(struct modem_data *modem, const char *command,
-					modem_cb_t function, void *user_data);
-
-int modem_command(struct modem_data *modem,
-				modem_cb_t callback, void *user_data,
-				const char *command, const char *format, ...);