gemalto: netmon driver
v2 cover gemalto: netmon driver
Hello Denis and all,
This patch series implements netmon driver for gemalto modems that are able to provide basic measurements using AT+CQS and AT^SMONI commands. For now netmon driver is enabled for ELS81x modems.
Regards,
Sergey
v1 -> v2
- use g_new0 instead of g_try_new0
- remove rssi scaling: keep using 27.007 range
- scale modem measurement reports to ranges recommended by 27.007
Sergey Matyukevich (3):
gemalto: add netmon driver
plugin: gemalto: enable netmon
gemalto: netmon measurements scaling
Makefile.am | 3 +- drivers/gemaltomodem/gemaltomodem.c | 2 + drivers/gemaltomodem/gemaltomodem.h | 3 + drivers/gemaltomodem/netmon.c | 649 ++++++++++++++++++++++++++++ plugins/gemalto.c | 6 + 5 files changed, 662 insertions(+), 1 deletion(-) create mode 100644 drivers/gemaltomodem/netmon.c
PATCH v2 1/3 gemalto: add netmon driver
Implement network monitoring driver for gemalto modems that are able to provide serving cell information and basic measurements using AT+CQS and AT^SMONI commands.
--- Makefile.am | 3 +- drivers/gemaltomodem/gemaltomodem.c | 2 + drivers/gemaltomodem/gemaltomodem.h | 3 + drivers/gemaltomodem/netmon.c | 605 ++++++++++++++++++++++++++++ 4 files changed, 612 insertions(+), 1 deletion(-) create mode 100644 drivers/gemaltomodem/netmon.c
Makefile.am +2 -1
@@ -483,7 +483,8 @@ builtin_sources += drivers/atmodem/atutil.h \ drivers/gemaltomodem/gemaltomodem.c \ drivers/gemaltomodem/location-reporting.c \ drivers/gemaltomodem/voicecall.c \ - drivers/gemaltomodem/gprs-context.c + drivers/gemaltomodem/gprs-context.c \ + drivers/gemaltomodem/netmon.c builtin_modules += xmm7modem builtin_sources += drivers/atmodem/atutil.h \
drivers/gemaltomodem/gemaltomodem.c +2 -0
@@ -38,6 +38,7 @@ static int gemaltomodem_init(void)gemalto_location_reporting_init ();gemalto_gprs_context_init ();gemalto_voicecall_init (); +gemalto_netmon_init ();return 0 ; }
@@ -47,6 +48,7 @@ static void gemaltomodem_exit(void)gemalto_location_reporting_exit ();gemalto_gprs_context_exit ();gemalto_voicecall_exit (); +gemalto_netmon_exit (); } OFONO_PLUGIN_DEFINE(gemaltomodem, "Gemalto modem driver", VERSION,
drivers/gemaltomodem/gemaltomodem.h +3 -0
@@ -30,3 +30,6 @@ extern void gemalto_voicecall_exit();extern void gemalto_gprs_context_init ();extern void gemalto_gprs_context_exit (); + +extern void gemalto_netmon_init (void ); +extern void gemalto_netmon_exit (void );
drivers/gemaltomodem/netmon.c new file +605 -0
605 lines not on this page · raw message
PATCH v2 2/3 plugin: gemalto: enable netmon
In reply to Sergey MatyukevichEnable netmon functionality for Gemalto ELS81x modems.
--- plugins/gemalto.c | 6 ++++++ 1 file changed, 6 insertions(+)
plugins/gemalto.c +6 -0
@@ -48,6 +48,7 @@#include <ofono/gprs.h> #include <ofono/gprs-context.h> #include <ofono/location-reporting.h> +#include <ofono/netmon.h> #include <drivers/atmodem/atutil.h> #include <drivers/atmodem/vendor.h>
@@ -622,6 +623,7 @@ static void gemalto_post_sim(struct ofono_modem *modem)static void gemalto_post_online (struct ofono_modem *modem) {struct gemalto_data *data =ofono_modem_get_data (modem); +const char *model =ofono_modem_get_string (modem,"Model" );DBG ("%p" , modem);
@@ -634,6 +636,10 @@ static void gemalto_post_online(struct ofono_modem *modem)ofono_call_settings_create (modem,0 ,"atmodem" , data->app);ofono_call_meter_create (modem,0 ,"atmodem" , data->app);ofono_call_barring_create (modem,0 ,"atmodem" , data->app); + +if (!g_strcmp0 (model, GEMALTO_MODEL_ELS81x)) +ofono_netmon_create (modem,OFONO_VENDOR_GEMALTO , +"gemaltomodem" , data->app); }static struct ofono_modem_driver gemalto_driver = {
PATCH v2 3/3 gemalto: netmon measurements scaling
In reply to Sergey MatyukevichGemalto modem reports raw measurements in dBm. Reported values may include negative numbers. Meanwhile oFono follows ETSI TS 27.007, so negative numbers do not really exist at the API level.
Modify gemalto netmon driver to report measurements according to 27.007. For this purpose re-scale from what Gemalto firmware reports into something that 27.007 recommends.
--- drivers/gemaltomodem/netmon.c | 52 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
drivers/gemaltomodem/netmon.c +48 -4
@@ -128,6 +128,50 @@ static gboolean gemalto_delayed_register(gpointer user_data)return FALSE; } +static int gemalto_ecno_scale (int value) +{ +if (value <-24 ) +return 0 ; + +if (value >0 ) +return 49 ; + +return 49 * (value +24 ) /24 ; +} + +static int gemalto_rscp_scale (int value) +{ +if (value <-120 ) +return 0 ; + +if (value >-24 ) +return 96 ; + +return (value +120 ); +} + +static int gemalto_rsrp_scale (int value) +{ +if (value <-140 ) +return 0 ; + +if (value >-43 ) +return 97 ; + +return (value +140 ); +} + +static int gemalto_rsrq_scale (int value) +{ +if (2 * value <-39 ) +return 0 ; + +if (2 * value >-5 ) +return 34 ; + +return (2 * value +39 ); +} +static int gemalto_parse_smoni_gsm (GAtResultIter *iter,struct req_cb_data *cbd) {
@@ -273,13 +317,13 @@ static int gemalto_parse_smoni_umts(GAtResultIter *iter,case SMONI_UMTS_ECN0 :if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%f" , &fnumber) ==1 ) - cbd->t.umts.ecno = (int )fnumber; + cbd->t.umts.ecno =gemalto_ecno_scale ((int )fnumber); }break ;case SMONI_UMTS_RSCP :if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%d" , &number) ==1 ) - cbd->t.umts.rscp = number; + cbd->t.umts.rscp =gemalto_rscp_scale (number); }break ;case SMONI_UMTS_MCC :
@@ -368,12 +412,12 @@ static int gemalto_parse_smoni_lte(GAtResultIter *iter,if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%d" , &number) ==1 ) - cbd->t.lte.rsrp = number; + cbd->t.lte.rsrp =gemalto_rsrp_scale (number); }if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%d" , &number) ==1 ) - cbd->t.lte.rsrq = number; + cbd->t.lte.rsrq =gemalto_rsrq_scale (number); }DBG (" %-15s %s" ,"LTE.MCC" , cbd->op.mcc);
Re: [PATCH v2 3/3] gemalto: netmon measurements scaling
Hi Sergey,
Quoted 11 lines · Sergey Matyukevich
Gemalto modem reports raw measurements in dBm. Reported values may include negative numbers. Meanwhile oFono follows ETSI TS 27.007, so negative numbers do not really exist at the API level.
Modify gemalto netmon driver to report measurements according to 27.007. For this purpose re-scale from what Gemalto firmware reports into something that 27.007 recommends.
--- drivers/gemaltomodem/netmon.c | 52 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
I went ahead and applied all three patches after making minor tweaks in this one:
drivers/gemaltomodem/netmon.c static gboolean gemalto_delayed_register(gpointer user_data) · line 150
Quoted 9 lines
drivers/gemaltomodem/netmon.c +9
-0+static int gemalto_rscp_scale (int value) +{ +if (value <-120 ) +return 0 ; + +if (value >-24 ) +return 96 ; + +return (value +120 );
The ()s weren't needed here..
drivers/gemaltomodem/netmon.c static gboolean gemalto_delayed_register(gpointer user_data) · line 161
Quoted 11 lines
drivers/gemaltomodem/netmon.c +11
-0+} + +static int gemalto_rsrp_scale (int value) +{ +if (value <-140 ) +return 0 ; + +if (value >-43 ) +return 97 ; + +return (value +140 );
here and ...
drivers/gemaltomodem/netmon.c static gboolean gemalto_delayed_register(gpointer user_data) · line 172
Quoted 11 lines
drivers/gemaltomodem/netmon.c +11
-0+} + +static int gemalto_rsrq_scale (int value) +{ +if (2 * value <-39 ) +return 0 ; + +if (2 * value >-5 ) +return 34 ; + +return (2 * value +39 );
here
drivers/gemaltomodem/netmon.c static int gemalto_parse_smoni_umts(GAtResultIter *iter, · line 320
Quoted 11 lines
drivers/gemaltomodem/netmon.c +3
-1+} +static int gemalto_parse_smoni_gsm (GAtResultIter *iter,struct req_cb_data *cbd) {@@ -273,13 +317,13 @@ static int gemalto_parse_smoni_umts(GAtResultIter *iter,case SMONI_UMTS_ECN0 :if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%f" , &fnumber) ==1 ) - cbd->t.umts.ecno = (int )fnumber; + cbd->t.umts.ecno =gemalto_ecno_scale ((int )fnumber);
Also added a line break to better wrap to 80 char columns here...
drivers/gemaltomodem/netmon.c static int gemalto_parse_smoni_umts(GAtResultIter *iter, · line 326
Quoted 7 lines
drivers/gemaltomodem/netmon.c +1
-1}break ;case SMONI_UMTS_RSCP :if (g_at_result_iter_next_unquoted_string (iter, &str)) {if (sscanf (str,"%d" , &number) ==1 ) - cbd->t.umts.rscp = number; + cbd->t.umts.rscp =gemalto_rscp_scale (number);
and here
drivers/gemaltomodem/netmon.c static int gemalto_parse_smoni_umts(GAtResultIter *iter, · line 329
Quoted 3 lines
drivers/gemaltomodem/netmon.c +0
-0}break ;case SMONI_UMTS_MCC :
Regards,
-Denis
Re: [PATCH v2 3/3] gemalto: netmon measurements scaling
Hello Denis,
Quoted 12 lines
Quoted 11 lines
Gemalto modem reports raw measurements in dBm. Reported values may include negative numbers. Meanwhile oFono follows ETSI TS 27.007, so negative numbers do not really exist at the API level.
Modify gemalto netmon driver to report measurements according to 27.007. For this purpose re-scale from what Gemalto firmware reports into something that 27.007 recommends.
--- drivers/gemaltomodem/netmon.c | 52 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
Quoted 1 line
I went ahead and applied all three patches after making minor tweaks in this one:
Thanks!
Quoted 11 lines
drivers/gemaltomodem/netmon.c static gboolean gemalto_delayed_register(gpointer user_data) · line 150
Quoted 9 lines
drivers/gemaltomodem/netmon.c +9
-0+static int gemalto_rscp_scale (int value) +{ +if (value <-120 ) +return 0 ; + +if (value >-24 ) +return 96 ; + +return (value +120 );The ()s weren't needed here..
Well, I did check coding style document for arithmetic expressions, but I did not find anything other than spaces around operators. So I made a wrong guess...
Regards,
Sergey