Initial support for Cinterion TC65 modem

Initial support for Cinterion TC65 modem

[Oskari Timperi]

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

This patch adds initial support for Cinterion TC65 type of modem.

Cinterion TC65 doesn't always conform to the specifications and
it is currently the only modem we are developing on, so it would be
essential to have in oFono.

Regards,
Oskari Timperi

[PATCH] Add initial support for Cinterion TC65 modem

[Oskari Timperi]

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

---
 Makefile.am    |    3 +
 plugins/tc65.c |  279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 282 insertions(+), 0 deletions(-)
 create mode 100644 plugins/tc65.c

diff --git a/Makefile.am b/Makefile.am
index cdb3166..779df9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,6 +286,9 @@ builtin_sources += plugins/ste.c
 
 builtin_modules += caif
 builtin_sources += plugins/caif.c
+
+builtin_modules += tc65
+builtin_sources += plugins/tc65.c
 endif
 
 if MAINTAINER_MODE
diff --git a/plugins/tc65.c b/plugins/tc65.c
new file mode 100644
index 0000000..36c579e
--- /dev/null
+++ b/plugins/tc65.c
@@ -0,0 +1,279 @@
+/*
+ *
+ *  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 <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/log.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/stk.h>
+#include <ofono/sms.h>
+#include <ofono/ssn.h>
+#include <ofono/ussd.h>
+#include <ofono/voicecall.h>
+
+#include <drivers/atmodem/atutil.h>
+#include <drivers/atmodem/sim-poll.h>
+
+#include <ofono/gprs.h>
+#include <ofono/gprs-context.h>
+
+static const char *g_device = "/dev/ttyS0";
+
+static int tc65_probe(struct ofono_modem *modem)
+{
+	return 0;
+}
+
+static void tc65_remove(struct ofono_modem *modem)
+{
+}
+
+static void tc65_debug(const char *str, void *user_data)
+{
+	const char *prefix = user_data;
+
+	ofono_info("%s%s", prefix, str);
+}
+
+static int tc65_enable(struct ofono_modem *modem)
+{
+	GAtChat *chat;
+	GIOChannel *channel;
+	GAtSyntax *syntax;
+	GHashTable *options;
+	const char *device;
+
+	DBG("%p", modem);
+
+	options = g_hash_table_new_full(g_str_hash, g_str_equal,
+					g_free, g_free);
+	if (!options)
+		return -ENOMEM;
+
+	device = getenv("OFONO_TC65_DEVICE");
+	if (!device)
+		device = g_device;
+
+	g_hash_table_insert(options, g_strdup("Baud"),
+				g_strdup("115200"));
+	g_hash_table_insert(options, g_strdup("StopBits"),
+				g_strdup("1"));
+	g_hash_table_insert(options, g_strdup("DataBits"),
+				g_strdup("8"));
+	g_hash_table_insert(options, g_strdup("Parity"),
+				g_strdup("none"));
+	g_hash_table_insert(options, g_strdup("XonXoff"),
+				g_strdup("off"));
+	g_hash_table_insert(options, g_strdup("RtsCts"),
+				g_strdup("on"));
+	g_hash_table_insert(options, g_strdup("Local"),
+				g_strdup("on"));
+	g_hash_table_insert(options, g_strdup("Read"),
+				g_strdup("on"));
+
+	channel = g_at_tty_open(device, options);
+
+	g_hash_table_destroy(options);
+
+	if (!channel)
+		return -EIO;
+
+	/*
+	 * TC65 works almost as the 27.007 says. But for example after
+	 * AT+CRSM the modem replies with the data in the queried EF and
+	 * writes three pairs of <CR><LF> after the data and before OK.
+	 */
+	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)
+		return -ENOMEM;
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(chat, tc65_debug, "");
+
+	ofono_modem_set_data(modem, chat);
+
+	return 0;
+}
+
+static int tc65_disable(struct ofono_modem *modem)
+{
+	GAtChat *chat = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_modem_set_data(modem, NULL);
+
+	g_at_chat_send(chat, "AT+CFUN=7", NULL, NULL, NULL, NULL);
+
+	g_at_chat_unref(chat);
+
+	return 0;
+}
+
+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 tc65_set_online(struct ofono_modem *modem, ofono_bool_t online,
+				ofono_modem_online_cb_t cb, void *user_data)
+{
+	GAtChat *chat = ofono_modem_get_data(modem);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=7";
+
+	DBG("modem %p %s", modem, online ? "online" : "offline");
+
+	if (!cbd)
+		goto error;
+
+	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
+		return;
+
+error:
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void tc65_pre_sim(struct ofono_modem *modem)
+{
+	GAtChat *chat = ofono_modem_get_data(modem);
+	struct ofono_sim *sim;
+
+	DBG("%p", modem);
+
+	ofono_devinfo_create(modem, 0, "atmodem", chat);
+	sim = ofono_sim_create(modem, 0, "atmodem", chat);
+	ofono_voicecall_create(modem, 0, "atmodem", chat);
+
+	if (sim)
+		ofono_sim_inserted_notify(sim, TRUE);
+}
+
+static void tc65_post_sim(struct ofono_modem *modem)
+{
+	GAtChat *chat = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ofono_phonebook_create(modem, 0, "atmodem", chat);
+}
+
+static void tc65_post_online(struct ofono_modem *modem)
+{
+	GAtChat *chat = 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", chat);
+	ofono_call_forwarding_create(modem, 0, "atmodem", chat);
+	ofono_call_settings_create(modem, 0, "atmodem", chat);
+	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);
+	gprs = ofono_gprs_create(modem, 0, "atmodem", chat);
+	gc = ofono_gprs_context_create(modem, 0, "atmodem", chat);
+	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 tc65_driver = {
+	.name			= "tc65",
+	.probe			= tc65_probe,
+	.remove			= tc65_remove,
+	.enable			= tc65_enable,
+	.disable		= tc65_disable,
+	.set_online		= tc65_set_online,
+	.pre_sim		= tc65_pre_sim,
+	.post_sim		= tc65_post_sim,
+	.post_online	= tc65_post_online,
+};
+
+static int tc65_init(void)
+{
+	int rc;
+	struct ofono_modem *modem;
+
+	rc = ofono_modem_driver_register(&tc65_driver);
+
+	if (rc != 0)
+		return rc;
+
+	if (getenv("OFONO_TC65_ENABLE")) {
+		modem = ofono_modem_create("tc65", "tc65");
+
+		if (modem == NULL)
+			return -EINVAL;
+
+		return ofono_modem_register(modem);
+	}
+
+	return 0;
+}
+
+static void tc65_exit(void)
+{
+	ofono_modem_driver_unregister(&tc65_driver);
+}
+
+OFONO_PLUGIN_DEFINE(tc65, "Cinterion TC65 driver plugin", VERSION,
+		OFONO_PLUGIN_PRIORITY_DEFAULT, tc65_init, tc65_exit)
-- 
1.6.3.3

Re: [PATCH] Add initial support for Cinterion TC65 modem

[Denis Kenzior]

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

Hi Oskari,

On 12/10/2010 01:08 AM, Oskari Timperi wrote:
> ---
>  Makefile.am    |    3 +
>  plugins/tc65.c |  279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 282 insertions(+), 0 deletions(-)
>  create mode 100644 plugins/tc65.c
> 
> diff --git a/Makefile.am b/Makefile.am
> index cdb3166..779df9b 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -286,6 +286,9 @@ builtin_sources += plugins/ste.c
>  
>  builtin_modules += caif
>  builtin_sources += plugins/caif.c
> +
> +builtin_modules += tc65
> +builtin_sources += plugins/tc65.c
>  endif
>  
>  if MAINTAINER_MODE
> diff --git a/plugins/tc65.c b/plugins/tc65.c
> new file mode 100644
> index 0000000..36c579e
> --- /dev/null
> +++ b/plugins/tc65.c
> @@ -0,0 +1,279 @@
> +/*
> + *
> + *  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 <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/log.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/stk.h>

This driver does not use sim toolkit, so this include can be dropped

> +#include <ofono/sms.h>
> +#include <ofono/ssn.h>
> +#include <ofono/ussd.h>
> +#include <ofono/voicecall.h>
> +
> +#include <drivers/atmodem/atutil.h>
> +#include <drivers/atmodem/sim-poll.h>

sim-poll is sim toolkit specific, so this one can be dropped as well.

> +
> +#include <ofono/gprs.h>
> +#include <ofono/gprs-context.h>
> +
> +static const char *g_device = "/dev/ttyS0";
> +
> +static int tc65_probe(struct ofono_modem *modem)
> +{
> +	return 0;
> +}
> +
> +static void tc65_remove(struct ofono_modem *modem)
> +{
> +}
> +
> +static void tc65_debug(const char *str, void *user_data)
> +{
> +	const char *prefix = user_data;
> +
> +	ofono_info("%s%s", prefix, str);
> +}
> +
> +static int tc65_enable(struct ofono_modem *modem)
> +{
> +	GAtChat *chat;
> +	GIOChannel *channel;
> +	GAtSyntax *syntax;
> +	GHashTable *options;
> +	const char *device;
> +
> +	DBG("%p", modem);
> +
> +	options = g_hash_table_new_full(g_str_hash, g_str_equal,
> +					g_free, g_free);
> +	if (!options)
> +		return -ENOMEM;
> +
> +	device = getenv("OFONO_TC65_DEVICE");
> +	if (!device)
> +		device = g_device;
> +

I really suggest using udev for this.  You can very easily create a udev
rule even for static serial devices.  See the recent thread about
calypso driver.

> +	g_hash_table_insert(options, g_strdup("Baud"),
> +				g_strdup("115200"));
> +	g_hash_table_insert(options, g_strdup("StopBits"),
> +				g_strdup("1"));
> +	g_hash_table_insert(options, g_strdup("DataBits"),
> +				g_strdup("8"));
> +	g_hash_table_insert(options, g_strdup("Parity"),
> +				g_strdup("none"));
> +	g_hash_table_insert(options, g_strdup("XonXoff"),
> +				g_strdup("off"));
> +	g_hash_table_insert(options, g_strdup("RtsCts"),
> +				g_strdup("on"));
> +	g_hash_table_insert(options, g_strdup("Local"),
> +				g_strdup("on"));
> +	g_hash_table_insert(options, g_strdup("Read"),
> +				g_strdup("on"));
> +
> +	channel = g_at_tty_open(device, options);
> +
> +	g_hash_table_destroy(options);
> +
> +	if (!channel)
> +		return -EIO;
> +
> +	/*
> +	 * TC65 works almost as the 27.007 says. But for example after
> +	 * AT+CRSM the modem replies with the data in the queried EF and
> +	 * writes three pairs of <CR><LF> after the data and before OK.
> +	 */
> +	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)
> +		return -ENOMEM;
> +
> +	if (getenv("OFONO_AT_DEBUG"))
> +		g_at_chat_set_debug(chat, tc65_debug, "");
> +
> +	ofono_modem_set_data(modem, chat);
> +
> +	return 0;
> +}
> +
> +static int tc65_disable(struct ofono_modem *modem)
> +{
> +	GAtChat *chat = ofono_modem_get_data(modem);
> +
> +	DBG("%p", modem);
> +
> +	ofono_modem_set_data(modem, NULL);
> +
> +	g_at_chat_send(chat, "AT+CFUN=7", NULL, NULL, NULL, NULL);
> +
> +	g_at_chat_unref(chat);
> +
> +	return 0;
> +}
> +
> +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);

