Merge ~kzapalowicz/snappy-hwe-snaps/+git/modem-manager:feature/add-reset into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:modem-manager/1.8.0

[Konrad Zapałowicz]

cinterion: implement reset

This is a cherry-pick of a modem reset functionality implemented in the upstream Modem Manager project.

The reason I am proposing it is that we need to reset the modem and currently there is no other way than sending the AT command manually.

We had been doing this by:
) opening a separate AT port and using it to send modem reset AT command, however the modem is not reacting very well to the AT commands sent behind modem-manager's back.

The alternative solutions exist but are either not suitable in most of the cases, o overly complex:
) rebooting the gateway - it is not a suitable solution in majority of the cases.
) powering the modem off completely - afterwards it is a non-trivial to get it back online because when it is powered-off it disappears from DBus and must be booted via low-level GPIO.

In order to improve the experience here is the very small yet substantial change - implementation of the modem reset over DBus.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM, thanks

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

Thank you for a quick review

diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c
index fe4cdb1..58cfbb7 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -289,6 +289,30 @@ messaging_check_support (MMIfaceModemMessaging *self,
 }
 
 /*****************************************************************************/
+/* Reset (Modem interface) */
+
+static gboolean
+modem_reset_finish (MMIfaceModem  *self,
+                    GAsyncResult  *res,
+                    GError       **error)
+{
+    return !!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error);
+}
+
+static void
+modem_reset (MMIfaceModem        *self,
+             GAsyncReadyCallback  callback,
+             gpointer             user_data)
+{
+    mm_base_modem_at_command (MM_BASE_MODEM (self),
+                              "+CFUN=1,1",
+                              3,
+                              FALSE,
+                              callback,
+                              user_data);
+}
+
+/*****************************************************************************/
 /* Power down */
 
 static gboolean
@@ -1921,6 +1945,8 @@ iface_modem_init (MMIfaceModem *iface)
     iface->modem_after_sim_unlock_finish = after_sim_unlock_finish;
     iface->load_unlock_retries = load_unlock_retries;
     iface->load_unlock_retries_finish = load_unlock_retries_finish;
+    iface->reset = modem_reset;
+    iface->reset_finish = modem_reset_finish;
     iface->modem_power_down = modem_power_down;
     iface->modem_power_down_finish = modem_power_down_finish;
     iface->modem_power_off = modem_power_off;