[PATCHv2 0/3] Support for Cinterion TC65

[PATCHv2 0/3] Support for Cinterion TC65

[Oskari Timperi]

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

This is a second try on the matter, with corrections
suggested by Denis.

Oskari Timperi (3):
  Add a plugin for Cinterion TC65 modem
  Add TC65 to Makefile.am
  udev initialization for TC65

 Makefile.am    |    3 +
 plugins/tc65.c |  263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/udev.c |   15 +++
 3 files changed, 281 insertions(+), 0 deletions(-)
 create mode 100644 plugins/tc65.c

-- See us at Mobile World Congress, 14-17 February 2011, in Barcelona, Spain. Visit the Ixonos booth Hall 1, # 1E19.

[PATCHv2 1/3] Add a plugin for Cinterion TC65 modem

[Oskari Timperi]

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

---
 plugins/tc65.c |  263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 263 insertions(+), 0 deletions(-)
 create mode 100644 plugins/tc65.c

diff --git a/plugins/tc65.c b/plugins/tc65.c
new file mode 100644
index 0000000..4d1386b
--- /dev/null
+++ b/plugins/tc65.c
@@ -0,0 +1,263 @@
+/*
+ *
+ *  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/sms.h>
+#include <ofono/ssn.h>
+#include <ofono/ussd.h>
+#include <ofono/voicecall.h>
+
+#include <drivers/atmodem/atutil.h>
+
+#include <ofono/gprs.h>
+#include <ofono/gprs-context.h>
+
+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 = ofono_modem_get_string(modem, "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;
+       struct ofono_error error;
+
+       decode_at_error(&error, g_at_result_final_response(result));
+
+       cb(&error, 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;
+
+       rc = ofono_modem_driver_register(&tc65_driver);
+
+       if (rc != 0)
+               return rc;
+
+       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

-- See us at Mobile World Congress, 14-17 February 2011, in Barcelona, Spain. Visit the Ixonos booth Hall 1, # 1E19.

[PATCHv2 2/3] Add TC65 to Makefile.am

[Oskari Timperi]

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

---
 Makefile.am |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4a919ab..1670de9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,6 +287,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
--
1.6.3.3

-- See us at Mobile World Congress, 14-17 February 2011, in Barcelona, Spain. Visit the Ixonos booth Hall 1, # 1E19.

[PATCHv2 3/3] udev initialization for TC65

[Oskari Timperi]

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

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

diff --git a/plugins/udev.c b/plugins/udev.c
index 3ca6af0..e384583 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -462,6 +462,19 @@ static void add_calypso(struct ofono_modem *modem,
        ofono_modem_register(modem);
 }

+static void add_tc65(struct ofono_modem *modem,
+                                       struct udev_device *udev_device)
+{
+       const char *devnode;
+
+       DBG("modem %p", modem);
+
+       devnode = udev_device_get_devnode(udev_device);
+       ofono_modem_set_string(modem, "Device", devnode);
+
+       ofono_modem_register(modem);
+}
+
 static void add_modem(struct udev_device *udev_device)
 {
        struct ofono_modem *modem;
@@ -548,6 +561,8 @@ done:
                add_isi(modem, udev_device);
        else if (g_strcmp0(driver, "calypso") == 0)
                add_calypso(modem, udev_device);
+       else if (g_strcmp0(driver, "tc65") == 0)
+               add_tc65(modem, udev_device);
 }

 static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
--
1.6.3.3

-- See us at Mobile World Congress, 14-17 February 2011, in Barcelona, Spain. Visit the Ixonos booth Hall 1, # 1E19.

Re: [PATCHv2 1/3] Add a plugin for Cinterion TC65 modem

[Denis Kenzior]

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

Hi Oskari,

On 12/22/2010 05:13 AM, Oskari Timperi wrote:
> ---
>  plugins/tc65.c |  263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 263 insertions(+), 0 deletions(-)
>  create mode 100644 plugins/tc65.c
> 
> diff --git a/plugins/tc65.c b/plugins/tc65.c
> new file mode 100644
> index 0000000..4d1386b
> --- /dev/null
> +++ b/plugins/tc65.c
> @@ -0,0 +1,263 @@
> +/*
> + *
> + *  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/sms.h>
> +#include <ofono/ssn.h>
> +#include <ofono/ussd.h>
> +#include <ofono/voicecall.h>
> +
> +#include <drivers/atmodem/atutil.h>
> +
> +#include <ofono/gprs.h>
> +#include <ofono/gprs-context.h>
> +
> +static int tc65_probe(struct ofono_modem *modem)
> +{
> +       return 0;
> +}
> +

Please note that oFono uses tabs for indentation, not spaces.  So place
fixup this patch accordingly.

> +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)

You might want to check doc/coding-style.txt item M13:

> +               return -ENOMEM;
> +
> +       device = ofono_modem_get_string(modem, "Device");
> +

Here you might want to check that device is non-null, and fail early if
it is.

> +       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;
> +       struct ofono_error error;
> +
> +       decode_at_error(&error, g_at_result_final_response(result));
> +
> +       cb(&error, 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;
> +
> +       rc = ofono_modem_driver_register(&tc65_driver);
> +
> +       if (rc != 0)
> +               return rc;
> +
> +       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
> 
> -- See us at Mobile World Congress, 14-17 February 2011, in Barcelona, Spain. Visit the Ixonos booth Hall 1, # 1E19.
> 
> _______________________________________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/listinfo/ofono

Otherwise this looks good to me.

Regards,
-Denis

Re: [PATCHv2 2/3] Add TC65 to Makefile.am

[Denis Kenzior]

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

Hi Oskari,

On 12/22/2010 05:13 AM, Oskari Timperi wrote:
> ---
>  Makefile.am |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 

Please squash this patch into Patch 1.

Regards,
-Denis