api,introspection: new 'Signal' interface for extended signal quality

6 files changed, 171 insertions, 3 deletions

diff --git a/data/org.freedesktop.ModemManager1.conf.polkit b/data/org.freedesktop.ModemManager1.conf.polkit
index 64c43ebc..5c963846 100644
--- a/data/org.freedesktop.ModemManager1.conf.polkit
+++ b/data/org.freedesktop.ModemManager1.conf.polkit
@@ -192,6 +192,13 @@
            send_interface="org.freedesktop.ModemManager1.Sms"
            send_member="Send"/>
 
+    <!-- org.freedesktop.ModemManager1.Modem.Signal.xml -->
+
+    <!-- Allowed for everyone -->
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Signal"
+           send_member="Setup"/>
+
   </policy>
 
   <policy user="root">
diff --git a/docs/reference/api/Makefile.am b/docs/reference/api/Makefile.am
index 33c28e21..de101c23 100644
--- a/docs/reference/api/Makefile.am
+++ b/docs/reference/api/Makefile.am
@@ -77,6 +77,7 @@ expand_content_files = \
 	$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
 	$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
 	$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
+	$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml \
 	$(NULL)
 
 extra_files = \
diff --git a/docs/reference/api/ModemManager-dbus-reference.xml b/docs/reference/api/ModemManager-dbus-reference.xml
index f6f7d32d..d36ac417 100644
--- a/docs/reference/api/ModemManager-dbus-reference.xml
+++ b/docs/reference/api/ModemManager-dbus-reference.xml
@@ -136,6 +136,7 @@
     <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/>
     <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/>
     <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
+    <xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml"/>
     <!--xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/-->
   </chapter>
 
diff --git a/introspection/all.xml b/introspection/all.xml
index 24acf595..4e8f57f5 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -14,6 +14,7 @@
   <xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Time.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Signal.xml"/>
 
   <!--xi:include href="wip-org.freedesktop.ModemManager1.Modem.Contacts.xml"/-->
 
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Signal.xml b/introspection/org.freedesktop.ModemManager1.Modem.Signal.xml
new file mode 100644
index 00000000..2a034644
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Signal.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.8 Interface Specification
+
+   Copyright (C) 2013 Aleksander Morgado <aleksander@gnu.org>
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Signal:
+      @short_description: The ModemManager Signal interface.
+
+      This interface provides access to extended signal quality information.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Signal">
+
+    <!--
+        Setup:
+        @rate: refresh rate to set. 0 to disable retrieval.
+
+        Setup extended signal quality information retrieval.
+    -->
+    <method name="Setup">
+      <arg name="rate" type="u" direction="in" />
+    </method>
+
+    <!--
+        Rate:
+
+        Refresh rate for the extended signal quality information updates,
+        in seconds. A value of 0 disables the retrieval of the values.
+    -->
+    <property name="Rate" type="u" access="read" />
+
+    <!--
+        CdmaRssi:
+
+        CDMA1x RSSI (Received Signal Strength Indication), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="CdmaRssi" type="(bd)" access="read" />
+
+    <!--
+        CdmaEcio:
+
+        CDMA1x Ec/Io, in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="CdmaEcio" type="(bd)" access="read" />
+
+    <!--
+        EvdoRssi:
+
+        CDMA EV-DO RSSI (Received Signal Strength Indication), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="EvdoRssi" type="(bd)" access="read" />
+
+    <!--
+        EvdoEcio:
+
+        CDMA EV-DO Ec/Io, in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="EvdoEcio" type="(bd)" access="read" />
+
+    <!--
+        EvdoSinr:
+
+        CDMA EV-DO SINR level, in dB.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="EvdoSinr" type="(bd)" access="read" />
+
+    <!--
+        EvdoIo:
+
+        CDMA EV-DO IO, in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="EvdoIo" type="(bd)" access="read" />
+
+    <!--
+        GsmRssi:
+
+        GSM RSSI (Received Signal Strength Indication), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="GsmRssi" type="(bd)" access="read" />
+
+    <!--
+        UmtsRssi:
+
+        UMTS (WCDMA) RSSI (Received Signal Strength Indication), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="UmtsRssi" type="(bd)" access="read" />
+
+    <!--
+        UmtsEcio:
+
+        UMTS (WCDMA) Ec/Io, in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="UmtsEcio" type="(bd)" access="read" />
+
+    <!--
+        LteRssi:
+
+        LTE RSSI (Received Signal Strength Indication), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="LteRssi" type="(bd)" access="read" />
+
+    <!--
+        LteRsrq:
+
+        LTE RSRQ (Reference Signal Received Quality), in dB.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="LteRsrq" type="(bd)" access="read" />
+
+    <!--
+        LteRsrp:
+
+        LTE RSRP (Reference Signal Received Power), in dBm.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="LteRsrp" type="(bd)" access="read" />
+
+    <!--
+        LteSnr:
+
+        LTE S/R ratio, in dB.
+
+        The boolean flag indicates whether the value is valid.
+    -->
+    <property name="LteSnr" type="(bd)" access="read" />
+
+  </interface>
+</node>
diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
index b54b234d..d9010b89 100644
--- a/libmm-glib/generated/Makefile.am
+++ b/libmm-glib/generated/Makefile.am
@@ -33,7 +33,8 @@ GENERATED_DOC = \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
-	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
 
@@ -97,7 +98,8 @@ mm_gdbus_modem_generated = \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
-	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml
 mm_gdbus_modem_deps = \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
@@ -107,7 +109,8 @@ mm_gdbus_modem_deps = \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
-	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Signal.xml
 $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
 	$(AM_V_GEN) gdbus-codegen \
 		--interface-prefix org.freedesktop.ModemManager1. \