Hi Philippe,
On 05/31/2019 06:44 AM, Philippe De Swert wrote:
Adding support for ublox sara models of NB-IoT modems
---
drivers/ubloxmodem/lte.c | 9 +++++++++
drivers/ubloxmodem/netmon.c | 2 ++
drivers/ubloxmodem/ubloxmodem.c | 14 ++++++++++++++
drivers/ubloxmodem/ubloxmodem.h | 2 ++
4 files changed, 27 insertions(+)
<snip>
@@ -146,6 +148,13 @@ static void ublox_lte_set_default_attach_info(const struct
ofono_lte *lte,
info->apn);
else
snprintf(buf, sizeof(buf), "AT+CGDCONT=1");
+ } else if (ublox_is_sara(ldd->model)) {
+ if (strlen(info->apn) > 0)
+ snprintf(buf, sizeof(buf), "AT+CGDCONT=1,%s,\"%s\"",
+ at_util_gprs_proto_to_pdp_type(info->proto),
+ info->apn);
+ else
+ snprintf(buf, sizeof(buf), "AT+CGDCONT=1");
}
This code block looks to be the same as the toby_l4 one. So either make
this look something like:
if (ublox_is_toby_l2()) {
...
} else {
...
}
Or add a helper function that will do the default case. Maybe Jonas
wants to chime in since he touched this part last.
if (g_at_chat_send(ldd->chat, buf, none_prefix,
diff --git a/drivers/ubloxmodem/netmon.c b/drivers/ubloxmodem/netmon.c
index ef042ed4..b16e0ca6 100644
--- a/drivers/ubloxmodem/netmon.c
+++ b/drivers/ubloxmodem/netmon.c
@@ -86,6 +86,8 @@ static int ublox_map_radio_access_technology(int tech)
case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
return OFONO_NETMON_CELL_TYPE_UMTS;
case ACCESS_TECHNOLOGY_EUTRAN:
+ case ACCESS_TECHNOLOGY_NB_IOT_M1:
+ case ACCESS_TECHNOLOGY_NB_IOT_NB1:
Something is funky with indentation here
return OFONO_NETMON_CELL_TYPE_LTE;
}
diff --git a/drivers/ubloxmodem/ubloxmodem.c b/drivers/ubloxmodem/ubloxmodem.c
index a52a67ea..1fc59c68 100644
--- a/drivers/ubloxmodem/ubloxmodem.c
+++ b/drivers/ubloxmodem/ubloxmodem.c
@@ -39,6 +39,14 @@ const struct ublox_model ublox_models[] = {
{
.name = "SARA-G270",
},
+ {
+ .name = "SARA-R410M-02B",
+ .flags = UBLOX_SARA,
+ },
+ {
+ .name = "SARA-R412M-02B",
+ .flags = UBLOX_SARA,
+ },
/* TOBY L2 series */
{
.name = "TOBY-L200",
@@ -102,6 +110,12 @@ int ublox_model_to_id(const struct ublox_model *model)
return model - ublox_models;
}
+int ublox_is_sara(const struct ublox_model *model)
+{
+ return model->flags & UBLOX_SARA;
+}
+
+
No double empty lines please
int ublox_is_toby_l2(const struct ublox_model *model)
{
return model->flags & UBLOX_F_TOBY_L2;
diff --git a/drivers/ubloxmodem/ubloxmodem.h b/drivers/ubloxmodem/ubloxmodem.h
index 2c5b7433..3588f186 100644
--- a/drivers/ubloxmodem/ubloxmodem.h
+++ b/drivers/ubloxmodem/ubloxmodem.h
@@ -27,6 +27,7 @@ enum ublox_flags {
UBLOX_F_TOBY_L2 = (1 << 0),
UBLOX_F_TOBY_L4 = (1 << 1),
UBLOX_F_HAVE_USBCONF = (1 << 2),
+ UBLOX_SARA = (1 << 3),
};
struct ublox_model {
@@ -37,6 +38,7 @@ struct ublox_model {
const struct ublox_model *ublox_model_from_name(const char *name);
const struct ublox_model *ublox_model_from_id(int id);
int ublox_model_to_id(const struct ublox_model *model);
+int ublox_is_sara(const struct ublox_model *model);
int ublox_is_toby_l2(const struct ublox_model *model);
int ublox_is_toby_l4(const struct ublox_model *model);
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
