10:11 p.m.
Disabling "maintainer mode" is not particularly useful as it really only
saves people who accidentally touch a build system file in an
unrealistically constrained system where the build tools are uninstalled
and unavailable.
This patch just changes the default to 'enabled' so that the changes to
build system files have the desired effect.
Passing --disable-maintainer-mode to ./configure restores the previous
behaviour for the (likely non-existant) users who actually require to do
so.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 29a01c2..ecd2165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
AC_PREFIX_DEFAULT(/usr/local)
--
2.9.3
10:11 p.m.
New subject: [PATCH 2/5] qmi: implement RAT selection
The QMI radio-settings atom was just a skeleton and did not even implement
the mandtory property TechnologyPreference. As such, it probably should
never even have been registered for the modem. Nonetheless, this patch
puts this mandatory property into place.
This is implemented via the 'Set System Selection' method by way of the
'mode' parameter. This seems to best reflect the intention of the Ofono
API and works as expected when tested with a Quectel EC21.
Some notes:
i) There is an alternative function called 'Set Technology Preference'
which provides similar functionality. This 'technology preference'
is updated automatically when the 'system selection mode' is modified
so everything seems to be in order.
ii) For the EC21, switching the underlying technology works seamlessly.
There are indications, however, that some modems _might_ require a
reset before changes take effect; that bridge will need to be crossed
if reached.
---
drivers/qmimodem/nas.h | 11 ++++
drivers/qmimodem/radio-settings.c | 119 ++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/drivers/qmimodem/nas.h b/drivers/qmimodem/nas.h
index d2feb46..c3e7546 100644
--- a/drivers/qmimodem/nas.h
+++ b/drivers/qmimodem/nas.h
@@ -35,6 +35,8 @@
#define QMI_NAS_SS_INFO_IND 36 /* Current serving system info indication */
#define QMI_NAS_GET_HOME_INFO 37 /* Get info about home network */
+#define QMI_NAS_SET_SYSTEM_SELECTION_PREF 51
+#define QMI_NAS_GET_SYSTEM_SELECTION_PREF 52
/* Set NAS state report conditions */
#define QMI_NAS_PARAM_REPORT_SIGNAL_STRENGTH 0x10
@@ -164,4 +166,13 @@ struct qmi_nas_home_network {
char desc[0];
} __attribute__((__packed__));
+#define QMI_NAS_RAT_MODE_PREF_ANY (-1)
+#define QMI_NAS_RAT_MODE_PREF_GSM (1 << 2)
+#define QMI_NAS_RAT_MODE_PREF_UMTS (1 << 3)
+#define QMI_NAS_RAT_MODE_PREF_LTE (1 << 4)
+
+#define QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE 0x11
+
+#define QMI_NAS_RESULT_SYSTEM_SELECTION_PREF_MODE 0x11
+
int qmi_nas_rat_to_tech(uint8_t rat);
diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c
index 04106ea..ed578f8 100644
--- a/drivers/qmimodem/radio-settings.c
+++ b/drivers/qmimodem/radio-settings.c
@@ -38,6 +38,123 @@ struct settings_data {
uint16_t minor;
};
+static void get_system_selection_pref_cb(struct qmi_result *result,
+ void* user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+ enum ofono_radio_access_mode mode = OFONO_RADIO_ACCESS_MODE_ANY;
+ uint16_t pref;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, NULL)) {
+ CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+ return;
+ }
+
+ qmi_result_get_uint16(result,
+ QMI_NAS_RESULT_SYSTEM_SELECTION_PREF_MODE, &pref);
+
+ switch (pref) {
+ case QMI_NAS_RAT_MODE_PREF_GSM:
+ mode = OFONO_RADIO_ACCESS_MODE_GSM;
+ break;
+ case QMI_NAS_RAT_MODE_PREF_UMTS:
+ mode = OFONO_RADIO_ACCESS_MODE_UMTS;
+ break;
+ case QMI_NAS_RAT_MODE_PREF_LTE:
+ mode = OFONO_RADIO_ACCESS_MODE_LTE;
+ break;
+ }
+
+ CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
+}
+
+
+static void qmi_query_rat_mode(struct ofono_radio_settings *rs,
+ ofono_radio_settings_rat_mode_query_cb_t cb,
+ void *user_data)
+{
+ struct settings_data *data = ofono_radio_settings_get_data(rs);
+ struct cb_data *cbd = cb_data_new(cb, user_data);
+
+ DBG("");
+
+ if (qmi_service_send(data->nas,
+ QMI_NAS_GET_SYSTEM_SELECTION_PREF, NULL,
+ get_system_selection_pref_cb, cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+}
+
+static void set_system_selection_pref_cb(struct qmi_result *result,
+ void* user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_radio_settings_rat_mode_set_cb_t cb = cbd->cb;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, NULL)) {
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_set_rat_mode(struct ofono_radio_settings *rs,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *user_data)
+{
+ struct settings_data *data = ofono_radio_settings_get_data(rs);
+ struct cb_data *cbd = cb_data_new(cb, user_data);
+ uint16_t pref = QMI_NAS_RAT_MODE_PREF_ANY;
+ struct qmi_param *param;
+
+ DBG("");
+
+ switch (mode) {
+ case OFONO_RADIO_ACCESS_MODE_ANY:
+ pref = QMI_NAS_RAT_MODE_PREF_ANY;
+ break;
+ case OFONO_RADIO_ACCESS_MODE_GSM:
+ pref = QMI_NAS_RAT_MODE_PREF_GSM;
+ break;
+ case OFONO_RADIO_ACCESS_MODE_UMTS:
+ pref = QMI_NAS_RAT_MODE_PREF_UMTS;
+ break;
+ case OFONO_RADIO_ACCESS_MODE_LTE:
+ pref = QMI_NAS_RAT_MODE_PREF_LTE;
+ break;
+ }
+
+ param = qmi_param_new();
+ if (!param) {
+ CALLBACK_WITH_FAILURE(cb, user_data);
+ return;
+ }
+
+ qmi_param_append_uint16(param, QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE,
+ pref);
+
+ if (qmi_service_send(data->nas,
+ QMI_NAS_SET_SYSTEM_SELECTION_PREF, param,
+ set_system_selection_pref_cb, cbd, g_free) > 0)
+ return;
+
+ qmi_param_free(param);
+
+
+ CALLBACK_WITH_FAILURE(cb, user_data);
+
+ g_free(cbd);
+}
+
+
static void create_nas_cb(struct qmi_service *service, void *user_data)
{
struct ofono_radio_settings *rs = user_data;
@@ -100,6 +217,8 @@ static struct ofono_radio_settings_driver driver = {
.name = "qmimodem",
.probe = qmi_radio_settings_probe,
.remove = qmi_radio_settings_remove,
+ .set_rat_mode = qmi_set_rat_mode,
+ .query_rat_mode = qmi_query_rat_mode,
};
void qmi_radio_settings_init(void)
--
2.9.3
2:55 a.m.
New subject: [PATCH 2/5] qmi: implement RAT selection
Hi Jonas,
On 09/07/2017 07:11 AM, Jonas Bonn wrote:
The QMI radio-settings atom was just a skeleton and did not even
implement
the mandtory property TechnologyPreference. As such, it probably should
never even have been registered for the modem. Nonetheless, this patch
puts this mandatory property into place.
This is implemented via the 'Set System Selection' method by way of the
'mode' parameter. This seems to best reflect the intention of the Ofono
API and works as expected when tested with a Quectel EC21.
Some notes:
i) There is an alternative function called 'Set Technology Preference'
which provides similar functionality. This 'technology preference'
is updated automatically when the 'system selection mode' is modified
so everything seems to be in order.
ii) For the EC21, switching the underlying technology works seamlessly.
There are indications, however, that some modems _might_ require a
reset before changes take effect; that bridge will need to be crossed
if reached.
---
drivers/qmimodem/nas.h | 11 ++++
drivers/qmimodem/radio-settings.c | 119 ++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
I squashed a couple of extraneous empty lines and applied this patch.
Thanks!
Regards,
-Denis
10:11 p.m.
New subject: [PATCH 3/5] qmi: provide AvailableTechnologies in radio-settings
This provides the list of available technologies in the radio-settings
atom. Note that this list is hard-coded and includes LTE unconditionally
which is probably not correct for all QMI devices.
---
drivers/qmimodem/radio-settings.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c
index ed578f8..fecde82 100644
--- a/drivers/qmimodem/radio-settings.c
+++ b/drivers/qmimodem/radio-settings.c
@@ -155,6 +155,19 @@ static void qmi_set_rat_mode(struct ofono_radio_settings *rs,
}
+static void qmi_query_available_rats(struct ofono_radio_settings *rs,
+ ofono_radio_settings_available_rats_query_cb_t cb,
+ void *data)
+{
+ unsigned int available_rats;
+
+ available_rats = OFONO_RADIO_ACCESS_MODE_GSM
+ | OFONO_RADIO_ACCESS_MODE_UMTS
+ | OFONO_RADIO_ACCESS_MODE_LTE;
+
+ CALLBACK_WITH_SUCCESS(cb, available_rats, data);
+}
+
static void create_nas_cb(struct qmi_service *service, void *user_data)
{
struct ofono_radio_settings *rs = user_data;
@@ -219,6 +232,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
10:50 p.m.
New subject: [PATCH 3/5] qmi: provide AvailableTechnologies in radio-settings
Hi Jonas,
On 09/07/2017 02:11 PM, Jonas Bonn wrote:
This provides the list of available technologies in the
radio-settings
atom. Note that this list is hard-coded and includes LTE unconditionally
which is probably not correct for all QMI devices.
You might want to use
QMI_DMS_GET_CAPS message from dms service to do
that. This is already used in plugins/gobi.c (even if returned
information seems to be used only for debug).
On an MC7304 (Sierra), I have:
root@klk-lpbs-0504B4:~ # qmicli -d /dev/cdc-wdm0 --dms-get-capabilities
[07 Sep 2017, 12:49:11] -Warning ** [/dev/cdc-wdm0] requested auto mode
but no MBIM QMUX support available
[/dev/cdc-wdm0] Device capabilities retrieved:
Max TX channel rate: '50000000'
Max RX channel rate: '100000000'
Data Service: 'non-simultaneous-cs-ps'
SIM: 'supported'
Networks: 'gsm, umts, lte'
Best Regards,
Christophe
---
drivers/qmimodem/radio-settings.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c
index ed578f8..fecde82 100644
--- a/drivers/qmimodem/radio-settings.c
+++ b/drivers/qmimodem/radio-settings.c
@@ -155,6 +155,19 @@ static void qmi_set_rat_mode(struct ofono_radio_settings *rs,
}
+static void qmi_query_available_rats(struct ofono_radio_settings *rs,
+ ofono_radio_settings_available_rats_query_cb_t cb,
+ void *data)
+{
+ unsigned int available_rats;
+
+ available_rats = OFONO_RADIO_ACCESS_MODE_GSM
+ | OFONO_RADIO_ACCESS_MODE_UMTS
+ | OFONO_RADIO_ACCESS_MODE_LTE;
+
+ CALLBACK_WITH_SUCCESS(cb, available_rats, data);
+}
+
static void create_nas_cb(struct qmi_service *service, void *user_data)
{
struct ofono_radio_settings *rs = user_data;
@@ -219,6 +232,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:59 a.m.
New subject: [PATCH 3/5] qmi: provide AvailableTechnologies in radio-settings
Hi Jonas,
On 09/07/2017 07:11 AM, Jonas Bonn wrote:
This provides the list of available technologies in the
radio-settings
atom. Note that this list is hard-coded and includes LTE unconditionally
which is probably not correct for all QMI devices.
I don't like this idea. There has to be a way to figure out the
capability, either from udev or QMI protocol. Does the command
Christophe mentioned work for this?
---
drivers/qmimodem/radio-settings.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Regards,
-Denis
10:11 p.m.
New subject: [PATCH 4/5] qmi: add helper to get int16_t result
---
drivers/qmimodem/qmi.c | 21 +++++++++++++++++++++
drivers/qmimodem/qmi.h | 2 ++
2 files changed, 23 insertions(+)
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 17c6a6f..c538cb9 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -1720,6 +1720,27 @@ bool qmi_result_get_uint8(struct qmi_result *result, uint8_t type,
return true;
}
+bool qmi_result_get_int16(struct qmi_result *result, uint8_t type,
+ int16_t *value)
+{
+ const unsigned char *ptr;
+ uint16_t len, tmp;
+
+ if (!result || !type)
+ return false;
+
+ ptr = tlv_get(result->data, result->length, type, &len);
+ if (!ptr)
+ return false;
+
+ memcpy(&tmp, ptr, 2);
+
+ if (value)
+ *value = GINT16_FROM_LE(tmp);
+
+ return true;
+}
+
bool qmi_result_get_uint16(struct qmi_result *result, uint8_t type,
uint16_t *value)
{
diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
index bfe8e6b..b4955b4 100644
--- a/drivers/qmimodem/qmi.h
+++ b/drivers/qmimodem/qmi.h
@@ -130,6 +130,8 @@ const void *qmi_result_get(struct qmi_result *result, uint8_t type,
char *qmi_result_get_string(struct qmi_result *result, uint8_t type);
bool qmi_result_get_uint8(struct qmi_result *result, uint8_t type,
uint8_t *value);
+bool qmi_result_get_int16(struct qmi_result *result, uint8_t type,
+ int16_t *value);
bool qmi_result_get_uint16(struct qmi_result *result, uint8_t type,
uint16_t *value);
bool qmi_result_get_uint32(struct qmi_result *result, uint8_t type,
--
2.9.3
10:11 p.m.
New subject: [PATCH 5/5] qmi: add NetworkMonitor interface
This is a rudimentary implementation that contains technology, RSSI,
and BitErrorRate, plus RSRQ/RSRP for LTE networks. More data can be
added as needed.
This implementations uses the 'Get Signal Strength' QMI method to retrieve
the data. Operator fields (MNC, LAC, etc) can be gotten from the 'Serving
Cell' method if needed, but since this data is already provided in the
NetworkRegistration object it doesn't seem necessary to repeat it here
when an additional communication to the modem is required.
---
Makefile.am | 3 +-
doc/networkmonitor-api.txt | 2 +-
drivers/qmimodem/netmon.c | 285 ++++++++++++++++++++++++++++++++++++++++++++
drivers/qmimodem/qmimodem.c | 2 +
drivers/qmimodem/qmimodem.h | 3 +
plugins/gobi.c | 5 +-
6 files changed, 297 insertions(+), 3 deletions(-)
create mode 100644 drivers/qmimodem/netmon.c
diff --git a/Makefile.am b/Makefile.am
index 658e152..4b68beb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,7 +233,8 @@ builtin_sources += $(qmi_sources) \
drivers/qmimodem/gprs.c \
drivers/qmimodem/gprs-context.c \
drivers/qmimodem/radio-settings.c \
- drivers/qmimodem/location-reporting.c
+ drivers/qmimodem/location-reporting.c \
+ drivers/qmimodem/netmon.c
builtin_modules += gobi
builtin_sources += plugins/gobi.c
diff --git a/doc/networkmonitor-api.txt b/doc/networkmonitor-api.txt
index ddace7e..8d73af0 100644
--- a/doc/networkmonitor-api.txt
+++ b/doc/networkmonitor-api.txt
@@ -77,7 +77,7 @@ byte TimingAdvance [optional, gsm]
Contains the Timing Advance. Valid range of values is 0-219.
-byte Strength [optional, gsm, umts]
+byte Strength [optional, gsm, umts, lte]
Contains the signal strength. Valid values are 0-31. Refer to <rssi>
in 27.007, Section 8.5.
diff --git a/drivers/qmimodem/netmon.c b/drivers/qmimodem/netmon.c
new file mode 100644
index 0000000..9fef0d4
--- /dev/null
+++ b/drivers/qmimodem/netmon.c
@@ -0,0 +1,285 @@
+/*
+ *
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/netmon.h>
+
+//#include "common.h"
+
+#include "qmi.h"
+#include "nas.h"
+
+#include "qmimodem.h"
+#include "src/common.h"
+
+struct netmon_data {
+ struct qmi_service *nas;
+};
+
+static void get_rssi_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ struct ofono_netmon *netmon = cbd->user;
+ ofono_netmon_cb_t cb = cbd->cb;
+ struct {
+ enum ofono_netmon_cell_type type;
+ int rssi;
+ int ber;
+ int rsrq;
+ int rsrp;
+ } props;
+ uint16_t len;
+ int16_t rsrp;
+ const struct {
+ int8_t value;
+ int8_t rat;
+ } __attribute__((__packed__)) *rsrq;
+ const struct {
+ uint16_t count;
+ struct {
+ uint8_t rssi;
+ int8_t rat;
+ } __attribute__((__packed__)) info[0];
+ } __attribute__((__packed__)) *rssi;
+ const struct {
+ uint16_t count;
+ struct {
+ uint16_t rate;
+ int8_t rat;
+ } __attribute__((__packed__)) info[0];
+ } __attribute__((__packed__)) *ber;
+ int i;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, NULL)) {
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ /* RSSI */
+ rssi = qmi_result_get(result, 0x11, &len);
+ if (rssi) {
+ for (i = 0; i < rssi->count; i++) {
+ DBG("RSSI: %hhu on RAT %hhd",
+ rssi->info[i].rssi,
+ rssi->info[i].rat);
+ }
+
+ /* Get cell type from RSSI info... it will be the same
+ * for all the other entries
+ */
+ props.type = qmi_nas_rat_to_tech(rssi->info[0].rat);
+ switch (rssi->info[0].rat) {
+ case QMI_NAS_NETWORK_RAT_GSM:
+ props.type = OFONO_NETMON_CELL_TYPE_GSM;
+ break;
+ case QMI_NAS_NETWORK_RAT_UMTS:
+ props.type = OFONO_NETMON_CELL_TYPE_UMTS;
+ break;
+ case QMI_NAS_NETWORK_RAT_LTE:
+ props.type = OFONO_NETMON_CELL_TYPE_LTE;
+ break;
+ default:
+ props.type = OFONO_NETMON_CELL_TYPE_GSM;
+ break;
+ }
+
+ props.rssi = (rssi->info[0].rssi + 113) / 2;
+ if (props.rssi > 31) props.rssi = 31;
+ if (props.rssi < 0) props.rssi = 0;
+ } else {
+ props.type = QMI_NAS_NETWORK_RAT_GSM;
+ props.rssi = -1;
+ }
+
+ /* Bit error rate */
+ ber = qmi_result_get(result, 0x15, &len);
+ if (ber) {
+ for (i = 0; i < ber->count; i++) {
+ DBG("Bit error rate: %hu on RAT %hhd",
+ ber->info[i].rate,
+ ber->info[i].rat);
+ }
+
+ props.ber = ber->info[0].rate;
+ if (props.ber > 7)
+ props.ber = -1;
+ } else {
+ props.ber = -1;
+ }
+
+ /* LTE RSRQ */
+ rsrq = qmi_result_get(result, 0x16, &len);
+ if (rsrq) {
+ DBG("RSRQ: %hhd on RAT %hhd",
+ rsrq->value,
+ rsrq->rat);
+
+ if (rsrq->value == 0) {
+ props.rsrq = -1;
+ } else {
+ props.rsrq = (rsrq->value + 19) * 2;
+ if (props.rsrq > 34) props.rsrq = 34;
+ if (props.rsrq < 0) props.rsrq = 0;
+ }
+ } else {
+ props.rsrq = -1;
+ }
+
+ /* LTE RSRP */
+ if (qmi_result_get_int16(result, 0x18, &rsrp)) {
+ DBG("Got LTE RSRP: %hd", rsrp);
+
+ if (rsrp == 0) {
+ props.rsrp = -1;
+ } else {
+ props.rsrp = rsrp + 140;
+ if (props.rsrp > 97) props.rsrp = 97;
+ if (props.rsrp < 0) props.rsrp = 0;
+ }
+ } else {
+ props.rsrp = -1;
+ }
+
+ ofono_netmon_serving_cell_notify(netmon,
+ props.type,
+ OFONO_NETMON_INFO_RSSI, props.rssi,
+ OFONO_NETMON_INFO_BER, props.ber,
+ OFONO_NETMON_INFO_RSRQ, props.rsrq,
+ OFONO_NETMON_INFO_RSRP, props.rsrp,
+ OFONO_NETMON_INFO_INVALID);
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_netmon_request_update(struct ofono_netmon *netmon,
+ ofono_netmon_cb_t cb,
+ void *user_data)
+{
+ struct netmon_data *data = ofono_netmon_get_data(netmon);
+ struct cb_data *cbd = cb_data_new(cb, user_data);
+ struct qmi_param *param;
+
+ DBG("");
+
+ cbd->user = netmon;
+
+ param = qmi_param_new();
+ if (!param)
+ goto out;
+
+ /* Request all signal strength items: mask=0xff */
+ qmi_param_append_uint16(param, 0x10, 255);
+
+ if (qmi_service_send(data->nas, QMI_NAS_GET_RSSI, param,
+ get_rssi_cb, cbd, g_free) > 0)
+ return;
+
+ qmi_param_free(param);
+
+out:
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+ g_free(cbd);
+}
+
+static void create_nas_cb(struct qmi_service *service, void *user_data)
+{
+ struct ofono_netmon *netmon = user_data;
+ struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("");
+
+ if (!service) {
+ ofono_error("Failed to request NAS service");
+ ofono_netmon_remove(netmon);
+ return;
+ }
+
+ nmd->nas = qmi_service_ref(service);
+
+ ofono_netmon_register(netmon);
+}
+
+static int qmi_netmon_probe(struct ofono_netmon *netmon,
+ unsigned int vendor, void *user_data)
+{
+ struct qmi_device *device = user_data;
+ struct netmon_data *nmd;
+
+ DBG("");
+
+ nmd = g_new0(struct netmon_data, 1);
+
+ ofono_netmon_set_data(netmon, nmd);
+
+ qmi_service_create_shared(device, QMI_SERVICE_NAS,
+ create_nas_cb, netmon, NULL);
+
+ return 0;
+}
+
+static void qmi_netmon_remove(struct ofono_netmon *netmon)
+{
+ struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("");
+
+ ofono_netmon_set_data(netmon, NULL);
+
+ qmi_service_unregister_all(nmd->nas);
+
+ qmi_service_unref(nmd->nas);
+
+ g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+ .name = "qmimodem",
+ .probe = qmi_netmon_probe,
+ .remove = qmi_netmon_remove,
+ .request_update = qmi_netmon_request_update,
+};
+
+void qmi_netmon_init(void)
+{
+ ofono_netmon_driver_register(&driver);
+}
+
+void qmi_netmon_exit(void)
+{
+ ofono_netmon_driver_unregister(&driver);
+}
diff --git a/drivers/qmimodem/qmimodem.c b/drivers/qmimodem/qmimodem.c
index 959a901..b10ce28 100644
--- a/drivers/qmimodem/qmimodem.c
+++ b/drivers/qmimodem/qmimodem.c
@@ -41,12 +41,14 @@ static int qmimodem_init(void)
qmi_gprs_context_init();
qmi_radio_settings_init();
qmi_location_reporting_init();
+ qmi_netmon_init();
return 0;
}
static void qmimodem_exit(void)
{
+ qmi_netmon_exit();
qmi_location_reporting_exit();
qmi_radio_settings_exit();
qmi_gprs_context_exit();
diff --git a/drivers/qmimodem/qmimodem.h b/drivers/qmimodem/qmimodem.h
index 1fc8682..4b0fad3 100644
--- a/drivers/qmimodem/qmimodem.h
+++ b/drivers/qmimodem/qmimodem.h
@@ -53,3 +53,6 @@ extern void qmi_radio_settings_exit(void);
extern void qmi_location_reporting_init(void);
extern void qmi_location_reporting_exit(void);
+
+extern void qmi_netmon_init(void);
+extern void qmi_netmon_exit(void);
diff --git a/plugins/gobi.c b/plugins/gobi.c
index a498599..bc2b068 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -34,6 +34,7 @@
#include <ofono/modem.h>
#include <ofono/devinfo.h>
#include <ofono/netreg.h>
+#include <ofono/netmon.h>
#include <ofono/phonebook.h>
#include <ofono/voicecall.h>
#include <ofono/sim.h>
@@ -493,8 +494,10 @@ static void gobi_post_online(struct ofono_modem *modem)
DBG("%p", modem);
- if (data->features & GOBI_NAS)
+ if (data->features & GOBI_NAS) {
ofono_netreg_create(modem, 0, "qmimodem", data->device);
+ ofono_netmon_create(modem, 0, "qmimodem", data->device);
+ }
if (data->features & GOBI_VOICE)
ofono_ussd_create(modem, 0, "qmimodem", data->device);
--
2.9.3
3:35 a.m.
New subject: [PATCH 5/5] qmi: add NetworkMonitor interface
Hi Jonas,
On 09/07/2017 07:11 AM, Jonas Bonn wrote:
This is a rudimentary implementation that contains technology, RSSI,
and BitErrorRate, plus RSRQ/RSRP for LTE networks. More data can be
added as needed.
This implementations uses the 'Get Signal Strength' QMI method to retrieve
the data. Operator fields (MNC, LAC, etc) can be gotten from the 'Serving
Cell' method if needed, but since this data is already provided in the
NetworkRegistration object it doesn't seem necessary to repeat it here
when an additional communication to the modem is required.
---
Makefile.am | 3 +-
doc/networkmonitor-api.txt | 2 +-
separate patch please
drivers/qmimodem/netmon.c | 285
++++++++++++++++++++++++++++++++++++++++++++
drivers/qmimodem/qmimodem.c | 2 +
drivers/qmimodem/qmimodem.h | 3 +
plugins/gobi.c | 5 +-
separate patch. see HACKING, 'Submitting Patches'.
6 files changed, 297 insertions(+), 3 deletions(-)
create mode 100644 drivers/qmimodem/netmon.c
diff --git a/Makefile.am b/Makefile.am
index 658e152..4b68beb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,7 +233,8 @@ builtin_sources += $(qmi_sources) \
drivers/qmimodem/gprs.c \
drivers/qmimodem/gprs-context.c \
drivers/qmimodem/radio-settings.c \
- drivers/qmimodem/location-reporting.c
+ drivers/qmimodem/location-reporting.c \
+ drivers/qmimodem/netmon.c
builtin_modules += gobi
builtin_sources += plugins/gobi.c
diff --git a/doc/networkmonitor-api.txt b/doc/networkmonitor-api.txt
index ddace7e..8d73af0 100644
--- a/doc/networkmonitor-api.txt
+++ b/doc/networkmonitor-api.txt
@@ -77,7 +77,7 @@ byte TimingAdvance [optional, gsm]
Contains the Timing Advance. Valid range of values is 0-219.
-byte Strength [optional, gsm, umts]
+byte Strength [optional, gsm, umts, lte]
Contains the signal strength. Valid values are 0-31. Refer to <rssi>
in 27.007, Section 8.5.
diff --git a/drivers/qmimodem/netmon.c b/drivers/qmimodem/netmon.c
new file mode 100644
index 0000000..9fef0d4
--- /dev/null
+++ b/drivers/qmimodem/netmon.c
@@ -0,0 +1,285 @@
+/*
+ *
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/netmon.h>
+
+//#include "common.h"
??
+
+#include "qmi.h"
+#include "nas.h"
+
+#include "qmimodem.h"
+#include "src/common.h"
+
+struct netmon_data {
+ struct qmi_service *nas;
+};
+
+static void get_rssi_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ struct ofono_netmon *netmon = cbd->user;
+ ofono_netmon_cb_t cb = cbd->cb;
+ struct {
+ enum ofono_netmon_cell_type type;
+ int rssi;
+ int ber;
+ int rsrq;
+ int rsrp;
+ } props;
+ uint16_t len;
+ int16_t rsrp;
+ const struct {
+ int8_t value;
+ int8_t rat;
+ } __attribute__((__packed__)) *rsrq;
+ const struct {
+ uint16_t count;
+ struct {
+ uint8_t rssi;
+ int8_t rat;
+ } __attribute__((__packed__)) info[0];
+ } __attribute__((__packed__)) *rssi;
+ const struct {
+ uint16_t count;
+ struct {
+ uint16_t rate;
+ int8_t rat;
+ } __attribute__((__packed__)) info[0];
+ } __attribute__((__packed__)) *ber;
+ int i;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, NULL)) {
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ /* RSSI */
+ rssi = qmi_result_get(result, 0x11, &len);
+ if (rssi) {
+ for (i = 0; i < rssi->count; i++) {
+ DBG("RSSI: %hhu on RAT %hhd",
+ rssi->info[i].rssi,
+ rssi->info[i].rat);
+ }
+
+ /* Get cell type from RSSI info... it will be the same
+ * for all the other entries
+ */
+ props.type = qmi_nas_rat_to_tech(rssi->info[0].rat);
+ switch (rssi->info[0].rat) {
+ case QMI_NAS_NETWORK_RAT_GSM:
+ props.type = OFONO_NETMON_CELL_TYPE_GSM;
+ break;
+ case QMI_NAS_NETWORK_RAT_UMTS:
+ props.type = OFONO_NETMON_CELL_TYPE_UMTS;
+ break;
+ case QMI_NAS_NETWORK_RAT_LTE:
+ props.type = OFONO_NETMON_CELL_TYPE_LTE;
+ break;
+ default:
+ props.type = OFONO_NETMON_CELL_TYPE_GSM;
+ break;
+ }
+
+ props.rssi = (rssi->info[0].rssi + 113) / 2;
+ if (props.rssi > 31) props.rssi = 31;
+ if (props.rssi < 0) props.rssi = 0;
+ } else {
+ props.type = QMI_NAS_NETWORK_RAT_GSM;
+ props.rssi = -1;
+ }
+
+ /* Bit error rate */
+ ber = qmi_result_get(result, 0x15, &len);
+ if (ber) {
+ for (i = 0; i < ber->count; i++) {
+ DBG("Bit error rate: %hu on RAT %hhd",
+ ber->info[i].rate,
+ ber->info[i].rat);
+ }
+
+ props.ber = ber->info[0].rate;
+ if (props.ber > 7)
+ props.ber = -1;
+ } else {
+ props.ber = -1;
+ }
+
+ /* LTE RSRQ */
+ rsrq = qmi_result_get(result, 0x16, &len);
+ if (rsrq) {
+ DBG("RSRQ: %hhd on RAT %hhd",
+ rsrq->value,
+ rsrq->rat);
+
+ if (rsrq->value == 0) {
+ props.rsrq = -1;
+ } else {
+ props.rsrq = (rsrq->value + 19) * 2;
+ if (props.rsrq > 34) props.rsrq = 34;
+ if (props.rsrq < 0) props.rsrq = 0;
+ }
+ } else {
+ props.rsrq = -1;
+ }
+
+ /* LTE RSRP */
+ if (qmi_result_get_int16(result, 0x18, &rsrp)) {
+ DBG("Got LTE RSRP: %hd", rsrp);
+
+ if (rsrp == 0) {
+ props.rsrp = -1;
+ } else {
+ props.rsrp = rsrp + 140;
+ if (props.rsrp > 97) props.rsrp = 97;
+ if (props.rsrp < 0) props.rsrp = 0;
+ }
+ } else {
+ props.rsrp = -1;
+ }
+
+ ofono_netmon_serving_cell_notify(netmon,
+ props.type,
+ OFONO_NETMON_INFO_RSSI, props.rssi,
+ OFONO_NETMON_INFO_BER, props.ber,
+ OFONO_NETMON_INFO_RSRQ, props.rsrq,
+ OFONO_NETMON_INFO_RSRP, props.rsrp,
+ OFONO_NETMON_INFO_INVALID);
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_netmon_request_update(struct ofono_netmon *netmon,
+ ofono_netmon_cb_t cb,
+ void *user_data)
+{
+ struct netmon_data *data = ofono_netmon_get_data(netmon);
+ struct cb_data *cbd = cb_data_new(cb, user_data);
+ struct qmi_param *param;
+
+ DBG("");
+
+ cbd->user = netmon;
+
+ param = qmi_param_new();
+ if (!param)
+ goto out;
+
+ /* Request all signal strength items: mask=0xff */
+ qmi_param_append_uint16(param, 0x10, 255);
+
+ if (qmi_service_send(data->nas, QMI_NAS_GET_RSSI, param,
+ get_rssi_cb, cbd, g_free) > 0)
+ return;
+
+ qmi_param_free(param);
+
+out:
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+ g_free(cbd);
+}
+
+static void create_nas_cb(struct qmi_service *service, void *user_data)
+{
+ struct ofono_netmon *netmon = user_data;
+ struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("");
+
+ if (!service) {
+ ofono_error("Failed to request NAS service");
+ ofono_netmon_remove(netmon);
+ return;
+ }
+
+ nmd->nas = qmi_service_ref(service);
+
+ ofono_netmon_register(netmon);
+}
+
+static int qmi_netmon_probe(struct ofono_netmon *netmon,
+ unsigned int vendor, void *user_data)
+{
+ struct qmi_device *device = user_data;
+ struct netmon_data *nmd;
+
+ DBG("");
+
+ nmd = g_new0(struct netmon_data, 1);
+
+ ofono_netmon_set_data(netmon, nmd);
+
+ qmi_service_create_shared(device, QMI_SERVICE_NAS,
+ create_nas_cb, netmon, NULL);
+
+ return 0;
+}
+
+static void qmi_netmon_remove(struct ofono_netmon *netmon)
+{
+ struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("");
+
+ ofono_netmon_set_data(netmon, NULL);
+
+ qmi_service_unregister_all(nmd->nas);
+
+ qmi_service_unref(nmd->nas);
+
+ g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+ .name = "qmimodem",
+ .probe = qmi_netmon_probe,
+ .remove = qmi_netmon_remove,
+ .request_update = qmi_netmon_request_update,
+};
+
+void qmi_netmon_init(void)
+{
+ ofono_netmon_driver_register(&driver);
+}
+
+void qmi_netmon_exit(void)
+{
+ ofono_netmon_driver_unregister(&driver);
+}
diff --git a/drivers/qmimodem/qmimodem.c b/drivers/qmimodem/qmimodem.c
index 959a901..b10ce28 100644
--- a/drivers/qmimodem/qmimodem.c
+++ b/drivers/qmimodem/qmimodem.c
@@ -41,12 +41,14 @@ static int qmimodem_init(void)
qmi_gprs_context_init();
qmi_radio_settings_init();
qmi_location_reporting_init();
+ qmi_netmon_init();
return 0;
}
static void qmimodem_exit(void)
{
+ qmi_netmon_exit();
qmi_location_reporting_exit();
qmi_radio_settings_exit();
qmi_gprs_context_exit();
diff --git a/drivers/qmimodem/qmimodem.h b/drivers/qmimodem/qmimodem.h
index 1fc8682..4b0fad3 100644
--- a/drivers/qmimodem/qmimodem.h
+++ b/drivers/qmimodem/qmimodem.h
@@ -53,3 +53,6 @@ extern void qmi_radio_settings_exit(void);
extern void qmi_location_reporting_init(void);
extern void qmi_location_reporting_exit(void);
+
+extern void qmi_netmon_init(void);
+extern void qmi_netmon_exit(void);
diff --git a/plugins/gobi.c b/plugins/gobi.c
index a498599..bc2b068 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -34,6 +34,7 @@
#include <ofono/modem.h>
#include <ofono/devinfo.h>
#include <ofono/netreg.h>
+#include <ofono/netmon.h>
#include <ofono/phonebook.h>
#include <ofono/voicecall.h>
#include <ofono/sim.h>
@@ -493,8 +494,10 @@ static void gobi_post_online(struct ofono_modem *modem)
DBG("%p", modem);
- if (data->features & GOBI_NAS)
+ if (data->features & GOBI_NAS) {
ofono_netreg_create(modem, 0, "qmimodem", data->device);
+ ofono_netmon_create(modem, 0, "qmimodem", data->device);
+ }
if (data->features & GOBI_VOICE)
ofono_ussd_create(modem, 0, "qmimodem", data->device);
Regards,
-Denis
2:46 a.m.
Hi Jonas,
On 09/07/2017 07:11 AM, Jonas Bonn wrote:
Disabling "maintainer mode" is not particularly useful as
it really only
saves people who accidentally touch a build system file in an
unrealistically constrained system where the build tools are uninstalled
and unavailable.
This patch just changes the default to 'enabled' so that the changes to
build system files have the desired effect.
Passing --disable-maintainer-mode to ./configure restores the previous
behaviour for the (likely non-existant) users who actually require to do
so.
If you're building from git, just use bootstrap-configure. Otherwise
maintainer mode is there for a reason (e.g. it builds a bunch of tools
not useful in release builds). So NAK.
Regards,
-Denis
1837
days inactive
1837
days old
10 comments
3 participants
participants (3)
-
Christophe Ronco -
Denis Kenzior -
Jonas Bonn