[PATCH] core: enable unsolicited messages on secondary

[Stevens, Nick]

Previously the enable unsolicited messages command (+CNMI) was only
being sent on the primary. This patch adds support for sending the
enable on the secondary as well. If the secondary doesn't exist, or if
setting the enable causes an error, a warning is logged but no error is
propogated up.

This change is needed for proper SMS operation on the Telit HE910, which
requires that +CNMI be sent to both primary and secondary. Since a
failure to send the +CNMI command on the secondary is a non-fatal error,
it is unlikely that this will cause issues with other modems.

Signed-off-by: Nick Stevens <Nick.Stevens at digi.com>
---
 src/mm-broadband-modem.c | 71 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index f176b80..085d4d7 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -5791,7 +5791,7 @@ set_messaging_unsolicited_events_handlers (MMIfaceModemMessaging *self,
     ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
     ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
 
-    /* Enable unsolicited events in given port */
+    /* Add messaging unsolicited events handler for port primary and secondary */
     for (i = 0; i < 2; i++) {
         if (!ports[i])
             continue;
@@ -5840,6 +5840,19 @@ modem_messaging_cleanup_unsolicited_events (MMIfaceModemMessaging *self,
 /*****************************************************************************/
 /* Enable unsolicited events (SMS indications) (Messaging interface) */
 
+typedef struct {
+    GAsyncReadyCallback callback;
+    gpointer user_data;
+    MMPortSerialAt *primary;
+    MMPortSerialAt *secondary;
+} MessagingEnableContext;
+
+static void
+messaging_enable_context_free (MessagingEnableContext *ctx)
+{
+    g_free (ctx);
+}
+
 static gboolean
 modem_messaging_enable_unsolicited_events_finish (MMIfaceModemMessaging *self,
                                                   GAsyncResult *res,
@@ -5847,7 +5860,7 @@ modem_messaging_enable_unsolicited_events_finish (MMIfaceModemMessaging *self,
 {
     GError *inner_error = NULL;
 
-    mm_base_modem_at_sequence_finish (MM_BASE_MODEM (self), res, NULL, &inner_error);
+    mm_base_modem_at_sequence_full_finish (MM_BASE_MODEM (self), res, NULL, &inner_error);
     if (inner_error) {
         g_propagate_error (error, inner_error);
         return FALSE;
@@ -5895,17 +5908,65 @@ static const MMBaseModemAtCommand cnmi_sequence[] = {
 };
 
 static void
+modem_messaging_enable_unsolicited_events_secondary_ready (MMBaseModem *self,
+                                                           GAsyncResult *res,
+                                                           MessagingEnableContext *ctx)
+{
+    GError *inner_error = NULL;
+
+    /* Since the secondary is not required, we don't propagate the error anywhere */
+    mm_base_modem_at_sequence_full_finish (MM_BASE_MODEM (self), res, NULL, &inner_error);
+    if (inner_error) {
+        mm_warn("(%s) Unable to enable messaging unsolicited events on modem secondary",
+                mm_port_get_device (MM_PORT (ctx->secondary)));
+        g_error_free(inner_error);
+    }
+
+    /* Enable unsolicited events for primary port */
+    mm_dbg ("(%s) Enabling messaging unsolicited events on modem primary",
+            mm_port_get_device (MM_PORT (ctx->primary)));
+    mm_base_modem_at_sequence_full (
+        self,
+        ctx->primary,
+        cnmi_sequence,
+        NULL, /* response_processor_context */
+        NULL, /* response_processor_context_free */
+        NULL,
+        ctx->callback,
+        ctx->user_data);
+
+    messaging_enable_context_free(ctx);
+}
+
+static void
 modem_messaging_enable_unsolicited_events (MMIfaceModemMessaging *self,
                                            GAsyncReadyCallback callback,
                                            gpointer user_data)
 {
-    mm_base_modem_at_sequence (
+    MessagingEnableContext *ctx = NULL;
+
+    ctx = g_new0(MessagingEnableContext, 1);
+    ctx->primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
+    ctx->secondary = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
+    ctx->callback = callback;
+    ctx->user_data = user_data;
+
+    /* Enable unsolicited events for secondary port if it exists, otherwise
+     * go straight to enabling the primary port */
+    mm_dbg ("(%s) Enabling messaging unsolicited events on %s",
+            mm_port_get_device (MM_PORT (ctx->secondary ? ctx->secondary : ctx->primary)),
+                                ctx->secondary ? "secondary" : "primary");
+    mm_base_modem_at_sequence_full (
         MM_BASE_MODEM (self),
+        ctx->secondary ? ctx->secondary : ctx->primary,
         cnmi_sequence,
         NULL, /* response_processor_context */
         NULL, /* response_processor_context_free */
-        callback,
-        user_data);
+        NULL,
+        ctx->secondary ?
+            (GAsyncReadyCallback)modem_messaging_enable_unsolicited_events_secondary_ready :
+            callback,
+        ctx->secondary ? ctx : user_data);
 }
 
 /*****************************************************************************/
-- 
2.5.0