api,introspection: merge 'AllowedModes' and 'SupportedMode' into 'CurrentModes'

We now have a single 'CurrentModes' property which contains both values in a
tuple with signature "(uu)".

Also, rename 'SetAllowedModes()' to 'SetCurrentModes()', and update the list of
arguments expected to have a single "(uu)" tuple.

1 files changed, 16 insertions, 29 deletions

diff --git a/introspection/org.freedesktop.ModemManager1.Modem.xml b/introspection/org.freedesktop.ModemManager1.Modem.xml
index 7b43846e..ba540ac8 100644
--- a/introspection/org.freedesktop.ModemManager1.Modem.xml
+++ b/introspection/org.freedesktop.ModemManager1.Modem.xml
@@ -137,16 +137,17 @@
     </method>
 
     <!--
-        SetAllowedModes:
-        @modes: Bitmask of <link linkend="MMModemMode">MMModemMode</link> values, to specify all the modes allowed in the modem.
-        @preferred: Specific <link linkend="MMModemMode">MMModemMode</link> preferred among the ones allowed, if any.
+        SetCurrentModes:
+        @modes: A pair of <link linkend="MMModemMode">MMModemMode</link> values, where the first one is a bitmask of allowed modes, and the second one the preferred mode, if any.
 
-        Set the access technologies (eg 2G/3G/4G preference) the device is
+        Set the access technologies (e.g. 2G/3G/4G preference) the device is
         currently allowed to use when connecting to a network.
+
+        The given combination should be supported by the modem, as specified in the
+        #org.freedesktop.ModemManager1.Modem:SupportedModes property.
     -->
-    <method name="SetAllowedModes">
-      <arg name="modes"     type="u" direction="in" />
-      <arg name="preferred" type="u" direction="in" />
+    <method name="SetCurrentModes">
+      <arg name="modes" type="(uu)" direction="in" />
     </method>
 
     <!--
@@ -431,31 +432,17 @@
     <property name="SupportedModes" type="a(uu)" access="read" />
 
     <!--
-        AllowedModes:
-
-        Bitmask of <link linkend="MMModemMode">MMModemMode</link> values,
-        specifying the access technologies (eg 2G/3G/4G preference) the device
-        is currently allowed to use when connecting to a network.
-
-        It must be a subset of #org.freedesktop.ModemManager1.Modem:SupportedModes.
-
-        For POTS devices, only the
-        <link linkend="MM-MODEM-MODE-ANY:CAPS"><constant>MM_MODEM_MODE_ANY</constant></link>
-        mode is supported.
-    -->
-    <property name="AllowedModes" type="u" access="read" />
-
-    <!--
-        PreferredMode:
+        CurrentModes:
 
-        A single <link linkend="MMModemMode">MMModemMode</link> value,
-        specifying the preferred access technology (eg 2G/3G/4G), among the
-        ones defined in the allowed modes.
+        A pair of <link linkend="MMModemMode">MMModemMode</link> values, where the first one
+        is a bitmask specifying the access technologies (eg 2G/3G/4G) the device
+        is currently allowed to use when connecting to a network, and the second one is the
+        preferred mode of those specified as allowed.
 
-        It must be one of the modes configured in
-        #org.freedesktop.ModemManager1.Modem:AllowedModes.
+        The pair must be one of those specified in
+        #org.freedesktop.ModemManager1.Modem:SupportedModes.
     -->
-    <property name="PreferredMode" type="u" access="read" />
+    <property name="CurrentModes" type="(uu)" access="read" />
 
     <!--
         SupportedBands: