SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-qmi: fix radio technology preference enum names

Browse Source 
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.
This commit is contained in:
Aleksander Morgado
2012-08-29 17:26:44 +02:00
parent 03e1c9348e
commit f015bf54db
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-qmi.c
+7 -7
View File
@@ -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)