diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-11-02 09:52:31 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-11-02 09:52:31 +0100 |
| commit | 9ec90d9a11f53c91274a1341217e7da5f8621674 (patch) | |
| tree | 2dc913f810b07b1d31cd78272932011e3df0d961 /src | |
| parent | 96305bb5c1d32e5a0e517750501b705502e74111 (diff) | |
core,plugins: don't assume 'CS' supported when '2G' supported
We will not report 'CS' as a supported mode every time '2G' is supported. This
actually was forcing all plugins to handle a 'CS' fallback when they didn't have
CS-specific mode setup. So, to simplify things, we will only report 'CS' as
supported for those plugins which actually allow to select 'CS' mode (e.g. the
'wavecom' plugin).
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 7 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 9 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 95a61cdb..9161c82c 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1205,13 +1205,6 @@ supported_modes_ws46_test_ready (MMBroadbandModem *self, } } - /* We'll assume CS supported if we have 2G */ - if (!(ctx->mode & MM_MODEM_MODE_CS) && - ctx->mode & MM_MODEM_MODE_2G) { - mm_dbg ("Assuming device allows (3GPP) 2G/3G network modes"); - ctx->mode |= MM_MODEM_MODE_CS; - } - /* Now keep on with the loading, we may need CDMA-specific checks */ ctx->run_ws46 = FALSE; load_supported_modes_step (ctx); diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 0b727791..f121fc9d 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -751,8 +751,7 @@ mm_modem_mode_from_qmi_radio_technology_preference (QmiNasRadioTechnologyPrefere MMModemMode mode = MM_MODEM_MODE_NONE; if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP2) { - if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_AMPS_OR_GSM) - mode |= MM_MODEM_MODE_CS; /* AMPS */ + /* Ignore AMPS, we really don't report CS mode in QMI modems */ if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA) mode |= MM_MODEM_MODE_2G; /* CDMA */ if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_HDR) @@ -761,7 +760,7 @@ mm_modem_mode_from_qmi_radio_technology_preference (QmiNasRadioTechnologyPrefere if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP) { if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_AMPS_OR_GSM) - mode |= (MM_MODEM_MODE_CS | MM_MODEM_MODE_2G); /* GSM */ + mode |= MM_MODEM_MODE_2G; /* GSM */ if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA) mode |= MM_MODEM_MODE_3G; /* WCDMA */ } @@ -820,10 +819,6 @@ mm_modem_mode_from_qmi_rat_mode_preference (QmiNasRatModePreference qmi) if (qmi & QMI_NAS_RAT_MODE_PREFERENCE_LTE) mode |= MM_MODEM_MODE_4G; - /* Assume CS if 2G supported */ - if (mode & MM_MODEM_MODE_2G) - mode |= MM_MODEM_MODE_CS; - return mode; } |