diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-06 20:48:35 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-29 17:26:44 +0200 |
| commit | f015bf54db8de0e45f3843020684f38e3c339567 (patch) | |
| tree | 2484cfcf0c36dd83fb501e94604d26d4dc8c8367 | |
| parent | 03e1c9348e817607823f5df12c5b57ece7731d9e (diff) | |
broadband-modem-qmi: fix radio technology preference enum names
Sync with libqmi:
commit 54e5400f6977ae2036b54c2661c1e5c101e03fe4
Author: Aleksander Morgado <aleksander@lanedo.com>
Date: Mon Aug 6 19:57:06 2012 +0200
nas: fix `QmiNasRadioTechnologyPreference' enum names
'Analog' and 'Digital' are purely 3GPP2 terms, so avoid those and provide a mix
of 3GPP and 3GPP2 names.
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 880a7ded..a74b0a43 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -1660,18 +1660,18 @@ modem_mode_from_qmi_radio_technology_preference (QmiNasRatModePreference qmi) MMModemMode mode = MM_MODEM_MODE_NONE; if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP2) { - if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_ANALOG) + if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_AMPS_OR_GSM) mode |= MM_MODEM_MODE_CS; /* AMPS */ - if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_DIGITAL) + if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA) mode |= MM_MODEM_MODE_2G; /* CDMA */ if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_HDR) mode |= MM_MODEM_MODE_3G; /* EV-DO */ } if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP) { - if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_ANALOG) + if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_AMPS_OR_GSM) mode |= (MM_MODEM_MODE_CS | MM_MODEM_MODE_2G); /* GSM */ - if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_DIGITAL) + if (qmi & QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA) mode |= MM_MODEM_MODE_3G; /* WCDMA */ } @@ -2020,15 +2020,15 @@ modem_mode_to_qmi_radio_technology_preference (MMModemMode mode, if (is_cdma) { pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP2; if (mode & MM_MODEM_MODE_2G) - pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_DIGITAL; /* CDMA */ + pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA; /* CDMA */ if (mode & MM_MODEM_MODE_3G) pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_HDR; /* EV-DO */ } else { pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_3GPP; if (mode & MM_MODEM_MODE_2G) - pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_ANALOG; /* GSM */ + pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_AMPS_OR_GSM; /* GSM */ if (mode & MM_MODEM_MODE_3G) - pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_DIGITAL; /* WCDMA */ + pref |= QMI_NAS_RADIO_TECHNOLOGY_PREFERENCE_CDMA_OR_WCDMA; /* WCDMA */ } if (mode & MM_MODEM_MODE_4G) |