[PATCH 4/5] cdmagen: Add CDMA MO Call Support

[PATCH 4/5] cdmagen: Add CDMA MO Call Support

[Dara Spieker-Doyle]

[-- Attachment #1: Type: text/plain, Size: 8955 bytes --]

---
 Makefile.am         |    3 +
 plugins/cdmagen.c   |  276 +++++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/ofono.rules |    4 +
 plugins/udev.c      |   21 ++++
 4 files changed, 304 insertions(+), 0 deletions(-)
 create mode 100644 plugins/cdmagen.c

diff --git a/Makefile.am b/Makefile.am
index 9aac08b..929ce63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,6 +293,9 @@ builtin_sources += plugins/ste.c
 
 builtin_modules += caif
 builtin_sources += plugins/caif.c
+
+builtin_modules += cdmagen
+builtin_sources += plugins/cdmagen.c
 endif
 
 if MAINTAINER_MODE
diff --git a/plugins/cdmagen.c b/plugins/cdmagen.c
new file mode 100644
index 0000000..41a4bd2
--- /dev/null
+++ b/plugins/cdmagen.c
@@ -0,0 +1,276 @@
+/*
+ * This file is part of oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Nokia 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 <stdlib.h>
+#include <errno.h>
+#include <termios.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <glib.h>
+#include <gatchat.h>
+#include <gattty.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/devinfo.h>
+#include <ofono/cdma-voicecall.h>
+
+#include <drivers/cdma-atmodem/atutil.h>
+
+#include "common.h"
+
+struct cdmagen_data {
+	GAtChat *chat;
+	ofono_bool_t online;
+	ofono_bool_t registration_status;
+};
+
+static void cdmagen_debug(const char *str, void *data)
+{
+	const char *prefix = data;
+
+	ofono_info("%s%s", prefix, str);
+}
+
+static int cdmagen_probe(struct ofono_modem *modem)
+{
+	struct cdmagen_data *data;
+
+	DBG("%p", modem);
+
+	data = g_try_new0(struct cdmagen_data, 1);
+	if (data == NULL)
+		return -ENOMEM;
+
+	ofono_modem_set_data(modem, data);
+
+	return 0;
+}
+
+static void cdmagen_remove(struct ofono_modem *modem)
+{
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_modem_set_data(modem, NULL);
+
+	if (data->chat)
+		g_at_chat_unref(data->chat);
+
+	g_free(data);
+}
+
+static GAtChat *create_port(const char *device)
+{
+	GAtSyntax *syntax;
+	GIOChannel *channel;
+	GAtChat *chat;
+
+	channel = g_at_tty_open(device, NULL);
+	if (channel == NULL)
+		return NULL;
+
+	syntax = g_at_syntax_new_gsmv1();
+
+	chat = g_at_chat_new(channel, syntax);
+	g_at_syntax_unref(syntax);
+	g_io_channel_unref(channel);
+
+	if (chat == NULL)
+		return NULL;
+
+	return chat;
+}
+
+static GAtChat *open_device(struct ofono_modem *modem,
+				const char *key, char *debug)
+{
+	const char *device;
+	GAtChat *chat;
+
+	device = ofono_modem_get_string(modem, key);
+	if (device == NULL)
+		return NULL;
+
+	DBG("%s %s", key, device);
+
+	chat = create_port(device);
+	if (chat == NULL)
+		return NULL;
+
+	g_at_chat_add_terminator(chat, "COMMAND NOT SUPPORT", -1, FALSE);
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(chat, cdmagen_debug, debug);
+
+	return chat;
+}
+
+static void cdmagen_disconnect(gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	g_at_chat_unref(data->chat);
+	data->chat = NULL;
+
+	data->chat = open_device(modem, "Device", "CDMA Device: ");
+	if (data->chat == NULL)
+		return;
+
+	g_at_chat_set_disconnect_function(data->chat,
+			cdmagen_disconnect, modem);
+}
+
+/* power up hardware */
+static int cdmagen_enable(struct ofono_modem *modem)
+{
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_modem_set_boolean(modem, "no_sim_required", TRUE);
+
+	data->chat = open_device(modem, "Device", "CDMA Device: ");
+	if (data->chat == NULL)
+		return -EINVAL;
+
+	g_at_chat_set_disconnect_function(data->chat,
+			cdmagen_disconnect, modem);
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(data->chat, cdmagen_debug,
+				"CDMA Generic: ");
+
+	return 0;
+}
+
+static int cdmagen_disable(struct ofono_modem *modem)
+{
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	if (data->chat) {
+		g_at_chat_cancel_all(data->chat);
+		g_at_chat_unregister_all(data->chat);
+		g_at_chat_unref(data->chat);
+		data->chat = NULL;
+	}
+
+	return 0;
+}
+
+static void cdmagen_pre_sim(struct ofono_modem *modem)
+{
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+
+	ofono_devinfo_create(modem, 0, "cdma-atmodem", data->chat);
+	ofono_cdma_voicecall_manager_create(modem, 0, "cdma-atmodem",
+				data->chat);
+}
+
+static void cdmagen_post_sim(struct ofono_modem *modem)
+{
+}
+
+static gboolean cdmagen_set_online_cb(gpointer cb_data)
+{
+	struct cb_data *cbd = cb_data;
+	ofono_modem_online_cb_t cb = cbd->cb;
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+
+	g_free(cbd);
+
+	/* do not call again */
+	return FALSE;
+}
+
+static void cdmagen_set_online(struct ofono_modem *modem, ofono_bool_t online,
+				ofono_modem_online_cb_t cb, void *user_data)
+{
+	struct cdmagen_data *data = ofono_modem_get_data(modem);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("modem %p %s", modem, online ? "online" : "offline");
+
+	if (cbd == NULL)
+		goto error;
+
+	data->online = online;
+
+	if (online)
+		data->registration_status =
+		    NETWORK_REGISTRATION_STATUS_REGISTERED;
+
+	cdmagen_set_online_cb(cbd);
+	return;
+
+error:
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void cdmagen_post_online(struct ofono_modem *modem)
+{
+	DBG("%p", modem);
+}
+
+static struct ofono_modem_driver cdmagen_driver = {
+	.name			= "cdmagen",
+	.probe			= cdmagen_probe,
+	.remove			= cdmagen_remove,
+	.enable			= cdmagen_enable,
+	.disable		= cdmagen_disable,
+	.pre_sim		= cdmagen_pre_sim,
+	.post_sim		= cdmagen_post_sim,
+	.set_online		= cdmagen_set_online,
+	.post_online	= cdmagen_post_online,
+};
+
+static int cdmagen_init(void)
+{
+	return ofono_modem_driver_register(&cdmagen_driver);
+}
+
+static void cdmagen_exit(void)
+{
+	ofono_modem_driver_unregister(&cdmagen_driver);
+}
+
+OFONO_PLUGIN_DEFINE(cdmagen, "Generic CDMA AT Modem", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT,
+			cdmagen_init, cdmagen_exit)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index da8a8ef..34698f0 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -429,6 +429,10 @@ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1311", ENV{OFONO_DRIVER}="mbm"
 # Nokia Internet Stick CS-10
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="060e", ENV{OFONO_DRIVER}="nokia"
 
+# Nokia CDMA Device
+ATTRS{idVendor}=="0421", ATTRS{idProduct}=="023e", ENV{OFONO_DRIVER}="cdmagen"
+ATTRS{idVendor}=="0421", ATTRS{idProduct}=="00b6", ENV{OFONO_DRIVER}="cdmagen"
+
 # Nokia Internet Stick CS-17
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="0623", ENV{OFONO_DRIVER}="nokia"
 
diff --git a/plugins/udev.c b/plugins/udev.c
index 255755e..e9541ac 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -449,6 +449,25 @@ static void add_isi(struct ofono_modem *modem,
 	ofono_modem_register(modem);
 }
 
+static void add_cdmagen(struct ofono_modem *modem,
+					struct udev_device *udev_device)
+{
+	const char *devnode;
+	int registered;
+
+	DBG("modem %p", modem);
+
+	devnode = udev_device_get_devnode(udev_device);
+
+	registered = ofono_modem_get_integer(modem, "Registered");
+	if (registered != 0)
+		return;
+
+	ofono_modem_set_string(modem, "Device", devnode);
+	ofono_modem_set_integer(modem, "Registered", 1);
+	ofono_modem_register(modem);
+}
+
 static void add_modem(struct udev_device *udev_device)
 {
 	struct ofono_modem *modem;
@@ -533,6 +552,8 @@ done:
 		add_isi(modem, udev_device);
 	else if (g_strcmp0(driver, "n900") == 0)
 		add_isi(modem, udev_device);
+	else if (g_strcmp0(driver, "cdmagen") == 0)
+		add_cdmagen(modem, udev_device);
 }
 
 static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
-- 
1.7.0.4

Re: [PATCH 4/5] cdmagen: Add CDMA MO Call Support

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

Hi Dara,

On 12/02/2010 05:31 PM, Dara Spieker-Doyle wrote:
> ---
>  Makefile.am         |    3 +
>  plugins/cdmagen.c   |  276 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  plugins/ofono.rules |    4 +

I'd really prefer ofono.rules chunk to be in a separate patch

>  plugins/udev.c      |   21 ++++

And the changes to udev to be in a separate patch as well.

>  4 files changed, 304 insertions(+), 0 deletions(-)
>  create mode 100644 plugins/cdmagen.c
> 

Regards,
-Denis