From a5adf39aa1d0c1e81f86a6c4cbeacf02ecea94b9 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Tue, 12 Mar 2019 12:09:56 +0100 Subject: [PATCH] atmodem: drop vendor type for Toby L2 model The 'Toby L2'-specific vendor type is used only to prevent the CMER command from attempting to set mode '3'. For all u-blox models, mode '3' is just an alias for mode '1'. As such, mode '1' can be used in place of mode '3', removing the model-specific quirk in favour of a vendor-specific quirk. With this change, the L2-specific vendor type is no longer needed. --- drivers/atmodem/gprs.c | 1 - drivers/atmodem/network-registration.c | 7 +++++-- drivers/atmodem/sim.c | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c index de7c7864..d3fd893c 100644 --- a/drivers/atmodem/gprs.c +++ b/drivers/atmodem/gprs.c @@ -455,7 +455,6 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data) FALSE, gprs, NULL); break; case OFONO_VENDOR_UBLOX: - case OFONO_VENDOR_UBLOX_TOBY_L2: g_at_chat_register(gd->chat, "+UREG:", ublox_ureg_notify, FALSE, gprs, NULL); g_at_chat_send(gd->chat, "AT+UREG=1", none_prefix, diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 331b6047..67380b73 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -1655,8 +1655,11 @@ static ofono_bool_t build_cmer_string(char *buf, int *cmer_opts, DBG(""); switch (nd->vendor) { - case OFONO_VENDOR_UBLOX_TOBY_L2: - /* UBX-13002752 R33: TOBY L2 doesn't support mode 2 and 3 */ + case OFONO_VENDOR_UBLOX: + /* For all u-blox models, mode 3 is equivalent to mode 1; + * since some models do not support setting modes 2 nor 3 + * (see UBX-13002752), we prefer mode 1 for all models. + */ mode = "1"; break; default: diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 51f84818..5f66a09c 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -1221,7 +1221,6 @@ static void at_pin_retries_query(struct ofono_sim *sim, return; break; case OFONO_VENDOR_UBLOX: - case OFONO_VENDOR_UBLOX_TOBY_L2: if (g_at_chat_send(sd->chat, "AT+UPINCNT", upincnt_prefix, upincnt_cb, cbd, g_free) > 0) return;