diff options
| -rw-r--r-- | introspection/org.freedesktop.ModemManager1.Modem.xml | 26 | ||||
| -rw-r--r-- | libmm-glib/mm-common-helpers.c | 11 | ||||
| -rw-r--r-- | libmm-glib/mm-common-helpers.h | 1 |
3 files changed, 19 insertions, 19 deletions
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.xml b/introspection/org.freedesktop.ModemManager1.Modem.xml index eb4debd8..a67197d2 100644 --- a/introspection/org.freedesktop.ModemManager1.Modem.xml +++ b/introspection/org.freedesktop.ModemManager1.Modem.xml @@ -146,7 +146,12 @@ SetCurrentCapabilities: @capabilities: Bitmask of <link linkend="MMModemCapability">MMModemCapability</link> values, to specify the capabilities to use. - Set the capabilities of the device. A restart of the modem may be required. + Set the capabilities of the device. + + The given bitmask should be supported by the modem, as specified in the + #org.freedesktop.ModemManager1.Modem.Modem:SupportedCapabilities property. + + This command may power-cycle the device. --> <method name="SetCurrentCapabilities"> <arg name="capabilities" type="u" direction="in" /> @@ -230,12 +235,16 @@ SupportedCapabilities: List of <link linkend="MMModemCapability">MMModemCapability</link> - values, specifying the combinations of generic family of access + bitmasks, specifying the combinations of generic family of access technologies the modem supports. - If the modem doesn't allow changing the current capabilities, a single entry with - <link linkend="MM-MODEM-CAPABILITY-ANY:CAPS"><constant>MM_MODEM_CAPABILITY_ANY</constant></link> - will be given. + If the modem doesn't allow changing the current capabilities, the + list will report one single entry with the same bitmask as in + #org.freedesktop.ModemManager1.Modem.Modem:CurrentCapabilities. + + Only multimode devices implementing both 3GPP (GSM/UMTS/LTE/5GNR) and + 3GPP2 (CDMA/EVDO) specs will report more than one combination of + capabilities. --> <property name="SupportedCapabilities" type="au" access="read" /> @@ -243,8 +252,11 @@ CurrentCapabilities: Bitmask of <link linkend="MMModemCapability">MMModemCapability</link> - values, specifying the generic family of access technologies the modem - currently supports without a firmware reload or reinitialization. + values, specifying the currently used generic family of access + technologies. + + This bitmask will be one of the ones listed in + #org.freedesktop.ModemManager1.Modem.Modem:SupportedCapabilities. --> <property name="CurrentCapabilities" type="u" access="read" /> diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c index 484771b3..5bdb6df4 100644 --- a/libmm-glib/mm-common-helpers.c +++ b/libmm-glib/mm-common-helpers.c @@ -538,17 +538,6 @@ mm_common_build_capability_combinations_none (void) return g_variant_builder_end (&builder); } -GVariant * -mm_common_build_capability_combinations_any (void) -{ - GVariantBuilder builder; - - g_variant_builder_init (&builder, G_VARIANT_TYPE ("au")); - g_variant_builder_add_value (&builder, - g_variant_new_uint32 (MM_MODEM_CAPABILITY_ANY)); - return g_variant_builder_end (&builder); -} - void mm_common_get_bands_from_string (const gchar *str, MMModemBand **bands, diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h index e910d8c0..be9f2bb8 100644 --- a/libmm-glib/mm-common-helpers.h +++ b/libmm-glib/mm-common-helpers.h @@ -126,7 +126,6 @@ MMModemCapability *mm_common_capability_combinations_variant_to_array (GVariant GVariant *mm_common_capability_combinations_array_to_variant (const MMModemCapability *capabilities, guint n_capabilities); GVariant *mm_common_capability_combinations_garray_to_variant (GArray *array); -GVariant *mm_common_build_capability_combinations_any (void); GVariant *mm_common_build_capability_combinations_none (void); GArray *mm_common_oma_pending_network_initiated_sessions_variant_to_garray (GVariant *variant); |