diff options
| author | Ben Chan <benchan@chromium.org> | 2013-07-10 20:36:56 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-07-11 07:53:33 +0200 |
| commit | d366b28650be8a3da92eff74da2ff962da82355d (patch) | |
| tree | c3d8c59bfaf9c766068a6d7b65f7724c71a200fb | |
| parent | 8660be8f39601ddb7811d77759a8e087401b9118 (diff) | |
modem-helpers-qmi: fix enumeration type mismatches
This patch fixes the following enumeration type mismatches:
mm-modem-helpers-qmi.c:980:12: error: implicit conversion from
enumeration type 'QmiNasRatModePreference' to different
enumeration type 'QmiNasRadioTechnologyPreference' [-Werror,-Wenum-conversion]
return qmi;
~~~~~~ ^~~
mm-modem-helpers-qmi.c:1082:12: error: implicit conversion from
enumeration type 'MMModemMode' to different
enumeration type 'QmiNasGsmWcdmaAcquisitionOrderPreference' [-Werror,-Wenum-conversion]
return MM_MODEM_MODE_NONE;
~~~~~~ ^~~~~~~~~~~~~~~~~~
mm-modem-helpers-qmi.c:1096:16: error: implicit conversion from
enumeration type 'QmiNasRegistrationState' to different
enumeration type 'MMModem3gppRegistrationState' [-Werror,-Wenum-conversion]
return QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED;
~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index f8832a73..61d8b271 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -955,7 +955,7 @@ mm_modem_capability_from_qmi_radio_technology_preference (QmiNasRadioTechnologyP QmiNasRadioTechnologyPreference mm_modem_capability_to_qmi_radio_technology_preference (MMModemCapability caps) { - QmiNasRatModePreference qmi = 0; + QmiNasRadioTechnologyPreference qmi = 0; /* It is not expected to have a modem supporting 3GPP and 3GPP2 at the same * time but not supporting SSP. */ @@ -1079,7 +1079,7 @@ mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode) mm_dbg ("Unhandled modem mode: '%s'", str); g_free (str); - return MM_MODEM_MODE_NONE; + return QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC; } /*****************************************************************************/ @@ -1093,7 +1093,7 @@ mm_modem_3gpp_registration_state_from_qmi_registration_state (QmiNasAttachState return MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN; if (attach_state == QMI_NAS_ATTACH_STATE_DETACHED) - return QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED; + return MM_MODEM_3GPP_REGISTRATION_STATE_IDLE; /* attached */ |