bearer-qmi: new `MMBearerQmi' object

This bearer type does not inherit from `MMBroadbandBearer', and therefore it
doesn't need to be async-initable.

src/Makefile.am

@@ -162,6 +162,8 @@ ModemManager_SOURCES = \
 	mm-bearer.c \
 	mm-broadband-bearer.h \
 	mm-broadband-bearer.c \
+	mm-bearer-qmi.h \
+	mm-bearer-qmi.c \
 	mm-bearer-list.h \
 	mm-bearer-list.c \
 	mm-base-modem-at.h \

src/mm-bearer-qmi.c

@@ -0,0 +1,73 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2012 Google, Inc.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <ModemManager.h>
+#include <libmm-common.h>
+
+#include "mm-bearer-qmi.h"
+#include "mm-utils.h"
+#include "mm-log.h"
+
+G_DEFINE_TYPE (MMBearerQmi, mm_bearer_qmi, MM_TYPE_BEARER);
+
+struct _MMBearerQmiPrivate {
+    gpointer dummy;
+};
+
+/*****************************************************************************/
+
+MMBearer *
+mm_bearer_qmi_new (MMBroadbandModemQmi *modem,
+                   MMBearerProperties *config)
+{
+    MMBearer *bearer;
+
+    /* The Qmi bearer inherits from MMBearer (so it's not a MMBroadbandBearer)
+     * and that means that the object is not async-initable, so we just use
+     * g_object_new() here */
+    bearer = g_object_new (MM_TYPE_BEARER_QMI,
+                           MM_BEARER_MODEM, modem,
+                           MM_BEARER_CONFIG, config,
+                           NULL);
+
+    /* Only export valid bearers */
+    mm_bearer_export (bearer);
+
+    return bearer;
+}
+
+static void
+mm_bearer_qmi_init (MMBearerQmi *self)
+{
+    /* Initialize private data */
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
+                                              MM_TYPE_BEARER_QMI,
+                                              MMBearerQmiPrivate);
+}
+
+static void
+mm_bearer_qmi_class_init (MMBearerQmiClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (object_class, sizeof (MMBearerQmiPrivate));
+}

src/mm-bearer-qmi.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Author: Aleksander Morgado <aleksander@lanedo.com>
+ *
+ * Copyright (C) 2012 Google, Inc.
+ */
+
+#ifndef MM_BEARER_QMI_H
+#define MM_BEARER_QMI_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <libmm-common.h>
+
+#include "mm-bearer.h"
+#include "mm-broadband-modem-qmi.h"
+
+#define MM_TYPE_BEARER_QMI            (mm_bearer_qmi_get_type ())
+#define MM_BEARER_QMI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BEARER_QMI, MMBearerQmi))
+#define MM_BEARER_QMI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BEARER_QMI, MMBearerQmiClass))
+#define MM_IS_BEARER_QMI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BEARER_QMI))
+#define MM_IS_BEARER_QMI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BEARER_QMI))
+#define MM_BEARER_QMI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BEARER_QMI, MMBearerQmiClass))
+
+typedef struct _MMBearerQmi MMBearerQmi;
+typedef struct _MMBearerQmiClass MMBearerQmiClass;
+typedef struct _MMBearerQmiPrivate MMBearerQmiPrivate;
+
+struct _MMBearerQmi {
+    MMBearer parent;
+    MMBearerQmiPrivate *priv;
+};
+
+struct _MMBearerQmiClass {
+    MMBearerClass parent;
+};
+
+GType mm_bearer_qmi_get_type (void);
+
+/* QMI bearer creation implementation.
+ * NOTE it is *not* a broadband bearer, so not async-initable */
+MMBearer *mm_bearer_qmi_new (MMBroadbandModemQmi *modem,
+			     MMBearerProperties *config);
+
+#endif /* MM_BEARER_QMI_H */