Implement the more granular GSM interfaces as agreed on NM mailing list.

Convert all exisiting code over to new DBus interfaces.

1 files changed, 128 insertions, 0 deletions

diff --git a/src/mm-modem-cdma.c b/src/mm-modem-cdma.c
new file mode 100644
index 00000000..7b0321e5
--- /dev/null
+++ b/src/mm-modem-cdma.c
@@ -0,0 +1,128 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+#include <string.h>
+#include <dbus/dbus-glib.h>
+#include "mm-modem-cdma.h"
+#include "mm-modem-error.h"
+#include "mm-callback-info.h"
+
+static void impl_modem_cdma_get_signal_quality (MMModemCdma *modem, DBusGMethodInvocation *context);
+
+#include "mm-modem-cdma-glue.h"
+
+enum {
+    SIGNAL_QUALITY,
+
+    LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+static void
+uint_op_not_supported (MMModem *self,
+                       MMModemUIntFn callback,
+                       gpointer user_data)
+{
+    MMCallbackInfo *info;
+
+    info = mm_callback_info_uint_new (self, callback, user_data);
+    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                               "%s", "Operation not supported");
+    mm_callback_info_schedule (info);
+}
+
+static void
+uint_call_done (MMModem *modem, guint32 result, GError *error, gpointer user_data)
+{
+    DBusGMethodInvocation *context = (DBusGMethodInvocation *) user_data;
+
+    if (error)
+        dbus_g_method_return_error (context, error);
+    else
+        dbus_g_method_return (context, result);
+}
+
+void
+mm_modem_cdma_get_signal_quality (MMModemCdma *self,
+                                  MMModemUIntFn callback,
+                                  gpointer user_data)
+{
+    g_return_if_fail (MM_IS_MODEM_CDMA (self));
+    g_return_if_fail (callback != NULL);
+
+    if (MM_MODEM_CDMA_GET_INTERFACE (self)->get_signal_quality)
+        MM_MODEM_CDMA_GET_INTERFACE (self)->get_signal_quality (self, callback, user_data);
+    else
+        uint_op_not_supported (MM_MODEM (self), callback, user_data);
+}
+
+static void
+impl_modem_cdma_get_signal_quality (MMModemCdma *modem, DBusGMethodInvocation *context)
+{
+    mm_modem_cdma_get_signal_quality (modem, uint_call_done, context);
+}
+
+void
+mm_modem_cdma_signal_quality (MMModemCdma *self,
+                              guint32 quality)
+{
+    g_return_if_fail (MM_IS_MODEM_CDMA (self));
+
+    g_signal_emit (self, signals[SIGNAL_QUALITY], 0, quality);
+}
+
+
+/*****************************************************************************/
+
+static void
+mm_modem_cdma_init (gpointer g_iface)
+{
+    GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
+    static gboolean initialized = FALSE;
+
+    if (initialized)
+        return;
+
+    /* Signals */
+    signals[SIGNAL_QUALITY] =
+        g_signal_new ("signal-quality",
+                      iface_type,
+                      G_SIGNAL_RUN_FIRST,
+                      G_STRUCT_OFFSET (MMModemCdma, signal_quality),
+                      NULL, NULL,
+                      g_cclosure_marshal_VOID__UINT,
+                      G_TYPE_NONE, 1,
+                      G_TYPE_UINT);
+
+    initialized = TRUE;
+}
+
+GType
+mm_modem_cdma_get_type (void)
+{
+    static GType modem_type = 0;
+
+    if (!G_UNLIKELY (modem_type)) {
+        const GTypeInfo modem_info = {
+            sizeof (MMModemCdma), /* class_size */
+            mm_modem_cdma_init,   /* base_init */
+            NULL,       /* base_finalize */
+            NULL,
+            NULL,       /* class_finalize */
+            NULL,       /* class_data */
+            0,
+            0,              /* n_preallocs */
+            NULL
+        };
+
+        modem_type = g_type_register_static (G_TYPE_INTERFACE,
+                                             "MMModemCdma",
+                                             &modem_info, 0);
+
+        g_type_interface_add_prerequisite (modem_type, MM_TYPE_MODEM);
+
+        dbus_g_object_type_install_info (modem_type, &dbus_glib_mm_modem_cdma_object_info);
+    }
+
+    return modem_type;
+}