This is a "leaf" header and doesn't even have header guards, but it still seems natural that the header should pull in its own declarations rather than relying on the including source file to ensure that they are included. --- src/common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common.h b/src/common.h index ef4c58d..05f2a85 100644 --- a/src/common.h +++ b/src/common.h @@ -19,6 +19,10 @@ * */ +#include <glib.h> + +#include <ofono/types.h> + /* 27.007 Section 7.3 <AcT> */ enum access_technology { ACCESS_TECHNOLOGY_GSM = 0, -- 2.9.3

When the modem attaches to an LTE network, a default bearer is automatically negotiated using the "defalt profile" settings. The QMI modem, however, does not given any explicit indication that the bearer exists; instead, we must assume its existence based on the network registration state. This patch extends the GPRS atom to signal the presence of a default bearer when it detects network connectivity on an LTE network. The GPRS atom gets a new 'attached' property based on whether it has been manually attached or automatically "attached" by virtue of connecting to an LTE network. Here we abuse the word "attach" since attach'ing isn't really an LTE concept, but it fits with the model that Ofono wants. --- drivers/qmimodem/gprs.c | 102 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/drivers/qmimodem/gprs.c b/drivers/qmimodem/gprs.c index 05ad4bd..c5bdf5e 100644 --- a/drivers/qmimodem/gprs.c +++ b/drivers/qmimodem/gprs.c @@ -23,6 +23,8 @@ #include <config.h> #endif +#include <glib.h> /* this include belongs in common.h */ + #include <ofono/log.h> #include <ofono/modem.h> #include <ofono/gprs.h> @@ -30,16 +32,20 @@ #include "qmi.h" #include "nas.h" +#include "src/common.h" #include "qmimodem.h" struct gprs_data { struct qmi_service *nas; + int attached; }; -static bool extract_ss_info(struct qmi_result *result, int *status) +static bool extract_ss_info(struct qmi_result *result, int *status, int *tech) { const struct qmi_nas_serving_system *ss; + uint8_t roaming; uint16_t len; + int i; DBG(""); @@ -47,25 +53,71 @@ static bool extract_ss_info(struct qmi_result *result, int *status) if (!ss) return false; - if (ss->ps_state == QMI_NAS_ATTACH_STATE_ATTACHED) - *status = 0x01; - else - *status = 0x00; + *status = ss->status; + + *tech = -1; + for (i = 0; i < ss->radio_if_count; i++) { + DBG("radio in use %d", ss->radio_if[i]); + + *tech = qmi_nas_rat_to_tech(ss->radio_if[i]); + } + + if (qmi_result_get_uint8(result, QMI_NAS_RESULT_ROAMING_STATUS, + &roaming)) { + if (ss->status == 1 && roaming == 0) + *status = NETWORK_REGISTRATION_STATUS_ROAMING; + } return true; } -static void ss_info_notify(struct qmi_result *result, void *user_data) +static int handle_ss_info(struct qmi_result* result, struct ofono_gprs* gprs) { - struct ofono_gprs *gprs = user_data; + struct gprs_data *data = ofono_gprs_get_data(gprs); int status; + int tech; DBG(""); - if (!extract_ss_info(result, &status)) - return; + if (!extract_ss_info(result, &status, &tech)) + return -1; + + switch (status) { + case NETWORK_REGISTRATION_STATUS_REGISTERED: + case NETWORK_REGISTRATION_STATUS_ROAMING: + if (tech == ACCESS_TECHNOLOGY_EUTRAN && !data->attached) { + /* On LTE we are effectively always attached; and + * the default bearer is established as soon as the + * network is joined. + */ + data->attached = 1; + /* FIXME: query default profile number and APN + * instead of assuming profile 1 + */ + ofono_gprs_cid_activated(gprs, 1, ""); + } + break; + default: + break; + } - ofono_gprs_status_notify(gprs, status); + if (!data->attached) + status = NETWORK_REGISTRATION_STATUS_NOT_REGISTERED; + + return status; +} + +static void ss_info_notify(struct qmi_result* result, void *user_data) +{ + struct ofono_gprs* gprs = user_data; + int status; + + DBG(""); + + status = handle_ss_info(result, gprs); + + if (status >= 0) + ofono_gprs_status_notify(gprs, status); } static void attach_detach_cb(struct qmi_result *result, void *user_data) @@ -100,6 +152,8 @@ static void qmi_set_attached(struct ofono_gprs *gprs, int attached, DBG("attached %d", attached); + data->attached = attached; + if (attached) action = QMI_NAS_ATTACH_ACTION_ATTACH; else @@ -121,25 +175,29 @@ error: g_free(cbd); } -static void get_ss_info_cb(struct qmi_result *result, void *user_data) +static void get_ss_info_cb(struct qmi_result* result, void *user_data) { struct cb_data *cbd = user_data; + struct ofono_gprs* gprs = cbd->user; ofono_gprs_status_cb_t cb = cbd->cb; int status; DBG(""); - if (qmi_result_set_error(result, NULL)) { - CALLBACK_WITH_FAILURE(cb, -1, cbd->data); - return; - } + if (qmi_result_set_error(result, NULL)) + goto error; - if (!extract_ss_info(result, &status)) { - CALLBACK_WITH_FAILURE(cb, -1, cbd->data); - return; - } + status = handle_ss_info(result, gprs); + + if (status < 0) + goto error; CALLBACK_WITH_SUCCESS(cb, status, cbd->data); + + return; + +error: + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); } static void qmi_attached_status(struct ofono_gprs *gprs, @@ -150,6 +208,12 @@ static void qmi_attached_status(struct ofono_gprs *gprs, DBG(""); + if (!data->attached) { + CALLBACK_WITH_SUCCESS(cb, + NETWORK_REGISTRATION_STATUS_NOT_REGISTERED, user_data); + } + + cbd->user = gprs; if (qmi_service_send(data->nas, QMI_NAS_GET_SS_INFO, NULL, get_ss_info_cb, cbd, g_free) > 0) return; -- 2.9.3

