Add basic support for Novatel based devices

diff --git a/Makefile.am b/Makefile.am
index c068cbd..568a00b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,9 @@ builtin_sources += plugins/mbm.c
 
 builtin_modules += huawei
 builtin_sources += plugins/huawei.c
+
+builtin_modules += novatel
+builtin_sources += plugins/novatel.c
 endif
 
 if MAINTAINER_MODE

diff --git a/plugins/novatel.c b/plugins/novatel.c
new file mode 100644 (file)
index 0000000..dac8dc4
--- /dev/null
+++ b/plugins/novatel.c
@@ -0,0 +1,174 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-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 <stdlib.h>
+
+#include <glib.h>
+#include <gatchat.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/modem.h>
+#include <ofono/devinfo.h>
+#include <ofono/netreg.h>
+#include <ofono/sms.h>
+#include <ofono/log.h>
+
+struct novatel_data {
+       GAtChat *chat;
+};
+
+static int novatel_probe(struct ofono_modem *modem)
+{
+       struct novatel_data *data;
+
+       DBG("%p", modem);
+
+       data = g_try_new0(struct novatel_data, 1);
+       if (!data)
+               return -ENOMEM;
+
+       ofono_modem_set_data(modem, data);
+
+       return 0;
+}
+
+static void novatel_remove(struct ofono_modem *modem)
+{
+       struct novatel_data *data = ofono_modem_get_data(modem);
+
+       DBG("%p", modem);
+
+       ofono_modem_set_data(modem, NULL);
+
+       g_free(data);
+}
+
+static void novatel_debug(const char *str, void *user_data)
+{
+       ofono_info("%s", str);
+}
+
+static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+       struct ofono_modem *modem = user_data;
+
+       DBG("");
+
+       if (ok)
+               ofono_modem_set_powered(modem, TRUE);
+}
+
+static int novatel_enable(struct ofono_modem *modem)
+{
+       struct novatel_data *data = ofono_modem_get_data(modem);
+       GAtSyntax *syntax;
+       const char *device;
+
+       DBG("%p", modem);
+
+       device = ofono_modem_get_string(modem, "Device");
+       if (!device)
+                       return -EINVAL;
+
+       syntax = g_at_syntax_new_gsmv1();
+       data->chat = g_at_chat_new_from_tty(device, syntax);
+       g_at_syntax_unref(syntax);
+
+       if (!data->chat)
+               return -EIO;
+
+       if (getenv("OFONO_AT_DEBUG"))
+               g_at_chat_set_debug(data->chat, novatel_debug, NULL);
+
+       g_at_chat_send(data->chat, "AT+CFUN=1", NULL,
+                                       cfun_enable, modem, NULL);
+
+       return 0;
+}
+
+static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+       struct ofono_modem *modem = user_data;
+
+       DBG("");
+
+       if (ok)
+               ofono_modem_set_powered(modem, FALSE);
+}
+
+static int novatel_disable(struct ofono_modem *modem)
+{
+       struct novatel_data *data = ofono_modem_get_data(modem);
+
+       DBG("%p", modem);
+
+       if (!data->chat)
+               return 0;
+
+       g_at_chat_send(data->chat, "AT+CFUN=0", NULL,
+                                       cfun_disable, modem, NULL);
+
+       g_at_chat_shutdown(data->chat);
+
+       g_at_chat_unref(data->chat);
+       data->chat = NULL;
+
+       return 0;
+}
+
+static void novatel_populate(struct ofono_modem *modem)
+{
+       struct novatel_data *data = ofono_modem_get_data(modem);
+
+       DBG("%p", modem);
+
+       ofono_devinfo_create(modem, 0, "atmodem", data->chat);
+       ofono_netreg_create(modem, 0, "atmodem", data->chat);
+}
+
+static struct ofono_modem_driver novatel_driver = {
+       .name           = "novatel",
+       .probe          = novatel_probe,
+       .remove         = novatel_remove,
+       .enable         = novatel_enable,
+       .disable        = novatel_disable,
+       .populate       = novatel_populate,
+};
+
+static int novatel_init(void)
+{
+       return ofono_modem_driver_register(&novatel_driver);
+}
+
+static void novatel_exit(void)
+{
+       ofono_modem_driver_unregister(&novatel_driver);
+}
+
+OFONO_PLUGIN_DEFINE(novatel, "Novatel Wireless modem driver", VERSION,
+               OFONO_PLUGIN_PRIORITY_DEFAULT, novatel_init, novatel_exit)

diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 0105d04..bed61f0 100644 (file)
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -7,6 +7,9 @@ ENV{DEVTYPE}!="usb_device", GOTO="ofono_end"
 # HUAWEI Technology
 ATTRS{idVendor}=="12d1", ENV{OFONO_DRIVER}="huawei"
 
+# Novatel Wireless
+ATTRS{idVendor}=="1410", ENV{OFONO_DRIVER}="novatel"
+
 # Ericsson F3507g
 ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900", ENV{OFONO_DRIVER}="mbm"
 ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1902", ENV{OFONO_DRIVER}="mbm"

diff --git a/plugins/udev.c b/plugins/udev.c
index 82421cc..87775f1 100644 (file)
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -152,6 +152,23 @@ static void add_huawei(struct ofono_modem *modem,
        ofono_modem_register(modem);
 }
 
+static void add_novatel(struct ofono_modem *modem,
+                                       struct udev_device *udev_device)
+{
+       const char *devnode;
+       int registered;
+
+       registered = ofono_modem_get_integer(modem, "Registered");
+       if (registered != 0)
+               return;
+
+       devnode = udev_device_get_devnode(udev_device);
+       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;
@@ -194,6 +211,8 @@ static void add_modem(struct udev_device *udev_device)
                add_mbm(modem, udev_device);
        else if (g_strcmp0(driver, "huawei") == 0)
                add_huawei(modem, udev_device);
+       else if (g_strcmp0(driver, "novatel") == 0)
+               add_novatel(modem, udev_device);
 }
 
 static void remove_modem(struct udev_device *udev_device)