4:13 a.m.
Hi,
These patches add netmon interface to ubloxmodem. This allows to query
and get data returned by +CESQ command through D-Bus.
The following types will be exposed as Network Monitor Property Types.
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
V1 is here:
https://lists.ofono.org/pipermail/ofono/2016-November/016671.html
Thank you!
Changes since v1:
* Re-worked patches to follow 'Submitting patches' section.
Each top-level directory change should be in a separate patch
* Removed OFONO_NETMON_INFO_OPERATOR
* Documented all added fields in networkmonitor-api.txt
* We only use one channel for communication, dropped the other one.
* Fixed a cbd memory leak, now we try to be conservative and always
report what we have collected so far. We only fail hard in case
+COPS failed or sending +CESQ failed. Otherwise we report the result
and make sure to free cbd.
* Various fixes to follow the coding style.
Djalal Harouni (7):
netmon: add OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP}
netmon: handle OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP} in D-Bus
doc: documentation for OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP}
ubloxmodem: add the netmon driver
ubloxmodem: register and initialize the netmon driver
build: build the ublox netmon driver
test: support OFONO_NETMON_INFO_{RXLEV|RSCP|ECN0|RSRQ|RSRP}
Makefile.am | 1 +
doc/networkmonitor-api.txt | 22 +++
drivers/ubloxmodem/netmon.c | 335 ++++++++++++++++++++++++++++++++++++++++
drivers/ubloxmodem/ubloxmodem.c | 2 +
drivers/ubloxmodem/ubloxmodem.h | 3 +
include/netmon.h | 4 +
plugins/ublox.c | 3 +
src/netmon.c | 28 ++++
test/get-serving-cell-info | 20 +++
9 files changed, 418 insertions(+)
create mode 100644 drivers/ubloxmodem/netmon.c
4:13 a.m.
New subject: [PATCH 1/7] netmon: add OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP}
Add more ofono netmon info types that will be served through the netmon
interface. The main user of this now will be the ublox modem.
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
Patches using these types to follow.
---
include/netmon.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/netmon.h b/include/netmon.h
index ec8a2e1..47d7a9c 100644
--- a/include/netmon.h
+++ b/include/netmon.h
@@ -59,6 +59,10 @@ enum ofono_netmon_info {
OFONO_NETMON_INFO_RSSI, /* int */
OFONO_NETMON_INFO_TIMING_ADVANCE, /* int */
OFONO_NETMON_INFO_PSC, /* int */
+ OFONO_NETMON_INFO_RSCP, /* int */
+ OFONO_NETMON_INFO_ECN0, /* int */
+ OFONO_NETMON_INFO_RSRQ, /* int */
+ OFONO_NETMON_INFO_RSRP, /* int */
OFONO_NETMON_INFO_INVALID,
};
--
2.5.5
4:13 a.m.
New subject: [PATCH 2/7] netmon: handle OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP} in D-Bus
Handle the previously added types in D-Bus.
Documentation for these values is in next patch.
---
src/netmon.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/src/netmon.c b/src/netmon.c
index eb18b9c..2a8c524 100644
--- a/src/netmon.c
+++ b/src/netmon.c
@@ -180,6 +180,34 @@ void ofono_netmon_serving_cell_notify(struct ofono_netmon *netmon,
intval, uint8_t, DBUS_TYPE_BYTE);
break;
+ case OFONO_NETMON_INFO_RSCP:
+ intval = va_arg(arglist, int);
+
+ CELL_INFO_DICT_APPEND(&dict, "ReceivedSignalCodePower",
+ intval, uint8_t, DBUS_TYPE_BYTE);
+ break;
+
+ case OFONO_NETMON_INFO_ECN0:
+ intval = va_arg(arglist, int);
+
+ CELL_INFO_DICT_APPEND(&dict, "ReceivedEnergyRatio",
+ intval, uint8_t, DBUS_TYPE_BYTE);
+ break;
+
+ case OFONO_NETMON_INFO_RSRQ:
+ intval = va_arg(arglist, int);
+
+ CELL_INFO_DICT_APPEND(&dict, "ReferenceSignalReceivedQuality",
+ intval, uint8_t, DBUS_TYPE_BYTE);
+ break;
+
+ case OFONO_NETMON_INFO_RSRP:
+ intval = va_arg(arglist, int);
+
+ CELL_INFO_DICT_APPEND(&dict, "ReferenceSignalReceivedPower",
+ intval, uint8_t, DBUS_TYPE_BYTE);
+ break;
+
case OFONO_NETMON_INFO_INVALID:
break;
}
--
2.5.5
4:13 a.m.
New subject: [PATCH 3/7] doc: documentation for OFONO_NETMON_INFO_{RSCP|ECN0|RSRQ|RSRP}
This adds documentation for the following fields in
networkmonitor-api.txt
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
---
doc/networkmonitor-api.txt | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/doc/networkmonitor-api.txt b/doc/networkmonitor-api.txt
index 703f19b..0d2fe3f 100644
--- a/doc/networkmonitor-api.txt
+++ b/doc/networkmonitor-api.txt
@@ -81,3 +81,25 @@ byte Strength [optional, gsm, umts]
Contains the signal strength. Valid values are 0-31. Refer to <rssi>
in 27.007, Section 8.5.
+
+byte ReceivedSignalCodePower [optional, umts]
+
+ Contains the Received Signal Code Power. Valid range of values
+ is 0-96. Refer to <rscp> in 27.007, Section 8.69 for more details.
+
+byte ReceivedEnergyRatio [optional, umts]
+
+ Contains the Ratio of received energy per PN chip to the total
+ received power spectral density. Valid range of values is 0-49.
+ Refer to <ecno> in 27.007, Section 8.69 for more details.
+
+byte ReferenceSignalReceivedQuality [optional, lte]
+
+ Contains the Reference Signal Received Quality. Valid range of
+ values is 0-34. Refer to <rsrq> in 27.007, Section 8.69 for more
+ details.
+
+byte ReferenceSignalReceivedPower [optional, lte]
+
+ Contains the Reference Signal Received Power. Valid range of values
+ is 0-97. Refer to <rsrp> in 27.007, Section 8.69 for more details.
--
2.5.5
4:13 a.m.
New subject: [PATCH 4/7] ubloxmodem: add the netmon driver
This adds a netmon driver for ublox. The driver support both +COPS and
+CESQ commands to return the previously added ofono netmon types:
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
---
drivers/ubloxmodem/netmon.c | 335 ++++++++++++++++++++++++++++++++++++++++
drivers/ubloxmodem/ubloxmodem.c | 2 +
drivers/ubloxmodem/ubloxmodem.h | 3 +
3 files changed, 340 insertions(+)
create mode 100644 drivers/ubloxmodem/netmon.c
diff --git a/drivers/ubloxmodem/netmon.c b/drivers/ubloxmodem/netmon.c
new file mode 100644
index 0000000..3cc31a0
--- /dev/null
+++ b/drivers/ubloxmodem/netmon.c
@@ -0,0 +1,335 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2016 EndoCode AG. 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 "gatchat.h"
+#include "gatresult.h"
+
+#include "common.h"
+#include "netreg.h"
+#include "ubloxmodem.h"
+#include "drivers/atmodem/vendor.h"
+
+static const char *cops_prefix[] = { "+COPS:", NULL };
+static const char *cesq_prefix[] = { "+CESQ:", NULL };
+
+struct netmon_driver_data {
+ GAtChat *chat;
+};
+
+struct req_cb_data {
+ struct ofono_netmon *netmon;
+
+ ofono_netmon_cb_t cb;
+ void *data;
+
+ struct ofono_network_operator op;
+
+ int rxlev; /* CESQ: Received Signal Strength Indication */
+ int ber; /* CESQ: Bit Error Rate */
+ int rscp; /* CESQ: Received Signal Code Powe */
+ int rsrp; /* CESQ: Reference Signal Received Power */
+ int ecn0; /* CESQ: Received Energy Ratio */
+ int rsrq; /* CESQ: Reference Signal Received Quality */
+};
+
+/*
+ * Returns the appropriate radio access technology.
+ *
+ * If we can not resolve to a specific radio access technolgy
+ * we return OFONO_NETMON_CELL_TYPE_GSM by default.
+ */
+static int ublox_map_radio_access_technology(int tech)
+{
+ switch (tech) {
+ case ACCESS_TECHNOLOGY_GSM:
+ case ACCESS_TECHNOLOGY_GSM_COMPACT:
+ return OFONO_NETMON_CELL_TYPE_GSM;
+ case ACCESS_TECHNOLOGY_UTRAN:
+ case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
+ case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
+ case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
+ return OFONO_NETMON_CELL_TYPE_UMTS;
+ case ACCESS_TECHNOLOGY_EUTRAN:
+ return OFONO_NETMON_CELL_TYPE_LTE;
+ }
+
+ return OFONO_NETMON_CELL_TYPE_GSM;
+}
+
+static inline struct req_cb_data *req_cb_data_new0(void *cb, void *data, void *user)
+{
+ struct req_cb_data *ret = g_new0(struct req_cb_data, 1);
+ if (ret == NULL)
+ return NULL;
+
+ ret->cb = cb;
+ ret->data = data;
+ ret->netmon = user;
+ ret->rxlev = -1;
+ ret->ber = -1;
+ ret->rscp = -1;
+ ret->rsrp = -1;
+ ret->ecn0 = -1;
+ ret->rsrq = -1;
+
+ return ret;
+}
+
+static gboolean ublox_delayed_register(gpointer user_data)
+{
+ struct ofono_netmon *netmon = user_data;
+
+ ofono_netmon_register(netmon);
+
+ return FALSE;
+}
+
+static void ublox_netmon_finish_success(struct req_cb_data *cbd)
+{
+ struct ofono_netmon *nm = cbd->netmon;
+
+ ofono_netmon_serving_cell_notify(nm,
+ cbd->op.tech,
+ OFONO_NETMON_INFO_RXLEV, cbd->rxlev,
+ OFONO_NETMON_INFO_BER, cbd->ber,
+ OFONO_NETMON_INFO_RSCP, cbd->rscp,
+ OFONO_NETMON_INFO_ECN0, cbd->ecn0,
+ OFONO_NETMON_INFO_RSRQ, cbd->rsrq,
+ OFONO_NETMON_INFO_RSRP, cbd->rsrp,
+ OFONO_NETMON_INFO_INVALID);
+
+ CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void cesq_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ enum cesq_ofono_netmon_info {
+ CESQ_RXLEV,
+ CESQ_BER,
+ CESQ_RSCP,
+ CESQ_ECN0,
+ CESQ_RSRQ,
+ CESQ_RSRP,
+ _MAX,
+ };
+
+ struct req_cb_data *cbd = user_data;
+ struct ofono_error error;
+ GAtResultIter iter;
+ int idx, number;
+
+ DBG("ok %d", ok);
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok)
+ goto error;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+CESQ:")) {
+ DBG(" CESQ: no result ");
+ goto out;
+ }
+
+ for (idx = 0; idx < _MAX; idx++) {
+
+ ok = g_at_result_iter_next_number(&iter, &number);
+ if (!ok) {
+ /* Ignore and do not fail */
+ DBG(" CESQ: error parsing idx: %d ", idx);
+ goto out;
+ }
+
+ switch (idx) {
+ case CESQ_RXLEV:
+ cbd->rxlev = number != 99 ? number:cbd->rxlev;
+ break;
+ case CESQ_BER:
+ cbd->ber = number != 99 ? number:cbd->ber;
+ break;
+ case CESQ_RSCP:
+ cbd->rscp = number != 255 ? number:cbd->rscp;
+ break;
+ case CESQ_ECN0:
+ cbd->ecn0 = number != 255 ? number:cbd->ecn0;
+ break;
+ case CESQ_RSRQ:
+ cbd->rsrq = number != 255 ? number:cbd->rsrq;
+ break;
+ case CESQ_RSRP:
+ cbd->rsrp = number != 255 ? number:cbd->rsrp;
+ break;
+ }
+ }
+
+ DBG(" RXLEV %d ", cbd->rxlev);
+ DBG(" BER %d ", cbd->ber);
+ DBG(" RSCP %d ", cbd->rscp);
+ DBG(" ECN0 %d ", cbd->ecn0);
+ DBG(" RSRQ %d ", cbd->rsrq);
+ DBG(" RSRP %d ", cbd->rsrp);
+
+ /* We never fail at this point we always send what we collected so far */
+out:
+ ublox_netmon_finish_success(cbd);
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct req_cb_data *cbd = user_data;
+ struct ofono_netmon *nm = cbd->netmon;
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(nm);
+ struct ofono_error error;
+ GAtResultIter iter;
+ int tech;
+
+ DBG("ok %d", ok);
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok)
+ goto error;
+
+ g_at_result_iter_init(&iter, result);
+
+ /* Do not fail */
+ if (!g_at_result_iter_next(&iter, "+COPS:"))
+ goto out;
+
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+
+ /* Default to GSM */
+ if (g_at_result_iter_next_number(&iter, &tech) == FALSE)
+ cbd->op.tech = ublox_map_radio_access_technology(ACCESS_TECHNOLOGY_GSM);
+ else
+ cbd->op.tech = ublox_map_radio_access_technology(tech);
+
+ if (g_at_chat_send(nmd->chat, "AT+CESQ", cesq_prefix,
+ cesq_cb, cbd, NULL)) {
+ return;
+ }
+
+out:
+ CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+ g_free(cbd);
+
+error:
+ CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void ublox_netmon_request_update(struct ofono_netmon *netmon,
+ ofono_netmon_cb_t cb, void *data)
+{
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+ struct req_cb_data *cbd;
+
+ DBG("ublox netmon request update");
+
+ cbd = req_cb_data_new0(cb, data, netmon);
+ if (!cbd) {
+ CALLBACK_WITH_FAILURE(cb, data);
+ return;
+ }
+
+ if (g_at_chat_send(nmd->chat, "AT+COPS?", cops_prefix,
+ cops_cb, cbd, NULL) == 0) {
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+ }
+}
+
+static int ublox_netmon_probe(struct ofono_netmon *netmon,
+ unsigned int vendor, void *user)
+{
+ GAtChat *chat = user;
+ struct netmon_driver_data *nmd;
+
+ DBG("ublox netmon probe");
+
+ nmd = g_try_new0(struct netmon_driver_data, 1);
+ if (nmd == NULL)
+ return -ENOMEM;
+
+ nmd->chat = g_at_chat_clone(chat);
+
+ ofono_netmon_set_data(netmon, nmd);
+
+ g_idle_add(ublox_delayed_register, netmon);
+
+ return 0;
+}
+
+static void ublox_netmon_remove(struct ofono_netmon *netmon)
+{
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("ublox netmon remove");
+
+ g_at_chat_unref(nmd->chat);
+
+ ofono_netmon_set_data(netmon, NULL);
+
+ g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+ .name = UBLOXMODEM,
+ .probe = ublox_netmon_probe,
+ .remove = ublox_netmon_remove,
+ .request_update = ublox_netmon_request_update,
+};
+
+void ublox_netmon_init(void)
+{
+ ofono_netmon_driver_register(&driver);
+}
+
+void ublox_netmon_exit(void)
+{
+ ofono_netmon_driver_unregister(&driver);
+}
diff --git a/drivers/ubloxmodem/ubloxmodem.c b/drivers/ubloxmodem/ubloxmodem.c
index 93cb928..a325b1f 100644
--- a/drivers/ubloxmodem/ubloxmodem.c
+++ b/drivers/ubloxmodem/ubloxmodem.c
@@ -36,6 +36,7 @@
static int ubloxmodem_init(void)
{
ublox_gprs_context_init();
+ ublox_netmon_init();
ublox_lte_init();
return 0;
@@ -44,6 +45,7 @@ static int ubloxmodem_init(void)
static void ubloxmodem_exit(void)
{
ublox_gprs_context_exit();
+ ublox_netmon_exit();
ublox_lte_exit();
}
diff --git a/drivers/ubloxmodem/ubloxmodem.h b/drivers/ubloxmodem/ubloxmodem.h
index cf66412..bfb0106 100644
--- a/drivers/ubloxmodem/ubloxmodem.h
+++ b/drivers/ubloxmodem/ubloxmodem.h
@@ -26,5 +26,8 @@
extern void ublox_gprs_context_init(void);
extern void ublox_gprs_context_exit(void);
+extern void ublox_netmon_init(void);
+extern void ublox_netmon_exit(void);
+
extern void ublox_lte_init(void);
extern void ublox_lte_exit(void);
--
2.5.5
4:28 a.m.
New subject: [PATCH 4/7] ubloxmodem: add the netmon driver
On 30 November 2016 at 13:13, Djalal Harouni <djalal(a)endocode.com> wrote:
This adds a netmon driver for ublox. The driver support both +COPS
and
+CESQ commands to return the previously added ofono netmon types:
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
---
drivers/ubloxmodem/netmon.c | 335 ++++++++++++++++++++++++++++++++++++++++
drivers/ubloxmodem/ubloxmodem.c | 2 +
drivers/ubloxmodem/ubloxmodem.h | 3 +
3 files changed, 340 insertions(+)
create mode 100644 drivers/ubloxmodem/netmon.c
diff --git a/drivers/ubloxmodem/netmon.c b/drivers/ubloxmodem/netmon.c
new file mode 100644
index 0000000..3cc31a0
--- /dev/null
+++ b/drivers/ubloxmodem/netmon.c
@@ -0,0 +1,335 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2016 EndoCode AG. 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 "gatchat.h"
+#include "gatresult.h"
+
+#include "common.h"
+#include "netreg.h"
+#include "ubloxmodem.h"
+#include "drivers/atmodem/vendor.h"
+
+static const char *cops_prefix[] = { "+COPS:", NULL };
+static const char *cesq_prefix[] = { "+CESQ:", NULL };
+
+struct netmon_driver_data {
+ GAtChat *chat;
+};
+
+struct req_cb_data {
+ struct ofono_netmon *netmon;
+
+ ofono_netmon_cb_t cb;
+ void *data;
+
+ struct ofono_network_operator op;
+
+ int rxlev; /* CESQ: Received Signal Strength Indication */
+ int ber; /* CESQ: Bit Error Rate */
+ int rscp; /* CESQ: Received Signal Code Powe */
+ int rsrp; /* CESQ: Reference Signal Received Power */
+ int ecn0; /* CESQ: Received Energy Ratio */
+ int rsrq; /* CESQ: Reference Signal Received Quality */
+};
+
+/*
+ * Returns the appropriate radio access technology.
+ *
+ * If we can not resolve to a specific radio access technolgy
+ * we return OFONO_NETMON_CELL_TYPE_GSM by default.
+ */
+static int ublox_map_radio_access_technology(int tech)
+{
+ switch (tech) {
+ case ACCESS_TECHNOLOGY_GSM:
+ case ACCESS_TECHNOLOGY_GSM_COMPACT:
+ return OFONO_NETMON_CELL_TYPE_GSM;
+ case ACCESS_TECHNOLOGY_UTRAN:
+ case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
+ case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
+ case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
+ return OFONO_NETMON_CELL_TYPE_UMTS;
+ case ACCESS_TECHNOLOGY_EUTRAN:
+ return OFONO_NETMON_CELL_TYPE_LTE;
+ }
+
+ return OFONO_NETMON_CELL_TYPE_GSM;
+}
+
+static inline struct req_cb_data *req_cb_data_new0(void *cb, void *data, void *user)
+{
+ struct req_cb_data *ret = g_new0(struct req_cb_data, 1);
+ if (ret == NULL)
+ return NULL;
+
+ ret->cb = cb;
+ ret->data = data;
+ ret->netmon = user;
+ ret->rxlev = -1;
+ ret->ber = -1;
+ ret->rscp = -1;
+ ret->rsrp = -1;
+ ret->ecn0 = -1;
+ ret->rsrq = -1;
+
+ return ret;
+}
+
+static gboolean ublox_delayed_register(gpointer user_data)
+{
+ struct ofono_netmon *netmon = user_data;
+
+ ofono_netmon_register(netmon);
+
+ return FALSE;
+}
+
+static void ublox_netmon_finish_success(struct req_cb_data *cbd)
+{
+ struct ofono_netmon *nm = cbd->netmon;
+
+ ofono_netmon_serving_cell_notify(nm,
+ cbd->op.tech,
+ OFONO_NETMON_INFO_RXLEV, cbd->rxlev,
+ OFONO_NETMON_INFO_BER, cbd->ber,
+ OFONO_NETMON_INFO_RSCP, cbd->rscp,
+ OFONO_NETMON_INFO_ECN0, cbd->ecn0,
+ OFONO_NETMON_INFO_RSRQ, cbd->rsrq,
+ OFONO_NETMON_INFO_RSRP, cbd->rsrp,
+ OFONO_NETMON_INFO_INVALID);
+
+ CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void cesq_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ enum cesq_ofono_netmon_info {
+ CESQ_RXLEV,
+ CESQ_BER,
+ CESQ_RSCP,
+ CESQ_ECN0,
+ CESQ_RSRQ,
+ CESQ_RSRP,
+ _MAX,
+ };
+
+ struct req_cb_data *cbd = user_data;
+ struct ofono_error error;
+ GAtResultIter iter;
+ int idx, number;
+
+ DBG("ok %d", ok);
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok)
+ goto error;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+CESQ:")) {
+ DBG(" CESQ: no result ");
+ goto out;
+ }
+
+ for (idx = 0; idx < _MAX; idx++) {
+
+ ok = g_at_result_iter_next_number(&iter, &number);
+ if (!ok) {
+ /* Ignore and do not fail */
+ DBG(" CESQ: error parsing idx: %d ", idx);
+ goto out;
+ }
+
+ switch (idx) {
+ case CESQ_RXLEV:
+ cbd->rxlev = number != 99 ? number:cbd->rxlev;
+ break;
+ case CESQ_BER:
+ cbd->ber = number != 99 ? number:cbd->ber;
+ break;
+ case CESQ_RSCP:
+ cbd->rscp = number != 255 ? number:cbd->rscp;
+ break;
+ case CESQ_ECN0:
+ cbd->ecn0 = number != 255 ? number:cbd->ecn0;
+ break;
+ case CESQ_RSRQ:
+ cbd->rsrq = number != 255 ? number:cbd->rsrq;
+ break;
+ case CESQ_RSRP:
+ cbd->rsrp = number != 255 ? number:cbd->rsrp;
+ break;
+ }
+ }
+
+ DBG(" RXLEV %d ", cbd->rxlev);
+ DBG(" BER %d ", cbd->ber);
+ DBG(" RSCP %d ", cbd->rscp);
+ DBG(" ECN0 %d ", cbd->ecn0);
+ DBG(" RSRQ %d ", cbd->rsrq);
+ DBG(" RSRP %d ", cbd->rsrp);
+
+ /* We never fail at this point we always send what we collected so far */
+out:
+ ublox_netmon_finish_success(cbd);
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct req_cb_data *cbd = user_data;
+ struct ofono_netmon *nm = cbd->netmon;
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(nm);
+ struct ofono_error error;
+ GAtResultIter iter;
+ int tech;
+
+ DBG("ok %d", ok);
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok)
+ goto error;
+
+ g_at_result_iter_init(&iter, result);
+
+ /* Do not fail */
+ if (!g_at_result_iter_next(&iter, "+COPS:"))
+ goto out;
+
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+
+ /* Default to GSM */
+ if (g_at_result_iter_next_number(&iter, &tech) == FALSE)
+ cbd->op.tech =
ublox_map_radio_access_technology(ACCESS_TECHNOLOGY_GSM);
+ else
+ cbd->op.tech = ublox_map_radio_access_technology(tech);
+
+ if (g_at_chat_send(nmd->chat, "AT+CESQ", cesq_prefix,
+ cesq_cb, cbd, NULL)) {
+ return;
+ }
+
+out:
+ CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+ g_free(cbd);
Oups missed a return here, yes hard to get it right ;-) sending v3 soon.
+error:
+ CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+ g_free(cbd);
+}
+
+static void ublox_netmon_request_update(struct ofono_netmon *netmon,
+ ofono_netmon_cb_t cb, void *data)
+{
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+ struct req_cb_data *cbd;
+
+ DBG("ublox netmon request update");
+
+ cbd = req_cb_data_new0(cb, data, netmon);
+ if (!cbd) {
+ CALLBACK_WITH_FAILURE(cb, data);
+ return;
+ }
+
+ if (g_at_chat_send(nmd->chat, "AT+COPS?", cops_prefix,
+ cops_cb, cbd, NULL) == 0) {
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+ }
+}
+
+static int ublox_netmon_probe(struct ofono_netmon *netmon,
+ unsigned int vendor, void *user)
+{
+ GAtChat *chat = user;
+ struct netmon_driver_data *nmd;
+
+ DBG("ublox netmon probe");
+
+ nmd = g_try_new0(struct netmon_driver_data, 1);
+ if (nmd == NULL)
+ return -ENOMEM;
+
+ nmd->chat = g_at_chat_clone(chat);
+
+ ofono_netmon_set_data(netmon, nmd);
+
+ g_idle_add(ublox_delayed_register, netmon);
+
+ return 0;
+}
+
+static void ublox_netmon_remove(struct ofono_netmon *netmon)
+{
+ struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+
+ DBG("ublox netmon remove");
+
+ g_at_chat_unref(nmd->chat);
+
+ ofono_netmon_set_data(netmon, NULL);
+
+ g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+ .name = UBLOXMODEM,
+ .probe = ublox_netmon_probe,
+ .remove = ublox_netmon_remove,
+ .request_update = ublox_netmon_request_update,
+};
+
+void ublox_netmon_init(void)
+{
+ ofono_netmon_driver_register(&driver);
+}
+
+void ublox_netmon_exit(void)
+{
+ ofono_netmon_driver_unregister(&driver);
+}
diff --git a/drivers/ubloxmodem/ubloxmodem.c b/drivers/ubloxmodem/ubloxmodem.c
index 93cb928..a325b1f 100644
--- a/drivers/ubloxmodem/ubloxmodem.c
+++ b/drivers/ubloxmodem/ubloxmodem.c
@@ -36,6 +36,7 @@
static int ubloxmodem_init(void)
{
ublox_gprs_context_init();
+ ublox_netmon_init();
ublox_lte_init();
return 0;
@@ -44,6 +45,7 @@ static int ubloxmodem_init(void)
static void ubloxmodem_exit(void)
{
ublox_gprs_context_exit();
+ ublox_netmon_exit();
ublox_lte_exit();
}
diff --git a/drivers/ubloxmodem/ubloxmodem.h b/drivers/ubloxmodem/ubloxmodem.h
index cf66412..bfb0106 100644
--- a/drivers/ubloxmodem/ubloxmodem.h
+++ b/drivers/ubloxmodem/ubloxmodem.h
@@ -26,5 +26,8 @@
extern void ublox_gprs_context_init(void);
extern void ublox_gprs_context_exit(void);
+extern void ublox_netmon_init(void);
+extern void ublox_netmon_exit(void);
+
extern void ublox_lte_init(void);
extern void ublox_lte_exit(void);
--
2.5.5
4:13 a.m.
New subject: [PATCH 5/7] ubloxmodem: register and initialize the netmon driver
---
plugins/ublox.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/plugins/ublox.c b/plugins/ublox.c
index 6d77df8..2ced577 100644
--- a/plugins/ublox.c
+++ b/plugins/ublox.c
@@ -38,6 +38,7 @@
#include <ofono/sim.h>
#include <ofono/gprs.h>
#include <ofono/gprs-context.h>
+#include <ofono/netmon.h>
#include <ofono/lte.h>
#include <drivers/atmodem/atutil.h>
@@ -323,6 +324,8 @@ static void ublox_post_online(struct ofono_modem *modem)
struct ublox_data *data = ofono_modem_get_data(modem);
ofono_netreg_create(modem, data->vendor_family, "atmodem", data->aux);
+
+ ofono_netmon_create(modem, data->vendor_family, "ubloxmodem",
data->aux);
}
static struct ofono_modem_driver ublox_driver = {
--
2.5.5
4:13 a.m.
New subject: [PATCH 6/7] build: build the ublox netmon driver
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 3d7774b..07adeab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -383,6 +383,7 @@ builtin_sources += drivers/atmodem/atutil.h \
drivers/ubloxmodem/ubloxmodem.h \
drivers/ubloxmodem/ubloxmodem.c \
drivers/ubloxmodem/gprs-context.c \
+ drivers/ubloxmodem/netmon.c \
drivers/ubloxmodem/lte.c
--
2.5.5
4:13 a.m.
New subject: [PATCH 7/7] test: support OFONO_NETMON_INFO_{RXLEV|RSCP|ECN0|RSRQ|RSRP}
Display the following fields if they are returned.
RXLEV: Received Signal Strength
RSCP: Received Signal Code Power
ECN0: Received Energy Ratio
RSRQ: Reference Signal Received Quality
RSRP: Reference Signal Received Power
---
test/get-serving-cell-info | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/test/get-serving-cell-info b/test/get-serving-cell-info
index 05dc9fe..94e1c54 100755
--- a/test/get-serving-cell-info
+++ b/test/get-serving-cell-info
@@ -26,6 +26,11 @@ cid = 'CellId'
psc = 'PrimaryScramblingCode'
rssi = 'Strength'
ber = 'BitErrorRate'
+rxlev = 'ReceivedSignalStrength'
+rscp = 'ReceivedSignalCodePower'
+ecn0 = 'ReceivedEnergyRatio'
+rsrq = 'ReferenceSignalReceivedQuality'
+rsrp = 'ReferenceSignalReceivedPower'
print("Current serving cell information:")
@@ -50,7 +55,22 @@ if psc in servingcell:
if rssi in servingcell:
print(" [ Signal Strength = %d]" % (servingcell[rssi]))
+if rxlev in servingcell:
+ print(" [ Received Signal Strength = %d]" % (servingcell[rxlev]))
+
if ber in servingcell:
print(" [ Bit Error Rate = %d]" % (servingcell[ber]))
+if rscp in servingcell:
+ print(" [ Received Signal Code Power = %d]" % (servingcell[rscp]))
+
+if ecn0 in servingcell:
+ print(" [ Received Energy Ratio = %d]" % (servingcell[ecn0]))
+
+if rsrq in servingcell:
+ print(" [ Reference Signal Received Quality = %d]" % (servingcell[rsrq]))
+
+if rsrp in servingcell:
+ print(" [ Reference Signal Received Power = %d]" % (servingcell[rsrp]))
+
print('')
--
2.5.5
1512
days inactive
1512
days old
8 comments
1 participants
participants (1)
-
Djalal Harouni