[PATCH 1/3] plugin: Add plugin for Linktop LW27x data cards

[PATCH 1/3] plugin: Add plugin for Linktop LW27x data cards

[Amit Mendapara]

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

Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>
---
 Makefile.am       |    3 +
 plugins/linktop.c |  357 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 360 insertions(+), 0 deletions(-)
 create mode 100644 plugins/linktop.c

diff --git a/Makefile.am b/Makefile.am
index e402de4..0133f01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -314,6 +314,9 @@ builtin_sources += plugins/nokia.c
 builtin_modules += nokiacdma
 builtin_sources += plugins/nokiacdma.c
 
+builtin_modules += linktop
+builtin_sources += plugins/linktop.c
+
 if BLUETOOTH
 builtin_modules += bluetooth
 builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
diff --git a/plugins/linktop.c b/plugins/linktop.c
new file mode 100644
index 0000000..7f552b5
--- /dev/null
+++ b/plugins/linktop.c
@@ -0,0 +1,357 @@
+/*
+ *
+ *  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 <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gatchat.h>
+#include <gattty.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.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/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>
+#include <ofono/gprs.h>
+#include <ofono/gprs-context.h>
+#include <ofono/phonebook.h>
+#include <ofono/radio-settings.h>
+#include <ofono/log.h>
+
+#include <drivers/atmodem/vendor.h>
+#include <drivers/atmodem/atutil.h>
+
+static const char *none_prefix[] = { NULL };
+
+struct linktop_data {
+	GAtChat *modem;
+	GAtChat *control;
+	struct ofono_gprs *gprs;
+	struct ofono_gprs_context *gc;
+};
+
+static int linktop_probe(struct ofono_modem *modem)
+{
+	struct linktop_data *data;
+
+	DBG("%p", modem);
+
+	data = g_try_new0(struct linktop_data, 1);
+	if (data == NULL)
+		return -ENOMEM;
+
+	ofono_modem_set_data(modem, data);
+
+	return 0;
+}
+
+static void linktop_remove(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_modem_set_data(modem, NULL);
+
+	g_at_chat_unref(data->modem);
+	g_at_chat_unref(data->control);
+
+	g_free(data);
+}
+
+static void linktop_debug(const char *str, void *user_data)
+{
+        const char *prefix = user_data;
+
+        ofono_info("%s%s", prefix, str);
+}
+
+static GAtChat *open_device(struct ofono_modem *modem,
+				const char *key, char *debug)
+{
+	const char *device;
+	GAtSyntax *syntax;
+	GIOChannel *channel;
+	GAtChat *chat;
+
+	device = ofono_modem_get_string(modem, key);
+	if (device == NULL)
+		return NULL;
+
+	DBG("%s %s", key, device);
+
+	channel = g_at_tty_open(device, NULL);
+	if (channel == NULL)
+		return NULL;
+
+	syntax = g_at_syntax_new_gsm_permissive();
+	chat = g_at_chat_new(channel, syntax);
+	g_at_syntax_unref(syntax);
+	g_io_channel_unref(channel);
+
+	if (chat == NULL)
+		return NULL;
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(chat, linktop_debug, debug);
+
+	return chat;
+}
+
+static void linktop_disconnect(gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	if (data->gc)
+		ofono_gprs_context_remove(data->gc);
+
+	g_at_chat_unref(data->modem);
+	data->modem = NULL;
+
+	data->modem = open_device(modem, "Modem", "Modem: ");
+	if (data->modem == NULL)
+		return;
+
+	g_at_chat_set_disconnect_function(data->modem,
+						linktop_disconnect, modem);
+
+	ofono_info("Reopened GPRS context channel");
+
+	data->gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
+
+	if (data->gprs && data->gc)
+		ofono_gprs_add_context(data->gprs, data->gc);
+}
+
+static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+
+	DBG("");
+
+	ofono_modem_set_powered(modem, ok);
+}
+
+static int linktop_enable(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	data->modem = open_device(modem, "Modem", "Modem: ");
+	if (data->modem == NULL)
+		return -EINVAL;
+
+	g_at_chat_set_disconnect_function(data->modem,
+						linktop_disconnect, modem);
+
+	data->control = open_device(modem, "Control", "Control: ");
+	if (data->control == NULL) {
+		g_at_chat_unref(data->modem);
+		data->modem = NULL;
+		return -EIO;
+	}
+
+	g_at_chat_send(data->control, "ATE0 +CMEE=1", none_prefix,
+						NULL, NULL, NULL);
+
+	g_at_chat_send(data->modem, "AT", none_prefix,
+						NULL, NULL, NULL);
+
+	g_at_chat_send(data->modem, "AT &F", none_prefix,
+						NULL, NULL, NULL);
+
+	g_at_chat_send(data->control, "AT+CFUN=1", none_prefix,
+					cfun_enable, modem, NULL);
+
+	return -EINPROGRESS;
+}
+
+static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	g_at_chat_unref(data->control);
+	data->control = NULL;
+
+	if (ok)
+		ofono_modem_set_powered(modem, FALSE);
+}
+
+static int linktop_disable(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	if (data->modem) {
+		g_at_chat_cancel_all(data->modem);
+		g_at_chat_unregister_all(data->modem);
+		g_at_chat_unref(data->modem);
+		data->modem = NULL;
+	}
+
+	if (data->control == NULL)
+		return 0;
+
+	g_at_chat_cancel_all(data->control);
+	g_at_chat_unregister_all(data->control);
+	g_at_chat_send(data->control, "AT+CFUN=4", none_prefix,
+					cfun_disable, modem, NULL);
+
+	return -EINPROGRESS;
+}
+
+static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_modem_online_cb_t cb = cbd->cb;
+
+	if (ok)
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	else
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void linktop_set_online(struct ofono_modem *modem, ofono_bool_t online,
+				ofono_modem_online_cb_t cb, void *user_data)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+	GAtChat *chat = data->control;
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
+
+	DBG("modem %p %s", modem, online ? "online" : "offline");
+
+	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
+		return;
+
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void linktop_pre_sim(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+	struct ofono_sim *sim;
+
+	DBG("%p", modem);
+
+	ofono_devinfo_create(modem, 0, "atmodem", data->control);
+	sim = ofono_sim_create(modem, 0, "atmodem", data->control);
+	ofono_voicecall_create(modem, 0, "stemodem", data->control);
+
+	if (sim)
+		ofono_sim_inserted_notify(sim, TRUE);
+}
+
+static void linktop_post_sim(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_radio_settings_create(modem, 0, "stemodem", data->control);
+	ofono_phonebook_create(modem, 0, "atmodem", data->control);
+	ofono_sms_create(modem, 0, "atmodem", data->control);
+}
+
+static void linktop_post_online(struct ofono_modem *modem)
+{
+	struct linktop_data *data = ofono_modem_get_data(modem);
+	struct ofono_message_waiting *mw;
+	struct ofono_gprs *gprs;
+	struct ofono_gprs_context *gc;
+
+	DBG("%p", modem);
+
+	ofono_ussd_create(modem, 0, "atmodem", data->control);
+	ofono_call_forwarding_create(modem, 0, "atmodem", data->control);
+	ofono_call_settings_create(modem, 0, "atmodem", data->control);
+	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);
+
+	gprs = ofono_gprs_create(modem, OFONO_VENDOR_MBM,
+					"atmodem", data->control);
+	gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
+
+	if (gprs && gc)
+		ofono_gprs_add_context(gprs, gc);
+
+	mw = ofono_message_waiting_create(modem);
+
+	if (mw)
+		ofono_message_waiting_register(mw);
+}
+
+static struct ofono_modem_driver linktop_driver = {
+	.name		= "linktop",
+	.probe		= linktop_probe,
+	.remove		= linktop_remove,
+	.enable		= linktop_enable,
+	.disable	= linktop_disable,
+	.set_online = linktop_set_online,
+	.pre_sim	= linktop_pre_sim,
+	.post_sim	= linktop_post_sim,
+	.post_online	= linktop_post_online,
+};
+
+static int linktop_init(void)
+{
+	return ofono_modem_driver_register(&linktop_driver);
+}
+
+static void linktop_exit(void)
+{
+	ofono_modem_driver_unregister(&linktop_driver);
+}
+
+OFONO_PLUGIN_DEFINE(linktop, "Linktop Datacard modem driver", VERSION,
+		OFONO_PLUGIN_PRIORITY_DEFAULT, linktop_init, linktop_exit)
-- 
1.7.1

[PATCH 2/3] udev: Handle Linktop data card

[Amit Mendapara]

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

Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>
---
 plugins/udev.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/plugins/udev.c b/plugins/udev.c
index ce1efe6..84478d7 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -552,6 +552,36 @@ static void add_nokiacdma(struct ofono_modem *modem,
 	ofono_modem_register(modem);
 }
 
+static void add_linktop(struct ofono_modem *modem,
+					struct udev_device *udev_device)
+{
+	const char *devnode, *intfnum;
+	struct udev_device *parent;
+	int registered;
+
+	DBG("modem %p", modem);
+
+	registered = ofono_modem_get_integer(modem, "Registered");
+	if (registered != 0)
+		return;
+
+	parent = udev_device_get_parent(udev_device);
+	intfnum = udev_device_get_sysattr_value(parent, "bInterfaceNumber");
+
+	DBG("intfnum %s", intfnum);
+
+	if (g_strcmp0(intfnum, "01") == 0) {
+		devnode = udev_device_get_devnode(udev_device);
+		ofono_modem_set_string(modem, "Modem", devnode);
+	} else if (g_strcmp0(intfnum, "03") == 0) {
+		devnode = udev_device_get_devnode(udev_device);
+		ofono_modem_set_string(modem, "Control", 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;
@@ -646,6 +676,8 @@ done:
 		add_tc65(modem, udev_device);
 	else if (g_strcmp0(driver, "nokiacdma") == 0)
 		add_nokiacdma(modem, udev_device);
+        else if (g_strcmp0(driver, "linktop") == 0)
+		add_linktop(modem, udev_device);
 }
 
 static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
-- 
1.7.1

[PATCH 3/3] udev: Add Teracom (Linktop/LW27x) device detection

[Amit Mendapara]

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

Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>
---
 plugins/ofono.rules |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 111f071..f01b739 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -451,4 +451,7 @@ ATTRS{idVendor}=="0421", ATTRS{idProduct}=="0623", ENV{OFONO_DRIVER}="nokia"
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="023e", ENV{OFONO_DRIVER}="nokiacdma"
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="00b6", ENV{OFONO_DRIVER}="nokiacdma"
 
++# Teracom (Linktop/LW27x) 3G Data Card
++ATTRS{idVendor}=="230d", ATTRS{idProduct}=="0001", ENV{OFONO_DRIVER}="linktop"
+
 LABEL="ofono_end"
-- 
1.7.1

Re: [PATCH 1/3] plugin: Add plugin for Linktop LW27x data cards

[Denis Kenzior]

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

Hi Amit,

On 02/09/2011 11:15 PM, Amit Mendapara wrote:
> Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>

Please note that we do not use the Signed-off-by.  Configure your git
settings not to send this.

> ---
>  Makefile.am       |    3 +
>  plugins/linktop.c |  357 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 360 insertions(+), 0 deletions(-)
>  create mode 100644 plugins/linktop.c

So I applied this patch, however there's one thing I'd like you to fix:

> +static int linktop_enable(struct ofono_modem *modem)
> +{
> +	struct linktop_data *data = ofono_modem_get_data(modem);
> +
> +	DBG("%p", modem);
> +
> +	data->modem = open_device(modem, "Modem", "Modem: ");
> +	if (data->modem == NULL)
> +		return -EINVAL;
> +
> +	g_at_chat_set_disconnect_function(data->modem,
> +						linktop_disconnect, modem);
> +
> +	data->control = open_device(modem, "Control", "Control: ");
> +	if (data->control == NULL) {
> +		g_at_chat_unref(data->modem);
> +		data->modem = NULL;
> +		return -EIO;
> +	}
> +
> +	g_at_chat_send(data->control, "ATE0 +CMEE=1", none_prefix,
> +						NULL, NULL, NULL);
> +
> +	g_at_chat_send(data->modem, "AT", none_prefix,
> +						NULL, NULL, NULL);
> +
> +	g_at_chat_send(data->modem, "AT &F", none_prefix,
> +						NULL, NULL, NULL);
> +
> +	g_at_chat_send(data->control, "AT+CFUN=1", none_prefix,
> +					cfun_enable, modem, NULL);
> +

oFono expects the modem driver to power up the modem in an 'offline'
state.  So using CFUN=1 is fine, but it might need to be followed by a
CFUN=4 afterward.  Look at a few other drivers to see the creative ways
we have tried to address this.

> +	return -EINPROGRESS;
> +}

Regards,
-Denis

Re: [PATCH 2/3] udev: Handle Linktop data card

[Denis Kenzior]

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

Hi Amit,

On 02/09/2011 11:15 PM, Amit Mendapara wrote:
> Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>
> ---
>  plugins/udev.c |   32 ++++++++++++++++++++++++++++++++
>  1 files changed, 32 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Some comments on further improvements:

> +static void add_linktop(struct ofono_modem *modem,
> +					struct udev_device *udev_device)
> +{
> +	const char *devnode, *intfnum;
> +	struct udev_device *parent;
> +	int registered;
> +
> +	DBG("modem %p", modem);
> +
> +	registered = ofono_modem_get_integer(modem, "Registered");
> +	if (registered != 0)
> +		return;
> +
> +	parent = udev_device_get_parent(udev_device);
> +	intfnum = udev_device_get_sysattr_value(parent, "bInterfaceNumber");
> +
> +	DBG("intfnum %s", intfnum);
> +
> +	if (g_strcmp0(intfnum, "01") == 0) {
> +		devnode = udev_device_get_devnode(udev_device);
> +		ofono_modem_set_string(modem, "Modem", devnode);
> +	} else if (g_strcmp0(intfnum, "03") == 0) {
> +		devnode = udev_device_get_devnode(udev_device);
> +		ofono_modem_set_string(modem, "Control", devnode);
> +
> +		ofono_modem_set_integer(modem, "Registered", 1);
> +		ofono_modem_register(modem);
> +	}

Instead of hardcoding this info, you might want to use an approach
similar to how the Huawei udev rules are structured.  However, this
really depends on how many variations of this Linktop card there are.
Since there's only 1 right now, this is fine.

Regards,
-Denis

Re: [PATCH 3/3] udev: Add Teracom (Linktop/LW27x) device detection

[Denis Kenzior]

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

Hi Amit,

On 02/09/2011 11:15 PM, Amit Mendapara wrote:
> Signed-off-by: Amit Mendapara <mendapara.amit@gmail.com>
> ---
>  plugins/ofono.rules |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

[PATCH 2/3] udev: Handle Linktop data card

[Amit Mendapara]

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

---
 plugins/udev.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/plugins/udev.c b/plugins/udev.c
index ce1efe6..84478d7 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -552,6 +552,36 @@ static void add_nokiacdma(struct ofono_modem *modem,
 	ofono_modem_register(modem);
 }
 
+static void add_linktop(struct ofono_modem *modem,
+					struct udev_device *udev_device)
+{
+	const char *devnode, *intfnum;
+	struct udev_device *parent;
+	int registered;
+
+	DBG("modem %p", modem);
+
+	registered = ofono_modem_get_integer(modem, "Registered");
+	if (registered != 0)
+		return;
+
+	parent = udev_device_get_parent(udev_device);
+	intfnum = udev_device_get_sysattr_value(parent, "bInterfaceNumber");
+
+	DBG("intfnum %s", intfnum);
+
+	if (g_strcmp0(intfnum, "01") == 0) {
+		devnode = udev_device_get_devnode(udev_device);
+		ofono_modem_set_string(modem, "Modem", devnode);
+	} else if (g_strcmp0(intfnum, "03") == 0) {
+		devnode = udev_device_get_devnode(udev_device);
+		ofono_modem_set_string(modem, "Control", 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;
@@ -646,6 +676,8 @@ done:
 		add_tc65(modem, udev_device);
 	else if (g_strcmp0(driver, "nokiacdma") == 0)
 		add_nokiacdma(modem, udev_device);
+        else if (g_strcmp0(driver, "linktop") == 0)
+		add_linktop(modem, udev_device);
 }
 
 static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
-- 
1.7.1