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

modem-helpers-qmi: fix enumeration type mismatches

Browse Source 
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;
    ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Ben Chan
2013-07-10 20:36:56 -07:00
committed by Aleksander Morgado
parent 8660be8f39
commit d366b28650
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-modem-helpers-qmi.c
View File

@@ -955,7 +955,7 @@ mm_modem_capability_from_qmi_radio_technology_preference (QmiNasRadioTechnologyP
QmiNasRadioTechnologyPreference QmiNasRadioTechnologyPreference
mm_modem_capability_to_qmi_radio_technology_preference (MMModemCapability caps) 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 /* It is not expected to have a modem supporting 3GPP and 3GPP2 at the same
* time but not supporting SSP. */ * 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); mm_dbg ("Unhandled modem mode: '%s'", str);
g_free (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; return MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
if (attach_state == QMI_NAS_ATTACH_STATE_DETACHED) if (attach_state == QMI_NAS_ATTACH_STATE_DETACHED)
return QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED; return MM_MODEM_3GPP_REGISTRATION_STATE_IDLE;
/* attached */ /* attached */