[PATCH] add udev rule for Option GTM661W modem
by Caiwen Zhang
---
plugins/ofono.rules | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 5a36380..268b327 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -391,6 +391,7 @@ ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7401", ENV{OFONO_DRIVER}="hso"
ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7601", ENV{OFONO_DRIVER}="hso"
ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7701", ENV{OFONO_DRIVER}="hso"
ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7901", ENV{OFONO_DRIVER}="hso"
+ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="9000", ENV{OFONO_DRIVER}="hso"
# Ericsson F3507g
ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900", ENV{OFONO_DRIVER}="mbm"
--
1.7.5
9 years, 6 months
[RFC PATCH 1/2] Add basic Telit UC864-G support:
by Bernhard.Guillon＠hale.at
From: Bernhard Guillon <Bernhard.Guillon(a)hale.at>
*add a basic plugin based on different ofono plugins
*use Telit specific QSS for SIM-state
*add verry basic GPS support (usable with gypsy)
*add udev support and rules
*update Makefile
Co-authored-by: Christopher Vogl <Christopher.Vogl(a)hale.at>
Signed-off-by: Bernhard Guillon <Bernhard.Guillon(a)hale.at>
---
Makefile.am | 3 +
drivers/atmodem/vendor.h | 1 +
plugins/ofono.rules | 16 ++-
plugins/telit.c | 387 ++++++++++++++++++++++++++++++++++++++++++++++
plugins/udev.c | 40 +++++
5 files changed, 446 insertions(+), 1 deletions(-)
create mode 100644 plugins/telit.c
diff --git a/Makefile.am b/Makefile.am
index a413a47..6197cf6 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/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,
};
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 5a36380..c0c4360 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -306,7 +306,7 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1479", ENV{OFONO_IFACE_NUM}=="00", E
ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1479", ENV{OFONO_IFACE_NUM}=="04", ENV{OFONO_HUAWEI_TYPE}="Pcui"
ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="147a", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Modem"
-ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="147a", ENV{OFONO_IFACE_NUM}=="04", ENV{OFONO_HUAWEI_TYPE}="Pcui"
+ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="147a", ENV{OFONO_IFACE_NUM}=="04", ENV{OFONO_HUAWEI_TYPE}="Pcui"
ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="147b", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Modem"
ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="147b", ENV{OFONO_IFACE_NUM}=="04", ENV{OFONO_HUAWEI_TYPE}="Pcui"
@@ -346,6 +346,20 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1486", ENV{OFONO_IFACE_NUM}=="02", E
LABEL="ofono_tty_end"
+#Telit
+#This modem is not in SUBSYSTEM tty but in KERNEL ttyUSB. Therefore it is intended to be
+#after the ofono_tty_end line
+
+#UC864-G
+
+ATTR{idVendor}=="1bc7", ATTR{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="00", ENV{OFONO_TELIT_TYPE}="modem"
+ATTR{idVendor}=="1bc7", ATTR{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="01", ENV{OFONO_TELIT_TYPE}="aux"
+ATTR{idVendor}=="1bc7", ATTR{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_TELIT_TYPE}="gps"
+ATTR{idVendor}=="1bc7", ATTR{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_TELIT_TYPE}="uart"
+
+ATTR{idVendor}=="1bc7", ENV{OFONO_DRIVER}="telit"
+ATTR{idVendor}=="1bc7", ATTR{idProduct}=="1004", ENV{OFONO_TELIT_MODEL}="UC864-G"
+
# ISI/Phonet drivers
SUBSYSTEM!="net", GOTO="ofono_isi_end"
ATTRS{type}!="820", GOTO="ofono_isi_end"
diff --git a/plugins/telit.c b/plugins/telit.c
new file mode 100644
index 0000000..d157561
--- /dev/null
+++ b/plugins/telit.c
@@ -0,0 +1,387 @@
+/*
+ *
+ * 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/vendor.h>
+#include <drivers/atmodem/atutil.h>
+
+
+static const char *none_prefix[] = { NULL };
+
+
+static int telit_probe(struct ofono_modem *modem)
+{
+ DBG("");
+
+ return 0;
+}
+
+static void telit_remove(struct ofono_modem *modem)
+{
+ GAtChat *chat = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ if (chat) {
+ g_at_chat_unref(chat);
+ ofono_modem_set_data(modem, NULL);
+ }
+}
+
+static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+
+ DBG("");
+
+ if (ok)
+ ofono_modem_set_powered(modem, TRUE);
+}
+
+static void cfun_disable_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ GAtChat *chat = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ g_at_chat_unref(chat);
+ ofono_modem_set_data(modem, NULL);
+
+ if (ok)
+ ofono_modem_set_powered(modem, FALSE);
+}
+
+static void telit_debug(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ ofono_info("%s%s", prefix, str);
+}
+
+static int telit_enable(struct ofono_modem *modem)
+{
+ GAtChat *chat;
+ GIOChannel *channel;
+ GAtSyntax *syntax;
+ const char *device;
+ GHashTable *options;
+
+ DBG("%p", modem);
+
+ device = ofono_modem_get_string(modem, "Device");
+ if (device == NULL)
+ return -EINVAL;
+
+ options = g_hash_table_new(g_str_hash, g_str_equal);
+
+ if (options == NULL)
+ return -ENOMEM;
+
+ g_hash_table_insert(options, "Baud", "115200");
+ g_hash_table_insert(options, "Parity", "none");
+ g_hash_table_insert(options, "StopBits", "1");
+ g_hash_table_insert(options, "DataBits", "8");
+
+ DBG("IN TELIT: %s", device);
+
+ channel = g_at_tty_open(device, options);
+
+ g_hash_table_destroy(options);
+
+ DBG("channel: %p", channel);
+
+ if (channel == NULL)
+ return -EIO;
+
+ /*
+ * Could not figure out whether it is fully compliant or not, use
+ * permissive for now
+ * */
+ syntax = g_at_syntax_new_gsm_permissive();
+
+ chat = g_at_chat_new(channel, syntax);
+ g_io_channel_unref(channel);
+ g_at_syntax_unref(syntax);
+
+ if (chat == NULL)
+ return -ENOMEM;
+
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(chat, telit_debug, "");
+
+ ofono_modem_set_data(modem, chat);
+
+ /* ATE0: disables command echo.
+ * +CMEE=1: Enable the Extended Error Result Codes. */
+ g_at_chat_send(chat, "ATE0+CMEE=1", none_prefix, NULL, NULL, NULL);
+
+ /* Set phone functionality:
+ * +CFUN=1: mobile full functionality with power saving disabled (factory default).
+ * +CFUN=5: mobile full functionality with power saving enabled.
+ */
+ g_at_chat_send(chat, "AT+CFUN=1", none_prefix, cfun_enable_cb, modem, NULL);
+
+ return 0;
+}
+
+static int telit_disable(struct ofono_modem *modem)
+{
+ GAtChat *chat = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ if (chat == NULL)
+ return 0;
+
+ /* power down modem */
+ g_at_chat_cancel_all(chat);
+ g_at_chat_unregister_all(chat);
+
+ g_at_chat_send(chat, "AT+CFUN=0", NULL, 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)
+{
+ 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=4";
+
+ DBG("modem %p %s", modem, online ? "online" : "offline");
+
+ if (chat == NULL)
+ 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 telit_qss_notify(GAtResult *result, gpointer _sim)
+{
+ int status = 0;
+ GAtResultIter iter;
+ struct ofono_sim *sim = _sim;
+ 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(status)
+ {
+ case 0:
+ DBG("SIM not inserted");
+ ofono_sim_inserted_notify(sim,FALSE);
+ break;
+ case 1:
+ DBG("SIM inserted");
+ /* we need to sleep a bit */
+ sleep(1);
+ ofono_sim_inserted_notify(sim,TRUE);
+ break;
+ case 2:
+ DBG("SIM inserted and PIN unlocked");
+ break;
+ case 3:
+ DBG("SIM inserted and ready");
+ break;
+ default:
+ return;
+ }
+ return;
+}
+
+static void telit_qss_cb(gboolean ok, GAtResult *result, gpointer _sim)
+{
+ int mode = 0;
+ int status = 0;
+ GAtResultIter iter;
+ struct ofono_sim *sim = _sim;
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "#QSS:"))
+ goto error;
+ g_at_result_iter_next_number(&iter, &mode);
+ g_at_result_iter_next_number(&iter, &status);
+ switch(status)
+ {
+ case 0:
+ DBG("SIM not inserted");
+ break;
+ case 1:
+ DBG("SIM inserted");
+ ofono_sim_inserted_notify(sim,TRUE);
+ break;
+ case 2:
+ DBG("SIM inserted and PIN unlocked");
+ break;
+ case 3:
+ DBG("SIM inserted and ready");
+ break;
+ default:
+ goto error;
+ }
+error:
+ return;
+}
+
+static void telit_pre_sim(struct ofono_modem *modem)
+{
+ GAtChat *chat = ofono_modem_get_data(modem);
+ struct ofono_sim *sim;
+
+ DBG("%p", modem);
+ DBG("CAHT %p", chat);
+
+ ofono_devinfo_create(modem, 0, "atmodem", chat);
+ sim = ofono_sim_create(modem, OFONO_VENDOR_TELIT, "atmodem", chat);
+ ofono_voicecall_create(modem, 0, "atmodem", chat);
+
+ if(sim) {
+ /* enable sim state notification */
+ g_at_chat_send(chat, "AT#QSS=1", NULL, NULL, NULL, NULL);
+ g_at_chat_register(chat, "#QSS:", telit_qss_notify, FALSE, sim, NULL);
+ /* query current sim state */
+ g_at_chat_send(chat, "AT#QSS?", NULL, telit_qss_cb, sim, NULL);
+ }
+}
+
+static void telit_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 telit_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;
+ int gps;
+
+ DBG("%p", modem);
+
+ gps = ofono_modem_get_integer(modem, "GPS");
+
+ if (gps)
+ g_at_chat_send(chat, "AT$GPSP=1", NULL, NULL, NULL, NULL);
+
+ ofono_ussd_create(modem, 0, "atmodem", chat); // +CUSD - Unstructured Supplementary Service Data
+ ofono_call_forwarding_create(modem, 0, "atmodem", chat);
+ ofono_call_settings_create(modem, 0, "atmodem", chat);
+ ofono_netreg_create(modem, OFONO_VENDOR_TELIT, "atmodem", chat);
+ ofono_call_meter_create(modem, 0, "atmodem", chat);
+ ofono_call_barring_create(modem, 0, "atmodem", chat);
+ //ofono_cbs_create(modem, 0, "atmodem", chat); //Cell Broadcast Service
+ 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 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)
diff --git a/plugins/udev.c b/plugins/udev.c
index cbb596d..2913b5b 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -588,6 +588,44 @@ 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;
+ gboolean found = FALSE;
+ gboolean gps = FALSE;
+
+ DBG("modem %p", modem);
+
+ entry = udev_device_get_properties_list_entry(udev_device);
+ while (entry) {
+ const char *name = udev_list_entry_get_name(entry);
+ const char *value = udev_list_entry_get_value(entry);
+
+ if (g_str_equal(name, "OFONO_TELIT_TYPE") == TRUE &&
+ g_str_equal(value, "modem") == TRUE) {
+ found = TRUE;
+ }
+ if (g_str_equal(name, "OFONO_TELIT_MODEL") == TRUE &&
+ g_str_equal(value, "UC864-G") == TRUE) {
+ gps = TRUE;
+ }
+ entry = udev_list_entry_get_next(entry);
+ }
+
+ if (found == FALSE)
+ return;
+
+ devnode = udev_device_get_devnode(udev_device);
+ ofono_modem_set_string(modem, "Device", devnode);
+
+ if(gps)
+ ofono_modem_set_integer(modem, "GPS", 1);
+
+ ofono_modem_register(modem);
+}
+
static void add_modem(struct udev_device *udev_device)
{
struct ofono_modem *modem;
@@ -682,6 +720,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.
9 years, 6 months
[PATCH V2 0/4] Add dial support for HFP emulator
by Frédéric Danis
Create a generic dial function that can be called by DBus or emulator
Add support of ATD and AT+BLDN
Save last dialed number in /var/lib/ofono/<modem>/voicecall to be used
by AT+BLDN
Frédéric Danis (4):
voicecall: create generic dial function
voicecall: add ATD support for HFP emulator
voicecall: save last dialed number
voicecall: add +BLDN support for HFP emulator
src/voicecall.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 218 insertions(+), 27 deletions(-)
9 years, 6 months
[PATCH_v6 0/5] Escape sequence and ATO0 implementation
by Guillaume Zajac
Hi,
Change log from v5:
- regroups multiple patches in one patch
- contains ATO0 implementation
- contains all resume function
- contains fix for not removing io_disconnect function
while unrefing GAtPPP if it is suspended
Guillaume Zajac (5):
gathdlc: add g_at_hdlc_resume() API
ppp_net: add ppp_net_resume_interface() API
gatppp: add public suspend/resume APIs and suspended state
emulator: add dun_ato_cb() definition and register it in GAtServer
gsmdial: add escape sequence/ATH0/ATO0 testing option
gatchat/gathdlc.c | 16 +++++++++++
gatchat/gathdlc.h | 1 +
gatchat/gatppp.c | 64 +++++++++++++++++++++++++++++++++++++++++++++-
gatchat/gatppp.h | 2 +
gatchat/gsmdial.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gatchat/ppp.h | 1 +
gatchat/ppp_net.c | 10 +++++++
src/emulator.c | 54 +++++++++++++++++++++++++++++++++++++++
8 files changed, 219 insertions(+), 2 deletions(-)
9 years, 6 months
Bluetooth Query
by Rishi Kumar
Hi Community,
I got one question. What are the Bluetooth Capabilities associated
with oFono. There is a Bluetooth Utility Plugin present in oFono.
However there is another Bluetooth Technology Plugin available in
Connman. Please help me understand the difference !
Thanks and Regards,
Rishi
9 years, 6 months
[PATCH 1/2] TODO: Remove owner of HSP task
by Frédéric Dalleau
---
TODO | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/TODO b/TODO
index 4093e54..4b291bd 100644
--- a/TODO
+++ b/TODO
@@ -118,7 +118,6 @@ Modem Emulator
Priority: Low
Complexity: C1
- Owner: Frédéric Dalleau <frederic.dalleau(a)linux.intel.com>
- Support DUN emulator. Implement the Bluetooth DUN profile with only mandatory
AT command support. Implement USB DUN as well.
--
1.7.1
9 years, 6 months
[PATCH] voicecall: remove unnecessary local var
by Frédéric Dalleau
---
src/voicecall.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 0273ed6..94a20a9 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2606,12 +2606,8 @@ static void sim_watch(struct ofono_atom *atom,
static void emulator_generic_cb(const struct ofono_error *error, void *data)
{
struct ofono_emulator *em = data;
- struct ofono_error result;
-
- result.error = error->error;
- result.type = error->type;
- ofono_emulator_send_final(em, &result);
+ ofono_emulator_send_final(em, error);
}
static void emulator_ata_cb(struct ofono_emulator *em,
--
1.7.1
9 years, 6 months
Could not able to detect ST Ericsson Modems
by Yuvaraj Ragupathi
Hi,
I am connecting ST Ericsson modem with Nokia N900 device.
N900 has Meego with CAIF protocol support. And i modified 97-ofono.rules
file to load ST Ericsson's modem
But N900 could not able to detect the ST Ericsson modem. I verified via
dmesg and lsusb commands.
Do i need to enable any modules in meego kernel?
Any suggestions?
Thanks
Yuvaraj R
9 years, 6 months
[PATCH v2] reopen once if open device failed
by Caiwen Zhang
(1) Sometimes when open the data device, it may fail. If open the data device failed,
retry once one second later.
(2) Fix Huawei NDIS modem gprs doesn't work issue
---
plugins/huawei.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index e791718..6b2caa4 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -80,6 +80,7 @@ struct huawei_data {
gboolean ndis;
guint sim_poll_timeout;
guint sim_poll_count;
+ guint reopen_timeout;
};
#define MAX_SIM_POLL_COUNT 5
@@ -107,6 +108,11 @@ static void huawei_remove(struct ofono_modem *modem)
DBG("%p", modem);
+ if (data->reopen_timeout > 0) {
+ g_source_remove(data->reopen_timeout);
+ data->reopen_timeout = 0;
+ }
+
ofono_modem_set_data(modem, NULL);
if (data->modem)
@@ -465,6 +471,20 @@ static GAtChat *open_device(struct ofono_modem *modem,
return chat;
}
+static void huawei_disconnect(gpointer user_data);
+
+static gboolean reopen_callback(gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct huawei_data *data = ofono_modem_get_data(modem);
+
+ huawei_disconnect(user_data);
+
+ data->reopen_timeout = 0;
+
+ return FALSE;
+}
+
static void huawei_disconnect(gpointer user_data)
{
struct ofono_modem *modem = user_data;
@@ -476,8 +496,17 @@ static void huawei_disconnect(gpointer user_data)
data->modem = NULL;
data->modem = open_device(modem, "Modem", "Modem: ");
- if (data->modem == NULL)
+ /* retry once if failed */
+ if (data->modem == NULL) {
+ if (data->reopen_timeout == 0) {
+ data->reopen_timeout =
+ g_timeout_add_seconds(1, reopen_callback,
+ modem);
+
+ ofono_debug("open device failed, try to reopen it.");
+ }
return;
+ }
g_at_chat_set_disconnect_function(data->modem,
huawei_disconnect, modem);
@@ -559,6 +588,11 @@ static int huawei_disable(struct ofono_modem *modem)
DBG("%p", modem);
+ if (data->reopen_timeout > 0) {
+ g_source_remove(data->reopen_timeout);
+ data->reopen_timeout = 0;
+ }
+
if (data->sim_poll_timeout > 0) {
g_source_remove(data->sim_poll_timeout);
data->sim_poll_timeout = 0;
@@ -682,16 +716,15 @@ static void huawei_post_online(struct ofono_modem *modem)
ofono_ussd_create(modem, OFONO_VENDOR_QUALCOMM_MSM,
"atmodem", data->pcui);
- if ((data->sim_state == HUAWEI_SIM_STATE_VALID ||
- data->sim_state == HUAWEI_SIM_STATE_INVALID_CS) &&
- data->modem != NULL) {
+ if (data->sim_state == HUAWEI_SIM_STATE_VALID ||
+ data->sim_state == HUAWEI_SIM_STATE_INVALID_CS) {
data->gprs = ofono_gprs_create(modem, OFONO_VENDOR_HUAWEI,
"atmodem", data->pcui);
if (data->ndis == TRUE)
data->gc = ofono_gprs_context_create(modem, 0,
"huaweimodem", data->pcui);
- else
+ else if (data->modem != NULL)
data->gc = ofono_gprs_context_create(modem, 0,
"atmodem", data->modem);
--
1.7.5
9 years, 6 months
[PATCH v2] voicecall: add +VTS support for HFP emulator
by Frédéric Dalleau
---
src/voicecall.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 2ab67ac..0273ed6 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2421,6 +2421,10 @@ static void emulator_hfp_unregister(struct ofono_atom *atom)
OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_remove_handler,
"+CHLD");
+ __ofono_modem_foreach_registered_atom(modem,
+ OFONO_ATOM_TYPE_EMULATOR_HFP,
+ emulator_remove_handler,
+ "+VTS");
__ofono_modem_remove_atom_watch(modem, vc->hfp_watch);
}
@@ -2866,6 +2870,53 @@ fail:
ofono_emulator_send_final(em, &result);
}
+static void vts_tone_cb(int error, void *data)
+{
+ struct ofono_emulator *em = data;
+ struct ofono_error result;
+
+ result.error = 0;
+ result.type = error ? OFONO_ERROR_TYPE_FAILURE :
+ OFONO_ERROR_TYPE_NO_ERROR;
+
+ ofono_emulator_send_final(em, &result);
+}
+
+static void emulator_vts_cb(struct ofono_emulator *em,
+ struct ofono_emulator_request *req, void *userdata)
+{
+ struct ofono_voicecall *vc = userdata;
+ struct ofono_error result;
+ const char *str;
+
+ switch (ofono_emulator_request_get_type(req)) {
+ case OFONO_EMULATOR_REQUEST_TYPE_SET:
+ str = ofono_emulator_request_get_raw(req);
+ if (str == NULL)
+ break;
+
+ if (!g_ascii_isdigit(str[0]) && str[0] != '*' && str[0] != '#'
+ && (str[0] < 'A' || str[0] > 'D'))
+ break;
+
+ if (str[1] != '\0')
+ break;
+
+ if (__ofono_voicecall_tone_send(vc, str, vts_tone_cb, em) >= 0)
+ return;
+
+ break;
+
+ default:
+ break;
+ }
+
+ result.error = 0;
+ result.type = OFONO_ERROR_TYPE_FAILURE;
+
+ ofono_emulator_send_final(em, &result);
+}
+
static void emulator_hfp_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond,
void *data)
@@ -2881,6 +2932,7 @@ static void emulator_hfp_watch(struct ofono_atom *atom,
ofono_emulator_add_handler(em, "+CHUP", emulator_chup_cb, data, NULL);
ofono_emulator_add_handler(em, "+CLCC", emulator_clcc_cb, data, NULL);
ofono_emulator_add_handler(em, "+CHLD", emulator_chld_cb, data, NULL);
+ ofono_emulator_add_handler(em, "+VTS", emulator_vts_cb, data, NULL);
}
void ofono_voicecall_register(struct ofono_voicecall *vc)
--
1.7.1
9 years, 6 months