This patch adds the boilerplate for an LTE atom for QMI modems. This atom is supposed to set the APN that the default bearer uses to connect to the network. The part that is missing currently is actually writing the APN into the modem's default profile. In many cases, however, the network does not actually require a correct APN in order to connect to the network so it's moot whether or not this atom actually completes its task! For now, thus, this atom just emits a warning so that this can be fully implemented when there's a network that cares about the APN to test against. For completeness, what is supposed to happen is that this atom is supposed to call "Modify Profile" on the "default" profile, setting the APN. The default profile should probably be queried because it can be set to something other than profile number one (1). Once configured, the default profile settings are used when the modem connects to the network; for this reason, the LTE atom needs to be instantiated in post_sim, before the modem is set online. --- Makefile.am | 1 + drivers/qmimodem/lte.c | 143 ++++++++++++++++++++++++++++++++++++++++++++ drivers/qmimodem/qmimodem.c | 2 + drivers/qmimodem/qmimodem.h | 3 + 4 files changed, 149 insertions(+) create mode 100644 drivers/qmimodem/lte.c diff --git a/Makefile.am b/Makefile.am index c894496..60c205a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -232,6 +232,7 @@ builtin_sources += $(qmi_sources) \ drivers/qmimodem/ussd.c \ drivers/qmimodem/gprs.c \ drivers/qmimodem/gprs-context.c \ + drivers/qmimodem/lte.c \ drivers/qmimodem/radio-settings.c \ drivers/qmimodem/location-reporting.c diff --git a/drivers/qmimodem/lte.c b/drivers/qmimodem/lte.c new file mode 100644 index 0000000..e131b47 --- /dev/null +++ b/drivers/qmimodem/lte.c @@ -0,0 +1,143 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2017 Jonas Bonn. All rights reserved. + * Copyright (C) 2017 South Pole Consulting AB. 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 <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <glib.h> + +#include <ofono/modem.h> +#include <ofono/gprs-context.h> +#include <ofono/log.h> +#include <ofono/lte.h> + +#include "qmi.h" +#include "wds.h" + +#include "qmimodem.h" + +struct lte_data { + struct qmi_service *wds; + char* apn; +}; + +static void qmimodem_lte_set_default_attach_info(const struct ofono_lte *lte, + const struct ofono_lte_default_attach_info *info, + ofono_lte_cb_t cb, void *data) +{ + struct lte_data *ldd = ofono_lte_get_data(lte); + + DBG("LTE config with APN: %s", info->apn); + + g_free(ldd->apn); + + if (strlen(info->apn) > 0) + ldd->apn = g_strdup(info->apn); + else + ldd->apn = NULL; + + /* + * FIXME: The above is not sufficient. The APN needs to be set + * to the 'default' profile so that the modem uses it when + * connecting the default bearer. + */ + ofono_warn("LTE APN needs to be written to default profile"); + + CALLBACK_WITH_SUCCESS(cb, data); +} + +static void create_wds_cb(struct qmi_service *service, void *user_data) +{ + struct ofono_lte *lte = user_data; + struct lte_data *data = ofono_lte_get_data(lte); + + DBG(""); + + if (!service) { + ofono_error("Failed to request WDS service"); + ofono_lte_remove(lte); + return; + } + + data->wds = qmi_service_ref(service); + + ofono_lte_register(lte); +} + +static int qmimodem_lte_probe(struct ofono_lte *lte, void *data) +{ + struct qmi_device *device = data; + struct lte_data *ldd; + + DBG("qmimodem lte probe"); + + ldd = g_try_new0(struct lte_data, 1); + if (!ldd) + return -ENOMEM; + + ofono_lte_set_data(lte, ldd); + + qmi_service_create(device, QMI_SERVICE_WDS, + create_wds_cb, lte, NULL); + + return 0; +} + +static void qmimodem_lte_remove(struct ofono_lte *lte) +{ + struct lte_data *ldd = ofono_lte_get_data(lte); + + DBG(""); + + ofono_lte_set_data(lte, NULL); + + qmi_service_unregister_all(ldd->wds); + + qmi_service_unref(ldd->wds); + + g_free(ldd->apn); + + g_free(ldd); +} + +static struct ofono_lte_driver driver = { + .name = "qmimodem", + .probe = qmimodem_lte_probe, + .remove = qmimodem_lte_remove, + .set_default_attach_info = qmimodem_lte_set_default_attach_info, +}; + +void qmi_lte_init(void) +{ + ofono_lte_driver_register(&driver); +} + +void qmi_lte_exit(void) +{ + ofono_lte_driver_unregister(&driver); +} diff --git a/drivers/qmimodem/qmimodem.c b/drivers/qmimodem/qmimodem.c index 959a901..2ce5c02 100644 --- a/drivers/qmimodem/qmimodem.c +++ b/drivers/qmimodem/qmimodem.c @@ -39,6 +39,7 @@ static int qmimodem_init(void) qmi_ussd_init(); qmi_gprs_init(); qmi_gprs_context_init(); + qmi_lte_init(); qmi_radio_settings_init(); qmi_location_reporting_init(); @@ -49,6 +50,7 @@ static void qmimodem_exit(void) { qmi_location_reporting_exit(); qmi_radio_settings_exit(); + qmi_lte_exit(); qmi_gprs_context_exit(); qmi_gprs_exit(); qmi_ussd_exit(); diff --git a/drivers/qmimodem/qmimodem.h b/drivers/qmimodem/qmimodem.h index 1fc8682..4667334 100644 --- a/drivers/qmimodem/qmimodem.h +++ b/drivers/qmimodem/qmimodem.h @@ -48,6 +48,9 @@ extern void qmi_gprs_exit(void); extern void qmi_gprs_context_init(void); extern void qmi_gprs_context_exit(void); +extern void qmi_lte_init(void); +extern void qmi_lte_exit(void); + extern void qmi_radio_settings_init(void); extern void qmi_radio_settings_exit(void); -- 2.9.3