Hi Jonas, On 09/07/2017 09:40 PM, Jonas Bonn wrote: count is a 16 bit integer in LE format. So you have an endian bug here... endian bug endian bug endian bug Regards, -Denis

This adds Quectel-specific functionality for initializing and getting the GPS/NMEA file descriptor. This is common to both AT and QMI modems as the GPS functionality needs to be set up via AT commands in both cases. --- Makefile.am | 6 + drivers/quectelmodem/location-reporting.c | 227 ++++++++++++++++++++++++++++++ drivers/quectelmodem/quectelmodem.c | 50 +++++++ drivers/quectelmodem/quectelmodem.h | 25 ++++ 4 files changed, 308 insertions(+) create mode 100644 drivers/quectelmodem/location-reporting.c create mode 100644 drivers/quectelmodem/quectelmodem.c create mode 100644 drivers/quectelmodem/quectelmodem.h diff --git a/Makefile.am b/Makefile.am index 4b68beb..4941b4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -319,6 +319,12 @@ builtin_sources += drivers/atmodem/atutil.h \ drivers/mbmmodem/stk.c \ drivers/mbmmodem/location-reporting.c +builtin_modules += quectelmodem +builtin_sources += drivers/atmodem/atutil.h \ + drivers/quectelmodem/quectelmodem.h \ + drivers/quectelmodem/quectelmodem.c \ + drivers/quectelmodem/location-reporting.c + builtin_modules += telitmodem builtin_sources += drivers/atmodem/atutil.h \ drivers/telitmodem/telitmodem.h \ diff --git a/drivers/quectelmodem/location-reporting.c b/drivers/quectelmodem/location-reporting.c new file mode 100644 index 0000000..2ed19cd --- /dev/null +++ b/drivers/quectelmodem/location-reporting.c @@ -0,0 +1,227 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2014 Intel Corporation. All rights reserved. + * Copyright (C) 2017 Jonas Bonn. 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 + +#define _GNU_SOURCE +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <unistd.h> + +#include <glib.h> + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/location-reporting.h> + +#include "gatchat.h" +#include "gatresult.h" +#include "gattty.h" + +#include "quectelmodem.h" + +static const char *none_prefix[] = { NULL }; + +struct gps_data { + GAtChat *chat; +}; + +static void quectel_gps_disable_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct cb_data *cbd = user_data; + struct ofono_location_reporting *lr = cbd->user; + ofono_location_reporting_disable_cb_t cb = cbd->cb; + + DBG("lr=%p, ok=%d", lr, ok); + + if (!ok) { + struct ofono_error error; + + decode_at_error(&error, g_at_result_final_response(result)); + cb(&error, cbd->data); + + return; + } + + CALLBACK_WITH_SUCCESS(cb, cbd->data); +} + +static void quectel_location_reporting_disable( + struct ofono_location_reporting *lr, + ofono_location_reporting_disable_cb_t cb, + void *data) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + struct cb_data *cbd = cb_data_new(cb, data); + + DBG("lr=%p", lr); + + cbd->user = lr; + + if (g_at_chat_send(gd->chat, "AT+QGPSEND", none_prefix, + quectel_gps_disable_cb, cbd, g_free) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, data); + + g_free(cbd); +} + +static int enable_data_stream(struct ofono_location_reporting *lr) +{ + struct ofono_modem *modem; + const char *gps_dev; + GHashTable *options; + GIOChannel *channel; + int fd; + + modem = ofono_location_reporting_get_modem(lr); + gps_dev = ofono_modem_get_string(modem, "GPS"); + + options = g_hash_table_new(g_str_hash, g_str_equal); + if (options == NULL) + return -1; + + g_hash_table_insert(options, "Baud", "115200"); + + channel = g_at_tty_open(gps_dev, options); + + g_hash_table_destroy(options); + + if (channel == NULL) + return -1; + + fd = g_io_channel_unix_get_fd(channel); + + g_io_channel_set_close_on_unref(channel, FALSE); + g_io_channel_unref(channel); + + return fd; +} + +static void quectel_gps_enable_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct cb_data *cbd = user_data; + ofono_location_reporting_enable_cb_t cb = cbd->cb; + struct ofono_location_reporting *lr = cbd->user; + struct ofono_error error; + int fd; + + DBG("lr=%p ok=%d", lr, ok); + + decode_at_error(&error, g_at_result_final_response(result)); + + if (!ok) { + cb(&error, -1, cbd->data); + + g_free(cbd); + return; + } + + fd = enable_data_stream(lr); + if (fd < 0) { + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); + + return; + } + + cb(&error, fd, cbd->data); + close(fd); +} + +static void quectel_location_reporting_enable( + struct ofono_location_reporting *lr, + ofono_location_reporting_enable_cb_t cb, + void *data) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + struct cb_data *cbd = cb_data_new(cb, data); + + DBG("lr=%p", lr); + + cbd->user = lr; + + if (g_at_chat_send(gd->chat, "AT+QGPS=1", none_prefix, + quectel_gps_enable_cb, cbd, NULL) > 0) + return; + + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); + g_free(cbd); +} + +static int quectel_location_reporting_probe( + struct ofono_location_reporting *lr, + unsigned int vendor, void *data) +{ + GAtChat *chat = data; + struct gps_data *gd; + + DBG(""); + + gd = g_try_new0(struct gps_data, 1); + if (gd == NULL) + return -ENOMEM; + + gd->chat = g_at_chat_clone(chat); + + ofono_location_reporting_set_data(lr, gd); + + ofono_location_reporting_register(lr); + + return 0; +} + +static void quectel_location_reporting_remove( + struct ofono_location_reporting *lr) +{ + struct gps_data *gd = ofono_location_reporting_get_data(lr); + + ofono_location_reporting_set_data(lr, NULL); + + g_at_chat_unref(gd->chat); + g_free(gd); +} + +static struct ofono_location_reporting_driver driver = { + .name = "quectelmodem", + .type = OFONO_LOCATION_REPORTING_TYPE_NMEA, + .probe = quectel_location_reporting_probe, + .remove = quectel_location_reporting_remove, + .enable = quectel_location_reporting_enable, + .disable = quectel_location_reporting_disable, +}; + +void quectel_location_reporting_init() +{ + ofono_location_reporting_driver_register(&driver); +} + +void quectel_location_reporting_exit() +{ + ofono_location_reporting_driver_unregister(&driver); +} diff --git a/drivers/quectelmodem/quectelmodem.c b/drivers/quectelmodem/quectelmodem.c new file mode 100644 index 0000000..66cc3f2 --- /dev/null +++ b/drivers/quectelmodem/quectelmodem.c @@ -0,0 +1,50 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2017 Jonas Bonn. 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 <glib.h> +#include <gatchat.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/types.h> + +#include "quectelmodem.h" + +static int quectelmodem_init(void) +{ + quectel_location_reporting_init(); + + return 0; +} + +static void quectelmodem_exit(void) +{ + quectel_location_reporting_exit(); +} + +OFONO_PLUGIN_DEFINE(quectelmodem, "Quectel modem driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, + quectelmodem_init, quectelmodem_exit) diff --git a/drivers/quectelmodem/quectelmodem.h b/drivers/quectelmodem/quectelmodem.h new file mode 100644 index 0000000..8a4a9e9 --- /dev/null +++ b/drivers/quectelmodem/quectelmodem.h @@ -0,0 +1,25 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Jonas Bonn. 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 + * + */ + +#include <drivers/atmodem/atutil.h> + +extern void quectel_location_reporting_init(); +extern void quectel_location_reporting_exit(); -- 2.9.3

