[gofonoext] Added support for ModemManager API v5

sailfishos · Mar 1, 2016 · 2de545e · 2de545e
1 parent 74153ee
commit 2de545e
Show file tree

Hide file tree

Showing 4 changed files with 227 additions and 108 deletions.
diff --git a/include/gofonoext_mm.h b/include/gofonoext_mm.h
@@ -56,6 +56,7 @@ struct ofonoext_modem_manager {
     const GStrV* imei;              /* Since 1.0.3 */
     const char* mms_imsi;           /* Since 1.0.4 */
     OfonoModem* mms_modem;
+    gboolean ready;                 /* Since 1.0.7 */
 };
 
 GType ofonoext_mm_get_type(void);
@@ -171,6 +172,12 @@ ofonoext_mm_add_mms_modem_changed_handler(
     OfonoExtModemManagerHandler fn,
     void* data);
 
+gulong
+ofonoext_mm_add_ready_changed_handler(
+    OfonoExtModemManager* mm,
+    OfonoExtModemManagerHandler fn,
+    void* data);
+
 void
 ofonoext_mm_remove_handler(
     OfonoExtModemManager* mm,

diff --git a/spec/org.nemomobile.ofono.ModemManager.xml b/spec/org.nemomobile.ofono.ModemManager.xml
@@ -45,6 +45,20 @@
             <arg name="mmsSim" type="s" direction="out"/>
             <arg name="mmsModem" type="s" direction="out"/>
         </method>
+        <method name="GetAll5">
+            <arg name="version" type="i" direction="out"/>
+            <arg name="availableModems" type="ao" direction="out"/>
+            <arg name="enabledModems" type="ao" direction="out"/>
+            <arg name="defaultDataSim" type="s" direction="out"/>
+            <arg name="defaultVoiceSim" type="s" direction="out"/>
+            <arg name="defaultDataModem" type="s" direction="out"/>
+            <arg name="defaultVoiceModem" type="s" direction="out"/>
+            <arg name="presentSims" type="ab" direction="out"/>
+            <arg name="imei" type="as" direction="out"/>
+            <arg name="mmsSim" type="s" direction="out"/>
+            <arg name="mmsModem" type="s" direction="out"/>
+            <arg name="ready" type="b" direction="out"/>
+        </method>
         <method name="GetInterfaceVersion">
             <arg name="version" type="i" direction="out"/>
         </method>
@@ -55,7 +69,7 @@
             <arg name="modems" type="ao" direction="out"/>
         </method>
         <method name="GetPresentSims">
-            <arg name="modems" type="as" direction="out"/>
+            <arg name="presentSims" type="ab" direction="out"/>
         </method>
         <method name="GetIMEI">
             <arg name="imsi" type="as" direction="out"/>
@@ -78,6 +92,9 @@
         <method name="GetMmsModem">
             <arg name="path" type="s" direction="out"/>
         </method>
+        <method name="GetReady">
+            <arg name="ready" type="b" direction="out"/>
+        </method>
         <method name="SetEnabledModems">
             <arg name="modems" type="ao" direction="in"/>
         </method>
@@ -116,5 +133,8 @@
         <signal name="MmsModemChanged">
             <arg name="path" type="s"/>
         </signal>
+        <signal name="ReadyChanged">
+            <arg name="ready" type="b"/>
+        </signal>
     </interface>
 </node>