diff options
| -rw-r--r-- | cli/mmcli-modem.c | 2 | ||||
| -rw-r--r-- | docs/reference/api/ModemManager-sections.txt | 2 | ||||
| -rw-r--r-- | include/ModemManager-compat.h | 17 | ||||
| -rw-r--r-- | include/ModemManager-enums.h | 3 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-3gpp.c | 2 | ||||
| -rw-r--r-- | src/mm-iface-modem.c | 4 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 6 |
8 files changed, 25 insertions, 13 deletions
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c index 88774b64..a25de316 100644 --- a/cli/mmcli-modem.c +++ b/cli/mmcli-modem.c @@ -407,7 +407,7 @@ print_modem_info (void) pco_list = mm_modem_3gpp_get_pco (ctx->modem_3gpp); initial_eps_bearer_path = mm_modem_3gpp_get_initial_eps_bearer_path (ctx->modem_3gpp); - if (mm_modem_get_current_capabilities (ctx->modem) & (MM_MODEM_CAPABILITY_LTE | MM_MODEM_CAPABILITY_LTE_ADVANCED)) { + if (mm_modem_get_current_capabilities (ctx->modem) & (MM_MODEM_CAPABILITY_LTE)) { MMBearerProperties *initial_eps_bearer_properties; initial_eps_bearer_properties = mm_modem_3gpp_peek_initial_eps_bearer_settings (ctx->modem_3gpp); diff --git a/docs/reference/api/ModemManager-sections.txt b/docs/reference/api/ModemManager-sections.txt index f1d6b270..e63ce121 100644 --- a/docs/reference/api/ModemManager-sections.txt +++ b/docs/reference/api/ModemManager-sections.txt @@ -140,9 +140,11 @@ MM_MODEM_BAND_CDMA_BC17_US_FLO_2500 MM_MODEM_BAND_CDMA_BC18_US_PS_700 MM_MODEM_BAND_CDMA_BC19_US_LOWER_700 MM_MODEM_LOCATION_SOURCE_AGPS +MM_MODEM_CAPABILITY_LTE_ADVANCED <SUBSECTION Private> MMModemBandDeprecated MMModemLocationSourceDeprecated +MMModemCapabilityDeprecated MM_DEPRECATED </SECTION> diff --git a/include/ModemManager-compat.h b/include/ModemManager-compat.h index e1458400..5aaaddf9 100644 --- a/include/ModemManager-compat.h +++ b/include/ModemManager-compat.h @@ -709,6 +709,23 @@ typedef int MMModemLocationSourceDeprecated; */ #define MM_MODEM_LOCATION_SOURCE_AGPS ((MMModemLocationSourceDeprecated)MM_MODEM_LOCATION_SOURCE_AGPS_MSA) +/* The following type exists just so that we can get deprecation warnings */ +MM_DEPRECATED +typedef int MMModemCapabilityDeprecated; + +/** + * MM_MODEM_CAPABILITY_LTE_ADVANCED: + * + * Modem has LTE Advanced data capability. + * + * This value is deprecated because it is not used anywhere. LTE Advanced + * capable devices are reported as LTE capable. + * + * Since: 1.0 + * Deprecated: 1.14.0. + */ +#define MM_MODEM_CAPABILITY_LTE_ADVANCED ((MMModemCapabilityDeprecated)(1 << 4)) + #endif /* MM_DISABLE_DEPRECATED */ #endif /* _MODEMMANAGER_COMPAT_H_ */ diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h index bf068bdc..6d99aa50 100644 --- a/include/ModemManager-enums.h +++ b/include/ModemManager-enums.h @@ -36,7 +36,6 @@ * @MM_MODEM_CAPABILITY_CDMA_EVDO: Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B. * @MM_MODEM_CAPABILITY_GSM_UMTS: Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability. * @MM_MODEM_CAPABILITY_LTE: Modem has LTE data capability. - * @MM_MODEM_CAPABILITY_LTE_ADVANCED: Modem has LTE Advanced data capability. * @MM_MODEM_CAPABILITY_IRIDIUM: Modem has Iridium capabilities. * @MM_MODEM_CAPABILITY_ANY: Mask specifying all capabilities. * @@ -51,7 +50,7 @@ typedef enum { /*< underscore_name=mm_modem_capability >*/ MM_MODEM_CAPABILITY_CDMA_EVDO = 1 << 1, MM_MODEM_CAPABILITY_GSM_UMTS = 1 << 2, MM_MODEM_CAPABILITY_LTE = 1 << 3, - MM_MODEM_CAPABILITY_LTE_ADVANCED = 1 << 4, + /* MM_MODEM_CAPABILITY_LTE_ADVANCED = 1 << 4 */ MM_MODEM_CAPABILITY_IRIDIUM = 1 << 5, MM_MODEM_CAPABILITY_ANY = 0xFFFFFFFF } MMModemCapability; diff --git a/libmm-glib/mm-modem-3gpp.c b/libmm-glib/mm-modem-3gpp.c index 7170acdb..97d8fafe 100644 --- a/libmm-glib/mm-modem-3gpp.c +++ b/libmm-glib/mm-modem-3gpp.c @@ -38,7 +38,7 @@ * properties of the 3GPP interface. * * The 3GPP interface is exposed whenever a modem has any of the 3GPP - * capabilities (%MM_MODEM_CAPABILITY_GSM_UMTS, %MM_MODEM_CAPABILITY_LTE or %MM_MODEM_CAPABILITY_LTE_ADVANCED). + * capabilities (%MM_MODEM_CAPABILITY_GSM_UMTS or %MM_MODEM_CAPABILITY_LTE). */ G_DEFINE_TYPE (MMModem3gpp, mm_modem_3gpp, MM_GDBUS_TYPE_MODEM3GPP_PROXY) diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 32467efb..9671e396 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -5546,7 +5546,7 @@ mm_iface_modem_is_3gpp (MMIfaceModem *self) gboolean mm_iface_modem_is_3gpp_lte (MMIfaceModem *self) { - return (mm_iface_modem_get_current_capabilities (self) & MM_MODEM_CAPABILITY_3GPP_LTE); + return (mm_iface_modem_get_current_capabilities (self) & MM_MODEM_CAPABILITY_LTE); } gboolean @@ -5570,7 +5570,7 @@ mm_iface_modem_is_3gpp_lte_only (MMIfaceModem *self) MMModemCapability capabilities; capabilities = mm_iface_modem_get_current_capabilities (self); - return (capabilities & MM_MODEM_CAPABILITY_3GPP_LTE) && !((MM_MODEM_CAPABILITY_3GPP_LTE ^ capabilities) & capabilities); + return (capabilities & MM_MODEM_CAPABILITY_LTE) && !((MM_MODEM_CAPABILITY_LTE ^ capabilities) & capabilities); } gboolean diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 90a25996..531c5849 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -1029,8 +1029,6 @@ mm_modem_capability_from_qmi_rat_mode_preference (QmiNasRatModePreference qmi) if (qmi & QMI_NAS_RAT_MODE_PREFERENCE_LTE) caps |= MM_MODEM_CAPABILITY_LTE; - /* FIXME: LTE Advanced? */ - return caps; } diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 3ad03ef8..4adaee2a 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -39,13 +39,9 @@ /* Common utilities */ /*****************************************************************************/ -#define MM_MODEM_CAPABILITY_3GPP_LTE \ - (MM_MODEM_CAPABILITY_LTE | \ - MM_MODEM_CAPABILITY_LTE_ADVANCED) - #define MM_MODEM_CAPABILITY_3GPP \ (MM_MODEM_CAPABILITY_GSM_UMTS | \ - MM_MODEM_CAPABILITY_3GPP_LTE) + MM_MODEM_CAPABILITY_LTE) gchar *mm_strip_quotes (gchar *str); const gchar *mm_strip_tag (const gchar *str, |