decode_at_error();
cb();

should be sufficient here

> +}
> +
> +static void tc65_set_online(struct ofono_modem *modem, ofono_bool_t online,
> +				ofono_modem_online_cb_t cb, void *user_data)
> +{
> +	GAtChat *chat = ofono_modem_get_data(modem);
> +	struct cb_data *cbd = cb_data_new(cb, user_data);
> +	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=7";
> +
> +	DBG("modem %p %s", modem, online ? "online" : "offline");
> +
> +	if (!cbd)
> +		goto error;
> +
> +	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
> +		return;
> +
> +error:
> +	g_free(cbd);
> +
> +	CALLBACK_WITH_FAILURE(cb, cbd->data);
> +}
> +
> +static void tc65_pre_sim(struct ofono_modem *modem)
> +{
> +	GAtChat *chat = ofono_modem_get_data(modem);
> +	struct ofono_sim *sim;
> +
> +	DBG("%p", modem);
> +
> +	ofono_devinfo_create(modem, 0, "atmodem", chat);
> +	sim = ofono_sim_create(modem, 0, "atmodem", chat);
> +	ofono_voicecall_create(modem, 0, "atmodem", chat);
> +
> +	if (sim)
> +		ofono_sim_inserted_notify(sim, TRUE);
> +}
> +
> +static void tc65_post_sim(struct ofono_modem *modem)
> +{
> +	GAtChat *chat = ofono_modem_get_data(modem);
> +
> +	DBG("%p", modem);
> +
> +	ofono_phonebook_create(modem, 0, "atmodem", chat);
> +}
> +
> +static void tc65_post_online(struct ofono_modem *modem)
> +{
> +	GAtChat *chat = 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", chat);
> +	ofono_call_forwarding_create(modem, 0, "atmodem", chat);
> +	ofono_call_settings_create(modem, 0, "atmodem", chat);
> +	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);
> +	gprs = ofono_gprs_create(modem, 0, "atmodem", chat);
> +	gc = ofono_gprs_context_create(modem, 0, "atmodem", chat);
> +	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 tc65_driver = {
> +	.name			= "tc65",
> +	.probe			= tc65_probe,
> +	.remove			= tc65_remove,
> +	.enable			= tc65_enable,
> +	.disable		= tc65_disable,
> +	.set_online		= tc65_set_online,
> +	.pre_sim		= tc65_pre_sim,
> +	.post_sim		= tc65_post_sim,
> +	.post_online	= tc65_post_online,
> +};
> +
> +static int tc65_init(void)
> +{
> +	int rc;
> +	struct ofono_modem *modem;
> +
> +	rc = ofono_modem_driver_register(&tc65_driver);
> +
> +	if (rc != 0)
> +		return rc;
> +
> +	if (getenv("OFONO_TC65_ENABLE")) {
> +		modem = ofono_modem_create("tc65", "tc65");
> +
> +		if (modem == NULL)
> +			return -EINVAL;
> +
> +		return ofono_modem_register(modem);

I suggest you drop this and use udev for such detection...

> +	}
> +
> +	return 0;
> +}
> +
> +static void tc65_exit(void)
> +{
> +	ofono_modem_driver_unregister(&tc65_driver);
> +}
> +
> +OFONO_PLUGIN_DEFINE(tc65, "Cinterion TC65 driver plugin", VERSION,
> +		OFONO_PLUGIN_PRIORITY_DEFAULT, tc65_init, tc65_exit)

Regards,
-Denis