Using location-reporting requires both the 'aux' and 'gps' interfaces; the GPS interface is interface 1, not 2. --- plugins/udevng.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 4a11cd1..518eda8 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -876,7 +876,7 @@ static gboolean setup_quectel(struct modem_info *modem) static gboolean setup_quectelqmi(struct modem_info *modem) { - const char *qmi = NULL, *net = NULL, *gps = NULL; + const char *qmi = NULL, *net = NULL, *gps = NULL, *aux = NULL; GSList *list; DBG("%s", modem->syspath); @@ -894,8 +894,11 @@ static gboolean setup_quectelqmi(struct modem_info *modem) else if (g_strcmp0(info->subsystem, "usbmisc") == 0) qmi = info->devnode; } else if (g_strcmp0(info->interface, "255/0/0") == 0 && - g_strcmp0(info->number, "02") == 0) { + g_strcmp0(info->number, "01") == 0) { gps = info->devnode; + } else if (g_strcmp0(info->interface, "255/0/0") == 0 && + g_strcmp0(info->number, "02") == 0) { + aux = info->devnode; } } @@ -909,8 +912,12 @@ static gboolean setup_quectelqmi(struct modem_info *modem) ofono_modem_set_string(modem->modem, "Device", qmi); ofono_modem_set_string(modem->modem, "NetworkInterface", net); + DBG("gps=%s aux=%s", gps, aux); + if (gps) ofono_modem_set_string(modem->modem, "GPS", gps); + if (aux) + ofono_modem_set_string(modem->modem, "Aux", aux); ofono_modem_set_driver(modem->modem, "gobi"); -- 2.9.3

