From: Bernhard Guillon <Bernhard.Guillon(a)hale.at&gt; *add a basic plugin based on different ofono plugins *use Telit specific QSS for SIM-state *update Makefile --- Makefile.am | 3 + plugins/telit.c | 379 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 382 insertions(+), 0 deletions(-) create mode 100644 plugins/telit.c diff --git a/Makefile.am b/Makefile.am index 0a7b6d5..dd4fb8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -326,6 +326,9 @@ builtin_sources += plugins/nokiacdma.c builtin_modules += linktop builtin_sources += plugins/linktop.c +builtin_modules += telit +builtin_sources += plugins/telit.c + if BLUETOOTH builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c plugins/bluetooth.h diff --git a/plugins/telit.c b/plugins/telit.c new file mode 100644 index 0000000..8101b8f --- /dev/null +++ b/plugins/telit.c @@ -0,0 +1,379 @@ +/* + * + * 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 <stdio.h> +#include <unistd.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/gprs.h> +#include <ofono/gprs-context.h> +#include <ofono/sms.h> +#include <ofono/ussd.h> +#include <ofono/voicecall.h> + +#include <drivers/atmodem/atutil.h> +#include <drivers/atmodem/vendor.h> + +static const char *none_prefix[] = { NULL }; +static const char *qss_prefix[] = { "#QSS:", NULL }; + +struct telit_data { + GAtChat *chat; + struct ofono_sim *sim; +}; + +static void telit_debug(const char *str, void *user_data) +{ + const char *prefix = user_data; + + ofono_info("%s%s", prefix, str); +} + +static int telit_probe(struct ofono_modem *modem) +{ + struct telit_data *data; + + DBG("%p", modem); + + data = g_try_new0(struct telit_data, 1); + if (data == NULL) + return -ENOMEM; + + ofono_modem_set_data(modem, data); + + return 0; +} + +static void telit_remove(struct ofono_modem *modem) +{ + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_modem_set_data(modem, NULL); + + g_free(data); +} + +static gboolean sim_inserted_timeout_cb(gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_sim_inserted_notify(data->sim, TRUE); + + return FALSE; +} + +static void switch_sim_state_status(struct ofono_modem *modem, int status) +{ + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + switch (status) { + case 0: + DBG("SIM not inserted"); + ofono_sim_inserted_notify(data->sim, FALSE); + break; + case 1: + DBG("SIM inserted"); + /* We need to sleep a bit */ + g_timeout_add_seconds(1, sim_inserted_timeout_cb, modem); + break; + case 2: + DBG("SIM inserted and PIN unlocked"); + break; + case 3: + DBG("SIM inserted and ready"); + break; + } +} + +static void telit_qss_notify(GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int status; + GAtResultIter iter; + + DBG("%p", modem); + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + g_at_result_iter_next_number(&iter, &status); + + switch_sim_state_status(modem, status); +} + +static void telit_qss_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + int mode; + int status; + GAtResultIter iter; + g_at_result_iter_init(&iter, result); + + DBG("%p", modem); + + if (!g_at_result_iter_next(&iter, "#QSS:")) + return; + + g_at_result_iter_next_number(&iter, &mode); + g_at_result_iter_next_number(&iter, &status); + + switch_sim_state_status(modem, status); +} + +static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + if (!ok) { + g_at_chat_unref(data->chat); + data->chat = NULL; + ofono_modem_set_powered(modem, FALSE); + return; + } + + ofono_modem_set_powered(modem, TRUE); + + /* Enable sim state notification */ + g_at_chat_send(data->chat, "AT#QSS=1", none_prefix, NULL, NULL, NULL); + + /* Follow sim state */ + g_at_chat_register(data->chat, "#QSS:", telit_qss_notify, + FALSE, modem, NULL); + + /* Query current sim state */ + g_at_chat_send(data->chat, "AT#QSS?", qss_prefix, + telit_qss_cb, modem, NULL); +} + +static void cfun_disable_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + g_at_chat_unref(data->chat); + data->chat = NULL; + + if (ok) + ofono_modem_set_powered(modem, FALSE); +} + +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_gsmv1(); + 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, telit_debug, debug); + + return chat; +} + +static int telit_enable(struct ofono_modem *modem) +{ + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + data->chat = open_device(modem, "Modem", "Modem: "); + if (data->chat == NULL) + return -EINVAL; + + /* + * Disable command echo and + * enable the Extended Error Result Codes + */ + g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix, + NULL, NULL, NULL); + + /* Set phone functionality */ + g_at_chat_send(data->chat, "AT+CFUN=4", none_prefix, + cfun_enable_cb, modem, NULL); + + return -EINPROGRESS; +} + +static int telit_disable(struct ofono_modem *modem) +{ + struct telit_data *data = ofono_modem_get_data(modem); + DBG("%p", modem); + + g_at_chat_cancel_all(data->chat); + g_at_chat_unregister_all(data->chat); + + /* Power down modem */ + g_at_chat_send(data->chat, "AT+CFUN=0", none_prefix, + cfun_disable_cb, 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 telit_set_online(struct ofono_modem *modem, ofono_bool_t online, + ofono_modem_online_cb_t cb, void *user_data) +{ + struct telit_data *data = ofono_modem_get_data(modem); + 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"); + + g_at_chat_send(data->chat, command, none_prefix, set_online_cb, + cbd, g_free); +} + +static void telit_pre_sim(struct ofono_modem *modem) +{ + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", data->chat); + data->sim = ofono_sim_create(modem, 0, "atmodem", data->chat); + ofono_voicecall_create(modem, 0, "atmodem", data->chat); +} + +static void telit_post_sim(struct ofono_modem *modem) +{ + struct telit_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_sms_create(modem, 0, "atmodem", data->chat); +} + +static void telit_post_online(struct ofono_modem *modem) +{ + struct telit_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_netreg_create(modem, OFONO_VENDOR_TELIT, "atmodem", data->chat); + ofono_ussd_create(modem, 0, "atmodem", data->chat); + ofono_call_forwarding_create(modem, 0, "atmodem", data->chat); + ofono_call_settings_create(modem, 0, "atmodem", data->chat); + ofono_call_meter_create(modem, 0, "atmodem", data->chat); + ofono_call_barring_create(modem, 0, "atmodem", data->chat); + + gprs = ofono_gprs_create(modem, 0, "atmodem", data->chat); + gc = ofono_gprs_context_create(modem, 0, "atmodem", data->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 telit_driver = { + .name = "telit", + .probe = telit_probe, + .remove = telit_remove, + .enable = telit_enable, + .disable = telit_disable, + .set_online = telit_set_online, + .pre_sim = telit_pre_sim, + .post_sim = telit_post_sim, + .post_online = telit_post_online, +}; + +static int telit_init(void) +{ + return ofono_modem_driver_register(&telit_driver); +} + +static void telit_exit(void) +{ + ofono_modem_driver_unregister(&telit_driver); +} + +OFONO_PLUGIN_DEFINE(telit, "telit driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, telit_init, telit_exit) -- 1.7.0.4 -- Scanned by MailScanner.

From: Bernhard Guillon <Bernhard.Guillon(a)hale.at&gt; --- drivers/atmodem/vendor.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/atmodem/vendor.h b/drivers/atmodem/vendor.h index 3898fa8..412bc76 100644 --- a/drivers/atmodem/vendor.h +++ b/drivers/atmodem/vendor.h @@ -35,4 +35,5 @@ enum ofono_vendor { OFONO_VENDOR_WAVECOM, OFONO_VENDOR_NOKIA, OFONO_VENDOR_PHONESIM, + OFONO_VENDOR_TELIT, }; -- 1.7.0.4 -- Scanned by MailScanner.

From: Bernhard Guillon <Bernhard.Guillon(a)hale.at&gt; *add Modem and GPS check for telit *make GPS yes/no configurable with udev rules settings **this is necessary because telit has different interface numbers on different modems e.g. GPS and UART --- plugins/ofono.rules | 8 +++++ plugins/udev.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/plugins/ofono.rules b/plugins/ofono.rules index 268b327..64fa4b2 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -344,6 +344,11 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1485", ENV{OFONO_IFACE_NUM}=="02", E ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1486", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Modem" ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1486", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_HUAWEI_TYPE}="Pcui" +#Telit UC864-G +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_TELIT_GPS}="1" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_TELIT_TYPE}="Modem" +ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_TELIT_TYPE}="GPS" + LABEL="ofono_tty_end" # ISI/Phonet drivers @@ -459,4 +464,7 @@ 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" +# Telit +ATTRS{idVendor}=="1bc7", ENV{OFONO_DRIVER}="telit" + LABEL="ofono_end" diff --git a/plugins/udev.c b/plugins/udev.c index 0234fc0..e56d3db 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -587,6 +587,76 @@ static void add_linktop(struct ofono_modem *modem, } } +static void add_telit(struct ofono_modem *modem, + struct udev_device *udev_device) +{ + struct udev_list_entry *entry; + const char *devnode, *type; + int device, gps_device, has_gps; + + DBG("modem %p", modem); + + /* + * Some Telit modems have a built in GPS device. According to the + * manual the the interface numbers can differ between different + * devices hence we need to use udev rules to set the environment + * accordingly. + */ + device = ofono_modem_get_integer(modem, "ModemRegistered"); + gps_device = ofono_modem_get_integer(modem, "GPSRegistered"); + has_gps = ofono_modem_get_integer(modem, "HasGPS"); + + if ((!has_gps && device) || (device && gps_device)) + return; + + entry = udev_device_get_properties_list_entry(udev_device); + while (entry) { + const char *name = udev_list_entry_get_name(entry); + type = udev_list_entry_get_value(entry); + + if (g_str_equal(name, "OFONO_TELIT_GPS") == TRUE) { + int value = g_str_equal(type, "1"); + + ofono_modem_set_integer(modem, "HasGPS", value); + entry = udev_list_entry_get_next(entry); + continue; + } + + if (g_str_equal(name, "OFONO_TELIT_TYPE") != TRUE) { + entry = udev_list_entry_get_next(entry); + continue; + } + + if (g_str_equal(type, "Modem") == TRUE) { + + if (device != 0) + return; + + devnode = udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "Modem", devnode); + device = 1; + ofono_modem_set_integer(modem, "ModemRegistered", + device); + } else if (g_str_equal(type, "GPS") == TRUE) { + + if (gps_device != 0) + return; + + devnode = udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "GPS", devnode); + + gps_device = 1; + ofono_modem_set_integer(modem, "GPSRegistered", + gps_device); + } + + break; + } + + if ((!has_gps && device) || (device && gps_device)) + ofono_modem_register(modem); +} + static void add_modem(struct udev_device *udev_device) { struct ofono_modem *modem; @@ -681,6 +751,8 @@ done: add_calypso(modem, udev_device); else if (g_strcmp0(driver, "tc65") == 0) add_tc65(modem, udev_device); + else if (g_strcmp0(driver, "telit") == 0) + add_telit(modem, udev_device); else if (g_strcmp0(driver, "nokiacdma") == 0) add_nokiacdma(modem, udev_device); else if (g_strcmp0(driver, "linktop") == 0) -- 1.7.0.4 -- Scanned by MailScanner.

Hi Bernhard, On 06/08/2011 10:18 AM, Bernhard.Guillon(a)hale.at wrote: What I would do here is something like: ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_TELIT_TYPE}="Modem" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_TELIT_TYPE}="GPS" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_TELIT_TYPE}="Data" You can then skip the HasGPS variable. I would then model the detection logic after add mbm. e.g. something like: registered = ofono_modem_get_integer(modem, "Registered"); drop this if statement if (registered == 0 && g_str_equal(type, "Modem") == TRUE) { ... We prefer nested if statements like this to be written like: if (expression) { if () ... } e.g. no spaces before the nested if. > + if (device != 0) > + return; > + devnode = udev_device_get_devnode(udev_device); > + ofono_modem_set_string(modem, "Modem", devnode); > + device = 1; > + ofono_modem_set_integer(modem, "ModemRegistered", > + device); Drop the device=1 and ofono_modem_set_integer calls.. > + } else if (g_str_equal(type, "GPS") == TRUE) { > + if (gps_device != 0) > + return; > + devnode = udev_device_get_devnode(udev_device); > + ofono_modem_set_string(modem, "GPS", devnode); > + gps_device = 1; > + ofono_modem_set_integer(modem, "GPSRegistered", > + gps_device); > + } Same comments as above for this statement Then add another if statement detecting the Data port. > + break; > + } > + if ((!has_gps && device) || (device && gps_device)) > + ofono_modem_register(modem); Then here do something like: if (registered == 1) return; if (ofono_modem_get_string(modem, "Modem") != NULL && ofono_modem_get_string(modem, "Data") != NULL) { ofono_modem_set_integer(modem, "Registered", 1"); ofono_modem_register(modem); } > +} > static void add_modem(struct udev_device *udev_device) > { > struct ofono_modem *modem; > @@ -681,6 +751,8 @@ done: > add_calypso(modem, udev_device); > else if (g_strcmp0(driver, "tc65") == 0) > add_tc65(modem, udev_device); > + else if (g_strcmp0(driver, "telit") == 0) > + add_telit(modem, udev_device); > else if (g_strcmp0(driver, "nokiacdma") == 0) > add_nokiacdma(modem, udev_device); > else if (g_strcmp0(driver, "linktop") == 0) Regards, -Denis