diff options
Diffstat (limited to 'introspection')
-rw-r--r-- | introspection/Makefile.am | 1 | ||||
-rw-r--r-- | introspection/mm-modem-gsm-card.xml | 48 | ||||
-rw-r--r-- | introspection/mm-modem-gsm-network.xml | 163 | ||||
-rw-r--r-- | introspection/mm-modem-gsm.xml | 86 |
4 files changed, 113 insertions, 185 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 3712db8a..e24dca4b 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = \ mm-modem-cdma.xml \ mm-modem-connect-error.xml \ mm-modem-error.xml \ + mm-modem-gsm.xml \ mm-modem-gsm-card.xml \ mm-modem-gsm-contacts.xml \ mm-modem-gsm-hso.xml \ diff --git a/introspection/mm-modem-gsm-card.xml b/introspection/mm-modem-gsm-card.xml index 12fcc1e6..ad9348d3 100644 --- a/introspection/mm-modem-gsm-card.xml +++ b/introspection/mm-modem-gsm-card.xml @@ -95,51 +95,13 @@ </arg> </method> - <property name="SupportedBands" type="u" access="read" tp:type="MM_MODEM_GSM_CARD_BANDS"> - <tp:docstring>Bands supported by the card.</tp:docstring> + <property name="SupportedBands" type="u" access="read" tp:type="MM_MODEM_GSM_BAND"> + <tp:docstring>Bands supported by the card. (Note for plugin writers: returned value must not contain ANY)</tp:docstring> </property> - <tp:flags name="MM_MODEM_GSM_CARD_BANDS" value-prefix="MM_MODEM_GSM_CARD_BAND" type="u"> - <tp:docstring> - GSM bands. - </tp:docstring> - <tp:flag suffix="UNKNOWN" value="0x0"> - <tp:docstring>Unknown or invalid band</tp:docstring> - </tp:flag> - <tp:flag suffix="EGSM" value="0x1"> - <tp:docstring>GSM/GPRS/EDGE 900 MHz</tp:docstring> - </tp:flag> - <tp:flag suffix="DCS" value="0x2"> - <tp:docstring>GSM/GPRS/EDGE 1800 MHz</tp:docstring> - </tp:flag> - <tp:flag suffix="PCS" value="0x4"> - <tp:docstring>GSM/GPRS/EDGE 1900 MHz</tp:docstring> - </tp:flag> - <tp:flag suffix="G850" value="0x8"> - <tp:docstring>GSM/GPRS/EDGE 850 MHz</tp:docstring> - </tp:flag> - <tp:flag suffix="U2100" value="0x10"> - <tp:docstring>WCDMA 2100 MHz (Class I)</tp:docstring> - </tp:flag> - <tp:flag suffix="U1700" value="0x20"> - <tp:docstring>WCDMA 3GPP 1800 MHz (Class III)</tp:docstring> - </tp:flag> - <tp:flag suffix="U17IV" value="0x40"> - <tp:docstring>WCDMA 3GPP AWS 1700/2100 MHz (Class IV)</tp:docstring> - </tp:flag> - <tp:flag suffix="U800" value="0x80"> - <tp:docstring>WCDMA 3GPP UMTS 800 MHz (Class VI)</tp:docstring> - </tp:flag> - <tp:flag suffix="U850" value="0x100"> - <tp:docstring>WCDMA 3GPP UMTS 850 MHz (Class V)</tp:docstring> - </tp:flag> - <tp:flag suffix="U900" value="0x200"> - <tp:docstring>WCDMA 3GPP UMTS 900 MHz (Class VIII)</tp:docstring> - </tp:flag> - <tp:flag suffix="U17IX" value="0x400"> - <tp:docstring>WCDMA 3GPP UMTS 1700 MHz (Class IX)</tp:docstring> - </tp:flag> - </tp:flags> + <property name="SupportedModes" type="u" access="read" tp:type="MM_MODEM_GSM_MODE"> + <tp:docstring>Network selection modes supported by the card. (Note for plugin writers: returned value must not contain ANY)</tp:docstring> + </property> </interface> </node> diff --git a/introspection/mm-modem-gsm-network.xml b/introspection/mm-modem-gsm-network.xml index 9dadeb16..84742591 100644 --- a/introspection/mm-modem-gsm-network.xml +++ b/introspection/mm-modem-gsm-network.xml @@ -56,53 +56,53 @@ <method name="SetBand"> <tp:docstring> - Set the GSM band. + Sets the band the device is allowed to use when connecting to a mobile network. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_band"/> - <arg name="band" type="u" direction="in" tp:type="MM_MODEM_GSM_NETWORK_BAND"> - <tp:docstring> - The band. - </tp:docstring> + <arg name="band" type="u" direction="in" tp:type="MM_MODEM_GSM_BAND"> + <tp:docstring> + The desired band. Only one band may be specified, and may not be UNKNOWN. + </tp:docstring> </arg> </method> <method name="GetBand"> <tp:docstring> - Get the current band. + Returns the current band the device is using. (Note for plugin writers: returned value must not be ANY) </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_band"/> - <arg name="band" type="u" direction="out" tp:type="MM_MODEM_GSM_NETWORK_BAND"> - <tp:docstring> - The current band. - </tp:docstring> + <arg name="band" type="u" direction="out" tp:type="MM_MODEM_GSM_BAND"> + <tp:docstring> + The current band. + </tp:docstring> </arg> </method> <method name="SetNetworkMode"> <tp:docstring> - Set the GSM network mode. + Set the desired mode the device may use when connecting to a mobile network. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_network_mode"/> - <arg name="mode" type="u" direction="in" tp:type="MM_MODEM_GSM_NETWORK_MODE"> - <tp:docstring> - The GSM network mode. - </tp:docstring> + <arg name="mode" type="u" direction="in" tp:type="MM_MODEM_GSM_MODE"> + <tp:docstring> + The desired network mode. Only one mode may be specified, and may not be UNKNOWN. + </tp:docstring> </arg> </method> <method name="GetNetworkMode"> <tp:docstring> - Get the network mode. + Returns the current network mode of the device. (Note for plugin writers: returned value *may* be ANY) </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_network_mode"/> - <arg name="mode" type="u" direction="out" tp:type="MM_MODEM_GSM_NETWORK_MODE"> - <tp:docstring> - The current network mode. - </tp:docstring> + <arg name="mode" type="u" direction="out" tp:type="MM_MODEM_GSM_MODE"> + <tp:docstring> + Returns the general network mode (ex. 2G/3G preference) of the device. + </tp:docstring> </arg> </method> @@ -158,134 +158,13 @@ <tp:docstring> The network mode changed. </tp:docstring> - <arg name="mode" type="u" tp:type="MM_MODEM_GSM_NETWORK_MODE"> + <arg name="mode" type="u" tp:type="MM_MODEM_GSM_MODE"> <tp:docstring> The new network mode. </tp:docstring> </arg> </signal> - <tp:enum name="MM_MODEM_GSM_NETWORK_MODE" type="u"> - <tp:enumvalue suffix="ANY" value="0"> - <tp:docstring> - Any network mode can be used. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="GPRS" value="1"> - <tp:docstring> - GPRS - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="EDGE" value="2"> - <tp:docstring> - EDGE - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="UMTS" value="3"> - <tp:docstring> - UMTS (3G) - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="HSDPA" value="4"> - <tp:docstring> - HSDPA - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="2G_PREFERRED" value="5"> - <tp:docstring> - Prefer 2G (GPRS or EDGE). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="3G_PREFERRED" value="6"> - <tp:docstring> - Prefer 3G (UMTS or HSDPA). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="2G_ONLY" value="7"> - <tp:docstring> - Use only 2G (GPRS or EDGE). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="3G_ONLY" value="8"> - <tp:docstring> - Use only 3G (UMTS or HSDPA). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="HSUPA" value="9"> - <tp:docstring> - HSUPA. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="HSPA" value="10"> - <tp:docstring> - HSDPA and HSUPA. - </tp:docstring> - </tp:enumvalue> - </tp:enum> - - <tp:enum name="MM_MODEM_GSM_NETWORK_BAND" type="u"> - <tp:enumvalue suffix="ANY" value="0"> - <tp:docstring> - Any band can be used. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="EGSM" value="1"> - <tp:docstring> - EGSM (900 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="DCS" value="2"> - <tp:docstring> - DCS (1800 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="PCS" value="4"> - <tp:docstring> - PCS (1900 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="G850" value="8"> - <tp:docstring> - G850 (850 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U2100" value="16"> - <tp:docstring> - U2100 (WCDMA 2100 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U1700" value="32"> - <tp:docstring> - U1700 (WCDMA 3GPP UMTS1800 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="17IV" value="64"> - <tp:docstring> - 17IV (WCDMA 3GPP AWS 1700/2100 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U800" value="128"> - <tp:docstring> - U800 (WCDMA 3GPP UMTS800 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U850" value="256"> - <tp:docstring> - U850 (WCDMA 3GPP UMTS850 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U900" value="512"> - <tp:docstring> - U900 (WCDMA 3GPP UMTS900 MHz). - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="U17IX" value="1024"> - <tp:docstring> - U17IX (WCDMA 3GPP UMTS MHz). - </tp:docstring> - </tp:enumvalue> - </tp:enum> - <tp:enum name="MM_MODEM_GSM_NETWORK_REG_STATUS" type="u"> <tp:enumvalue suffix="IDLE" value="0"> <tp:docstring> diff --git a/introspection/mm-modem-gsm.xml b/introspection/mm-modem-gsm.xml new file mode 100644 index 00000000..d6c42c89 --- /dev/null +++ b/introspection/mm-modem-gsm.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.ModemManager.Modem.Gsm"> + <tp:flags name="MM_MODEM_GSM_MODE" value-prefix="MM_MODEM_GSM_MODE" type="u"> + <tp:flag suffix="UNKNOWN" value="0x0"> + <tp:docstring>Unknown or invalid mode.</tp:docstring> + </tp:flag> + <tp:flag suffix="ANY" value="0x1"> + <tp:docstring>For certain operations, allow the modem to pick any available mode.</tp:docstring> + </tp:flag> + <tp:flag suffix="GPRS" value="0x2"> + <tp:docstring>GPRS</tp:docstring> + </tp:flag> + <tp:flag suffix="EDGE" value="0x4"> + <tp:docstring>EDGE</tp:docstring> + </tp:flag> + <tp:flag suffix="UMTS" value="0x8"> + <tp:docstring>UMTS (3G)</tp:docstring> + </tp:flag> + <tp:flag suffix="HSDPA" value="0x10"> + <tp:docstring>HSDPA</tp:docstring> + </tp:flag> + <tp:flag suffix="2G_PREFERRED" value="0x20"> + <tp:docstring>Prefer 2G (GPRS or EDGE)</tp:docstring> + </tp:flag> + <tp:flag suffix="3G_PREFERRED" value="0x40"> + <tp:docstring>Prefer 3G (UMTS or HSDPA)</tp:docstring> + </tp:flag> + <tp:flag suffix="2G_ONLY" value="0x80"> + <tp:docstring>Use only 2G (GPRS or EDGE)</tp:docstring> + </tp:flag> + <tp:flag suffix="3G_ONLY" value="0x100"> + <tp:docstring>Use only 3G (UMTS or HSDPA)</tp:docstring> + </tp:flag> + <tp:flag suffix="HSUPA" value="0x200"> + <tp:docstring>HSUPA</tp:docstring> + </tp:flag> + </tp:flags> + + <tp:flags name="MM_MODEM_GSM_BAND" value-prefix="MM_MODEM_GSM_BAND" type="u"> + <tp:docstring> + GSM network and device bands. + </tp:docstring> + <tp:flag suffix="UNKNOWN" value="0x0"> + <tp:docstring>Unknown or invalid band</tp:docstring> + </tp:flag> + <tp:flag suffix="ANY" value="0x1"> + <tp:docstring>For certain operations, allow the modem to select a band automatically.</tp:docstring> + </tp:flag> + <tp:flag suffix="EGSM" value="0x2"> + <tp:docstring>GSM/GPRS/EDGE 900 MHz</tp:docstring> + </tp:flag> + <tp:flag suffix="DCS" value="0x4"> + <tp:docstring>GSM/GPRS/EDGE 1800 MHz</tp:docstring> + </tp:flag> + <tp:flag suffix="PCS" value="0x8"> + <tp:docstring>GSM/GPRS/EDGE 1900 MHz</tp:docstring> + </tp:flag> + <tp:flag suffix="G850" value="0x10"> + <tp:docstring>GSM/GPRS/EDGE 850 MHz</tp:docstring> + </tp:flag> + <tp:flag suffix="U2100" value="0x20"> + <tp:docstring>WCDMA 2100 MHz (Class I)</tp:docstring> + </tp:flag> + <tp:flag suffix="U1800" value="0x40"> + <tp:docstring>WCDMA 3GPP 1800 MHz (Class III)</tp:docstring> + </tp:flag> + <tp:flag suffix="U17IV" value="0x80"> + <tp:docstring>WCDMA 3GPP AWS 1700/2100 MHz (Class IV)</tp:docstring> + </tp:flag> + <tp:flag suffix="U800" value="0x100"> + <tp:docstring>WCDMA 3GPP UMTS 800 MHz (Class VI)</tp:docstring> + </tp:flag> + <tp:flag suffix="U850" value="0x200"> + <tp:docstring>WCDMA 3GPP UMTS 850 MHz (Class V)</tp:docstring> + </tp:flag> + <tp:flag suffix="U900" value="0x400"> + <tp:docstring>WCDMA 3GPP UMTS 900 MHz (Class VIII)</tp:docstring> + </tp:flag> + <tp:flag suffix="U17IX" value="0x800"> + <tp:docstring>WCDMA 3GPP UMTS 1700 MHz (Class IX)</tp:docstring> + </tp:flag> + </tp:flags> + </interface> +</node> |