summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ham <bob.ham@puri.sm>2018-04-30 13:56:06 +0000
committerDenis Kenzior <denkenz@gmail.com>2018-04-30 11:17:47 -0500
commit1d63b1d35f8e650ab050b5ea29d9b9dca42bb178 (patch)
treeedaff525252411675bdb450fe14c25bf7ab198b4
parent3cb55b65cb6c1f44228cf0f0a040d10c99ba1054 (diff)
downloadofono-1d63b1d35f8e650ab050b5ea29d9b9dca42bb178.tar.gz
plugins: Add support for SIM7100E by SIMCom
Add support for the SIM7100E modem. We add a new "sim7100" plugin because there's no other AT-based modem that has support for both GPRS and voice calls.
-rw-r--r--Makefile.am3
-rw-r--r--plugins/mbim.c2
-rw-r--r--plugins/sim7100.c273
-rw-r--r--plugins/udevng.c56
4 files changed, 331 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index a921bd2b..6dee4ce3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -499,6 +499,9 @@ builtin_sources += plugins/samsung.c
builtin_modules += sim900
builtin_sources += plugins/sim900.c
+builtin_modules += sim7100
+builtin_sources += plugins/sim7100.c
+
builtin_modules += connman
builtin_sources += plugins/connman.c
diff --git a/plugins/mbim.c b/plugins/mbim.c
index 87bb0233..b54846fe 100644
--- a/plugins/mbim.c
+++ b/plugins/mbim.c
@@ -422,6 +422,8 @@ static struct ofono_modem_driver mbim_driver = {
static int mbim_init(void)
{
+ l_debug("------------------->Foobar");
+
return ofono_modem_driver_register(&mbim_driver);
}
diff --git a/plugins/sim7100.c b/plugins/sim7100.c
new file mode 100644
index 00000000..dcd7c9ad
--- /dev/null
+++ b/plugins/sim7100.c
@@ -0,0 +1,273 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
+ * Copyright (C) 2009 Collabora Ltd. All rights reserved.
+ * Copyright 2018 Purism SPC
+ *
+ * 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
+ *
+ */
+
+/*
+ * This file was originally copied from g1.c and
+ * modified by Bob Ham <bob.ham@puri.sm>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <errno.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/ussd.h>
+#include <ofono/voicecall.h>
+#include <ofono/gprs.h>
+#include <ofono/gprs-context.h>
+
+#include <drivers/atmodem/vendor.h>
+
+struct sim7100_data {
+ GAtChat *at;
+ GAtChat *ppp;
+};
+
+static void sim7100_debug(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ ofono_info("%s%s", prefix, str);
+}
+
+/* Detect hardware, and initialize if found */
+static int sim7100_probe(struct ofono_modem *modem)
+{
+ struct sim7100_data *data;
+
+ DBG("");
+
+ data = g_try_new0(struct sim7100_data, 1);
+ if (data == NULL)
+ return -ENOMEM;
+
+ ofono_modem_set_data(modem, data);
+
+ return 0;
+}
+
+static void sim7100_remove(struct ofono_modem *modem)
+{
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ if (!data)
+ return;
+
+ if (data->at)
+ g_at_chat_unref(data->at);
+
+ if (data->ppp)
+ g_at_chat_unref(data->ppp);
+
+ ofono_modem_set_data(modem, NULL);
+ g_free (data);
+}
+
+static void cfun_set_on_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+
+ DBG("");
+
+ if (ok)
+ ofono_modem_set_powered(modem, TRUE);
+}
+
+static int open_device(struct ofono_modem *modem, const char *devkey,
+ GAtChat **chatp)
+{
+ GIOChannel *channel;
+ GAtSyntax *syntax;
+ GAtChat *chat;
+ const char *device;
+
+ DBG("devkey=%s", devkey);
+
+ device = ofono_modem_get_string(modem, devkey);
+ if (device == NULL)
+ return -EINVAL;
+
+ channel = g_at_tty_open(device, NULL);
+ if (channel == NULL)
+ return -EIO;
+
+ 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 -EIO;
+
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(chat, sim7100_debug, "");
+
+ *chatp = chat;
+ return 0;
+}
+
+static int sim7100_enable(struct ofono_modem *modem)
+{
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+ int err;
+
+ DBG("");
+
+ err = open_device(modem, "AT", &data->at);
+ if (err < 0)
+ return err;
+
+ err = open_device(modem, "PPP", &data->ppp);
+ if (err < 0)
+ return err;
+
+ /* ensure modem is in a known state; verbose on, echo/quiet off */
+ g_at_chat_send(data->at, "ATE0Q0V1", NULL, NULL, NULL, NULL);
+
+ /* power up modem */
+ g_at_chat_send(data->at, "AT+CFUN=1", NULL, cfun_set_on_cb,
+ modem, NULL);
+
+ return 0;
+}
+
+static void cfun_set_off_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ g_at_chat_unref(data->ppp);
+ g_at_chat_unref(data->at);
+ data->at = data->ppp = NULL;
+
+ if (ok)
+ ofono_modem_set_powered(modem, FALSE);
+}
+
+static int sim7100_disable(struct ofono_modem *modem)
+{
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ /* power down modem */
+ g_at_chat_cancel_all(data->ppp);
+ g_at_chat_cancel_all(data->at);
+ g_at_chat_unregister_all(data->ppp);
+ g_at_chat_unregister_all(data->at);
+ g_at_chat_send(data->at, "AT+CFUN=0", NULL, cfun_set_off_cb,
+ modem, NULL);
+
+ return -EINPROGRESS;
+}
+
+static void sim7100_pre_sim(struct ofono_modem *modem)
+{
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+ struct ofono_sim *sim;
+
+ DBG("");
+
+ ofono_devinfo_create(modem, 0, "atmodem", data->at);
+ sim = ofono_sim_create(modem, 0, "atmodem", data->at);
+ ofono_voicecall_create(modem, 0, "atmodem", data->at);
+
+ if (sim)
+ ofono_sim_inserted_notify(sim, TRUE);
+}
+
+static void sim7100_post_sim(struct ofono_modem *modem)
+{
+ struct sim7100_data *data = ofono_modem_get_data(modem);
+ struct ofono_message_waiting *mw;
+ struct ofono_gprs *gprs = NULL;
+ struct ofono_gprs_context *gc = NULL;
+
+ DBG("");
+
+ ofono_ussd_create(modem, 0, "atmodem", data->at);
+ ofono_call_forwarding_create(modem, 0, "atmodem", data->at);
+ ofono_call_settings_create(modem, 0, "atmodem", data->at);
+ ofono_netreg_create(modem, 0, "atmodem", data->at);
+ ofono_call_meter_create(modem, 0, "atmodem", data->at);
+ ofono_call_barring_create(modem, 0, "atmodem", data->at);
+ ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem", data->at);
+ ofono_phonebook_create(modem, 0, "atmodem", data->at);
+
+ gprs = ofono_gprs_create(modem, 0, "atmodem", data->at);
+ gc = ofono_gprs_context_create(modem, 0, "atmodem", data->ppp);
+
+ 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 sim7100_driver = {
+ .name = "sim7100",
+ .probe = sim7100_probe,
+ .remove = sim7100_remove,
+ .enable = sim7100_enable,
+ .disable = sim7100_disable,
+ .pre_sim = sim7100_pre_sim,
+ .post_sim = sim7100_post_sim,
+};
+
+static int sim7100_init(void)
+{
+ return ofono_modem_driver_register(&sim7100_driver);
+}
+
+static void sim7100_exit(void)
+{
+ ofono_modem_driver_unregister(&sim7100_driver);
+}
+
+OFONO_PLUGIN_DEFINE(sim7100, "SIMCom SIM7100E modem driver", VERSION,
+ OFONO_PLUGIN_PRIORITY_DEFAULT, sim7100_init, sim7100_exit)
diff --git a/plugins/udevng.c b/plugins/udevng.c
index ff5d41af..cd56fd56 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -710,7 +710,7 @@ static gboolean setup_telitqmi(struct modem_info *modem)
return TRUE;
}
-static gboolean setup_simcom(struct modem_info *modem)
+static gboolean setup_sim900(struct modem_info *modem)
{
const char *mdm = NULL, *aux = NULL, *gps = NULL, *diag = NULL;
GSList *list;
@@ -1213,6 +1213,54 @@ static gboolean setup_xmm7xxx(struct modem_info *modem)
return TRUE;
}
+static gboolean setup_sim7100(struct modem_info *modem)
+{
+ const char *at = NULL, *ppp = NULL, *gps = NULL, *diag = NULL, *audio = NULL;
+ GSList *list;
+
+ DBG("%s", modem->syspath);
+
+ for (list = modem->devices; list; list = list->next) {
+ struct device_info *info = list->data;
+
+ DBG("%s %s", info->devnode, info->number);
+
+ /*
+ * Serial port layout:
+ * 0: QCDM/DIAG
+ * 1: NMEA
+ * 2: AT
+ * 3: AT/PPP
+ * 4: audio
+ *
+ * -- https://www.spinics.net/lists/linux-usb/msg135728.html
+ */
+ if (g_strcmp0(info->number, "00") == 0)
+ diag = info->devnode;
+ else if (g_strcmp0(info->number, "01") == 0)
+ gps = info->devnode;
+ else if (g_strcmp0(info->number, "02") == 0)
+ at = info->devnode;
+ else if (g_strcmp0(info->number, "03") == 0)
+ ppp = info->devnode;
+ else if (g_strcmp0(info->number, "04") == 0)
+ audio = info->devnode;
+ }
+
+ if (at == NULL)
+ return FALSE;
+
+ DBG("at=%s ppp=%s gps=%s diag=%s, audio=%s", at, ppp, gps, diag, audio);
+
+ ofono_modem_set_string(modem->modem, "AT", at);
+ ofono_modem_set_string(modem->modem, "PPP", ppp);
+ ofono_modem_set_string(modem->modem, "GPS", gps);
+ ofono_modem_set_string(modem->modem, "Diag", diag);
+ ofono_modem_set_string(modem->modem, "Audio", audio);
+
+ return TRUE;
+}
+
static struct {
const char *name;
gboolean (*setup)(struct modem_info *modem);
@@ -1232,7 +1280,8 @@ static struct {
{ "nokia", setup_nokia },
{ "telit", setup_telit, "device/interface" },
{ "telitqmi", setup_telitqmi },
- { "simcom", setup_simcom },
+ { "sim900", setup_sim900 },
+ { "sim7100", setup_sim7100 },
{ "zte", setup_zte },
{ "icera", setup_icera },
{ "samsung", setup_samsung },
@@ -1596,7 +1645,8 @@ static struct {
{ "alcatel", "option", "1bbb", "0017" },
{ "novatel", "option", "1410" },
{ "zte", "option", "19d2" },
- { "simcom", "option", "05c6", "9000" },
+ { "sim900", "option", "05c6", "9000" },
+ { "sim7100", "option", "1e0e", "9001" },
{ "telit", "usbserial", "1bc7" },
{ "telit", "option", "1bc7" },
{ "telit", "cdc_acm", "1bc7", "0021" },