This patch is submitted as a request for advice: where should these changes go??? The patch is required for Quectel QMI modems to get location-reporting working: the 'aux' AT interface needs to be set up and passed to the location-reporting atom. But this is very Quectel specific and has nothing to do with Gobi at all. So what's the best approach here...? --- plugins/gobi.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/plugins/gobi.c b/plugins/gobi.c index bc2b068..962c947 100644 --- a/plugins/gobi.c +++ b/plugins/gobi.c @@ -29,6 +29,10 @@ #include <unistd.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/modem.h> @@ -319,10 +323,18 @@ static void discover_cb(uint8_t count, const struct qmi_version *list, create_dms_cb, modem, NULL); } +static void q_debug(const char* str, void *user_data) +{ + const char* prefix = user_data; + + ofono_info("%s%s", prefix, str); +} + static int gobi_enable(struct ofono_modem *modem) { struct gobi_data *data = ofono_modem_get_data(modem); const char *device; + const char *gps, *aux; int fd; DBG("%p", modem); @@ -348,6 +360,27 @@ static int gobi_enable(struct ofono_modem *modem) qmi_device_discover(data->device, discover_cb, modem, NULL); + aux = ofono_modem_get_string(modem, "Aux"); + gps = ofono_modem_get_string(modem, "GPS"); + DBG("aux = %s, gps = %s", aux, gps); + if (aux && gps) { + GAtChat *chat; + GAtSyntax *syntax; + GHashTable *options; + GIOChannel *channel; + DBG("Setting up location service"); + options = g_hash_table_new(g_str_hash, g_str_equal); + g_hash_table_insert(options, "Baud", "115200"); + channel = g_at_tty_open(aux, options); + 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 (getenv("OFONO_AT_DEBUG")) + g_at_chat_set_debug(chat, q_debug, "Aux: "); + ofono_location_reporting_create(modem, 0, "quectelmodem", chat); + } + return -EINPROGRESS; } -- 2.9.3

This provides the list of available technologies in the radio-settings atom. The list is queried by the DMS Get Capabilities method; ofono takes care of caching the available technologies for us so we don't need to worry about this method being called excessively. --- I forgot to edit the commit message in the first submission. Here's a patch with a correct description. /Jonas drivers/qmimodem/radio-settings.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c index 3a2b068..5e76bc5 100644 --- a/drivers/qmimodem/radio-settings.c +++ b/drivers/qmimodem/radio-settings.c @@ -29,11 +29,13 @@ #include "qmi.h" #include "nas.h" +#include "dms.h" #include "qmimodem.h" struct settings_data { struct qmi_service *nas; + struct qmi_service *dms; uint16_t major; uint16_t minor; }; @@ -150,6 +152,78 @@ static void qmi_set_rat_mode(struct ofono_radio_settings *rs, g_free(cbd); } +static void get_caps_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb; + const struct qmi_dms_device_caps *caps; + unsigned int available_rats; + uint16_t len; + uint8_t i; + + DBG(""); + + if (qmi_result_set_error(result, NULL)) + goto error; + + caps = qmi_result_get(result, QMI_DMS_RESULT_DEVICE_CAPS, &len); + if (!caps) + goto error; + + available_rats = 0; + for (i = 0; i < caps->radio_if_count; i++) { + switch (caps->radio_if[i]) { + case QMI_DMS_RADIO_IF_GSM: + available_rats |= OFONO_RADIO_ACCESS_MODE_GSM; + break; + case QMI_DMS_RADIO_IF_UMTS: + available_rats |= OFONO_RADIO_ACCESS_MODE_UMTS; + break; + case QMI_DMS_RADIO_IF_LTE: + available_rats |= OFONO_RADIO_ACCESS_MODE_LTE; + } + } + + CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data); + + return; + +error: + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); +} + +static void qmi_query_available_rats(struct ofono_radio_settings *rs, + ofono_radio_settings_available_rats_query_cb_t cb, + void *data) +{ + struct settings_data *rsd = ofono_radio_settings_get_data(rs); + struct cb_data *cbd = cb_data_new(cb, data); + + if (!rsd->dms) + goto error; + + if (qmi_service_send(rsd->dms, QMI_DMS_GET_CAPS, NULL, + get_caps_cb, cbd, g_free) > 0) + return; + +error: + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, -1, data); +} + +static void create_dms_cb(struct qmi_service *service, void *user_data) +{ + struct ofono_radio_settings *rs = user_data; + struct settings_data *data = ofono_radio_settings_get_data(rs); + + DBG(""); + + if (!service) + return; + + data->dms = qmi_service_ref(service); +} + static void create_nas_cb(struct qmi_service *service, void *user_data) { struct ofono_radio_settings *rs = user_data; @@ -186,6 +260,8 @@ static int qmi_radio_settings_probe(struct ofono_radio_settings *rs, ofono_radio_settings_set_data(rs, data); + qmi_service_create_shared(device, QMI_SERVICE_DMS, + create_dms_cb, rs, NULL); qmi_service_create_shared(device, QMI_SERVICE_NAS, create_nas_cb, rs, NULL); @@ -213,6 +289,7 @@ static struct ofono_radio_settings_driver driver = { .remove = qmi_radio_settings_remove, .set_rat_mode = qmi_set_rat_mode, .query_rat_mode = qmi_query_rat_mode, + .query_available_rats = qmi_query_available_rats, }; void qmi_radio_settings_init(void) -- 2.9.3