novatel-lte: renamed the plugin to "Novatel LTE"

This plugin only handles the E362 right now.

9 files changed, 185 insertions, 185 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2903332f..be88b29d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -45,7 +45,7 @@ pkglib_LTLIBRARIES = \
 	libmm-plugin-iridium.la \
 	libmm-plugin-gobi.la \
 	libmm-plugin-motorola.la \
-	libmm-plugin-novatel.la \
+	libmm-plugin-novatel-lte.la \
 	libmm-plugin-samsung.la \
 	libmm-plugin-option.la \
 	libmm-plugin-hso.la \
@@ -297,16 +297,16 @@ libmm_plugin_iridium_la_SOURCES = \
 libmm_plugin_iridium_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_iridium_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-# Novatel modem
-libmm_plugin_novatel_la_SOURCES = \
-	novatel/mm-plugin-novatel.c \
-	novatel/mm-plugin-novatel.h \
-	novatel/mm-broadband-modem-novatel.c \
-	novatel/mm-broadband-modem-novatel.h \
-	novatel/mm-broadband-bearer-novatel.c \
-	novatel/mm-broadband-bearer-novatel.h
-libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+# Novatel LTE modem
+libmm_plugin_novatel_lte_la_SOURCES = \
+	novatel/mm-plugin-novatel-lte.c \
+	novatel/mm-plugin-novatel-lte.h \
+	novatel/mm-broadband-modem-novatel-lte.c \
+	novatel/mm-broadband-modem-novatel-lte.h \
+	novatel/mm-broadband-bearer-novatel-lte.c \
+	novatel/mm-broadband-bearer-novatel-lte.h
+libmm_plugin_novatel_lte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_novatel_lte_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 #	77-mm-ericsson-mbm.rules \
 #	77-mm-zte-port-types.rules \
diff --git a/plugins/novatel/mm-broadband-bearer-novatel.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index a3482aec..c81ad699 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel.c
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
@@ -27,24 +27,24 @@
 #include <libmm-common.h>
 
 #include "mm-base-modem-at.h"
-#include "mm-broadband-bearer-novatel.h"
+#include "mm-broadband-bearer-novatel-lte.h"
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
 #include "mm-utils.h"
 
 #define CONNECTION_CHECK_TIMEOUT_SEC 5
 
-G_DEFINE_TYPE (MMBroadbandBearerNovatel, mm_broadband_bearer_novatel, MM_TYPE_BROADBAND_BEARER);
+G_DEFINE_TYPE (MMBroadbandBearerNovatelLte, mm_broadband_bearer_novatel_lte, MM_TYPE_BROADBAND_BEARER);
 
 /*****************************************************************************/
 
-struct _MMBroadbandBearerNovatelPrivate {
+struct _MMBroadbandBearerNovatelLtePrivate {
     /* timeout id for checking whether we're still connected */
     guint connection_poller;
 };
 
 typedef struct {
-    MMBroadbandBearerNovatel *self;
+    MMBroadbandBearerNovatelLte *self;
     MMBaseModem *modem;
     MMAtSerialPort *primary;
     MMPort *data;
@@ -119,7 +119,7 @@ static gboolean connect_3gpp_qmistatus (DetailedConnectContext *ctx);
 static void
 poll_connection_ready (MMBaseModem *modem,
                        GAsyncResult *res,
-                       MMBroadbandBearerNovatel *bearer)
+                       MMBroadbandBearerNovatelLte *bearer)
 {
     const gchar *result;
     GError *error = NULL;
@@ -140,7 +140,7 @@ poll_connection_ready (MMBaseModem *modem,
 }
 
 static gboolean
-poll_connection (MMBroadbandBearerNovatel *bearer)
+poll_connection (MMBroadbandBearerNovatelLte *bearer)
 {
     MMBaseModem *modem = NULL;
 
@@ -412,7 +412,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
                  gpointer user_data)
 {
     DetailedDisconnectContext *ctx;
-    MMBroadbandBearerNovatel *bearer = MM_BROADBAND_BEARER_NOVATEL (self);
+    MMBroadbandBearerNovatelLte *bearer = MM_BROADBAND_BEARER_NOVATEL_LTE (self);
 
     if (bearer->priv->connection_poller) {
         g_source_remove (bearer->priv->connection_poller);
@@ -434,31 +434,31 @@ disconnect_3gpp (MMBroadbandBearer *self,
 static void
 finalize (GObject *object)
 {
-    MMBroadbandBearerNovatel *self = MM_BROADBAND_BEARER_NOVATEL (object);
+    MMBroadbandBearerNovatelLte *self = MM_BROADBAND_BEARER_NOVATEL_LTE (object);
 
     if (self->priv->connection_poller)
         g_source_remove (self->priv->connection_poller);
 
-    G_OBJECT_CLASS (mm_broadband_bearer_novatel_parent_class)->finalize (object);
+    G_OBJECT_CLASS (mm_broadband_bearer_novatel_lte_parent_class)->finalize (object);
 }
 
 static void
-mm_broadband_bearer_novatel_init (MMBroadbandBearerNovatel *self)
+mm_broadband_bearer_novatel_lte_init (MMBroadbandBearerNovatelLte *self)
 {
     self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
-                                              MM_TYPE_BROADBAND_BEARER_NOVATEL,
-                                              MMBroadbandBearerNovatelPrivate);
+                                              MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE,
+                                              MMBroadbandBearerNovatelLtePrivate);
 
     self->priv->connection_poller = 0;
 }
 
 static void
-mm_broadband_bearer_novatel_class_init (MMBroadbandBearerNovatelClass *klass)
+mm_broadband_bearer_novatel_lte_class_init (MMBroadbandBearerNovatelLteClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     MMBroadbandBearerClass *broadband_bearer_class = MM_BROADBAND_BEARER_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (MMBroadbandBearerNovatelPrivate));
+    g_type_class_add_private (object_class, sizeof (MMBroadbandBearerNovatelLtePrivate));
 
     object_class->finalize = finalize;
 
@@ -469,8 +469,8 @@ mm_broadband_bearer_novatel_class_init (MMBroadbandBearerNovatelClass *klass)
 }
 
 MMBearer *
-mm_broadband_bearer_novatel_new_finish (GAsyncResult *res,
-                                        GError **error)
+mm_broadband_bearer_novatel_lte_new_finish (GAsyncResult *res,
+                                            GError **error)
 {
     GObject *bearer;
     GObject *source;
@@ -489,14 +489,14 @@ mm_broadband_bearer_novatel_new_finish (GAsyncResult *res,
 }
 
 void
-mm_broadband_bearer_novatel_new (MMBroadbandModemNovatel *modem,
-                                 MMBearerProperties *config,
-                                 GCancellable *cancellable,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data)
+mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
+                                     MMBearerProperties *config,
+                                     GCancellable *cancellable,
+                                     GAsyncReadyCallback callback,
+                                     gpointer user_data)
 {
     g_async_initable_new_async (
-        MM_TYPE_BROADBAND_BEARER_NOVATEL,
+        MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE,
         G_PRIORITY_DEFAULT,
         cancellable,
         callback,
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.h b/plugins/novatel/mm-broadband-bearer-novatel-lte.h
new file mode 100644
index 00000000..362c1306
--- /dev/null
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.h
@@ -0,0 +1,64 @@
+/* -*- 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: Nathan Williams <njw@google.com>
+ *
+ * Copyright (C) 2012 Google, Inc.
+ */
+
+#ifndef MM_BROADBAND_BEARER_NOVATEL_LTE_H
+#define MM_BROADBAND_BEARER_NOVATEL_LTE_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <libmm-common.h>
+
+#include "mm-broadband-bearer.h"
+#include "mm-broadband-modem-novatel-lte.h"
+
+#define MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE            (mm_broadband_bearer_novatel_lte_get_type ())
+#define MM_BROADBAND_BEARER_NOVATEL_LTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE, MMBroadbandBearerNovatelLte))
+#define MM_BROADBAND_BEARER_NOVATEL_LTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE, MMBroadbandBearerNovatelLteClass))
+#define MM_IS_BROADBAND_BEARER_NOVATEL_LTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE))
+#define MM_IS_BROADBAND_BEARER_NOVATEL_LTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE))
+#define MM_BROADBAND_BEARER_NOVATEL_LTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_BEARER_NOVATEL_LTE, MMBroadbandBearerNovatelLteClass))
+
+#define MM_BROADBAND_BEARER_NOVATEL_LTE_USER         "broadband-bearer-novatel-user"
+#define MM_BROADBAND_BEARER_NOVATEL_LTE_PASSWORD     "broadband-bearer-novatel-password"
+
+typedef struct _MMBroadbandBearerNovatelLte MMBroadbandBearerNovatelLte;
+typedef struct _MMBroadbandBearerNovatelLteClass MMBroadbandBearerNovatelLteClass;
+typedef struct _MMBroadbandBearerNovatelLtePrivate MMBroadbandBearerNovatelLtePrivate;
+
+struct _MMBroadbandBearerNovatelLte {
+    MMBroadbandBearer parent;
+    MMBroadbandBearerNovatelLtePrivate *priv;
+};
+
+struct _MMBroadbandBearerNovatelLteClass {
+    MMBroadbandBearerClass parent;
+};
+
+GType mm_broadband_bearer_novatel_lte_get_type (void);
+
+/* Default 3GPP bearer creation implementation */
+void mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
+                                          MMBearerProperties *properties,
+                                          GCancellable *cancellable,
+                                          GAsyncReadyCallback callback,
+                                          gpointer user_data);
+MMBearer *mm_broadband_bearer_novatel_lte_new_finish (GAsyncResult *res,
+                                                      GError **error);
+
+
+#endif /* MM_BROADBAND_BEARER_NOVATEL_LTE_H */
diff --git a/plugins/novatel/mm-broadband-bearer-novatel.h b/plugins/novatel/mm-broadband-bearer-novatel.h
deleted file mode 100644
index 9373e67b..00000000
--- a/plugins/novatel/mm-broadband-bearer-novatel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- 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: Nathan Williams <njw@google.com>
- *
- * Copyright (C) 2012 Google, Inc.
- */
-
-#ifndef MM_BROADBAND_BEARER_NOVATEL_H
-#define MM_BROADBAND_BEARER_NOVATEL_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <libmm-common.h>
-
-#include "mm-broadband-bearer.h"
-#include "mm-broadband-modem-novatel.h"
-
-#define MM_TYPE_BROADBAND_BEARER_NOVATEL            (mm_broadband_bearer_novatel_get_type ())
-#define MM_BROADBAND_BEARER_NOVATEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_NOVATEL, MMBroadbandBearerNovatel))
-#define MM_BROADBAND_BEARER_NOVATEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_BEARER_NOVATEL, MMBroadbandBearerNovatelClass))
-#define MM_IS_BROADBAND_BEARER_NOVATEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_NOVATEL))
-#define MM_IS_BROADBAND_BEARER_NOVATEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_BEARER_NOVATEL))
-#define MM_BROADBAND_BEARER_NOVATEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_BEARER_NOVATEL, MMBroadbandBearerNovatelClass))
-
-#define MM_BROADBAND_BEARER_NOVATEL_USER         "broadband-bearer-novatel-user"
-#define MM_BROADBAND_BEARER_NOVATEL_PASSWORD     "broadband-bearer-novatel-password"
-
-typedef struct _MMBroadbandBearerNovatel MMBroadbandBearerNovatel;
-typedef struct _MMBroadbandBearerNovatelClass MMBroadbandBearerNovatelClass;
-typedef struct _MMBroadbandBearerNovatelPrivate MMBroadbandBearerNovatelPrivate;
-
-struct _MMBroadbandBearerNovatel {
-    MMBroadbandBearer parent;
-    MMBroadbandBearerNovatelPrivate *priv;
-};
-
-struct _MMBroadbandBearerNovatelClass {
-    MMBroadbandBearerClass parent;
-};
-
-GType mm_broadband_bearer_novatel_get_type (void);
-
-/* Default 3GPP bearer creation implementation */
-void mm_broadband_bearer_novatel_new (MMBroadbandModemNovatel *modem,
-                                      MMBearerProperties *properties,
-                                      GCancellable *cancellable,
-                                      GAsyncReadyCallback callback,
-                                      gpointer user_data);
-MMBearer *mm_broadband_bearer_novatel_new_finish (GAsyncResult *res,
-                                                  GError **error);
-
-
-#endif /* MM_BROADBAND_BEARER_NOVATEL_H */
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel-lte.c
index 35f0b8b6..14d72c5a 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/plugins/novatel/mm-broadband-modem-novatel-lte.c
@@ -24,8 +24,8 @@
 
 #include "ModemManager.h"
 #include "mm-base-modem-at.h"
-#include "mm-broadband-bearer-novatel.h"
-#include "mm-broadband-modem-novatel.h"
+#include "mm-broadband-bearer-novatel-lte.h"
+#include "mm-broadband-modem-novatel-lte.h"
 #include "mm-errors-types.h"
 #include "mm-iface-modem.h"
 #include "mm-log.h"
@@ -59,7 +59,7 @@ broadband_bearer_new_ready (GObject *source,
     MMBearer *bearer = NULL;
     GError *error = NULL;
 
-    bearer = mm_broadband_bearer_novatel_new_finish (res, &error);
+    bearer = mm_broadband_bearer_novatel_lte_new_finish (res, &error);
     if (!bearer)
         g_simple_async_result_take_error (simple, error);
     else
@@ -85,7 +85,7 @@ modem_create_bearer (MMIfaceModem *self,
                                         modem_create_bearer);
 
     /* We just create a MMBroadbandBearer */
-    mm_broadband_bearer_novatel_new (MM_BROADBAND_MODEM_NOVATEL (self),
+    mm_broadband_bearer_novatel_lte_new (MM_BROADBAND_MODEM_NOVATEL_LTE (self),
                                      properties,
                                      NULL, /* cancellable */
                                      (GAsyncReadyCallback)broadband_bearer_new_ready,
@@ -94,17 +94,17 @@ modem_create_bearer (MMIfaceModem *self,
 
 static void iface_modem_init (MMIfaceModem *iface);
 
-G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNovatel, mm_broadband_modem_novatel, MM_TYPE_BROADBAND_MODEM, 0,
+G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNovatelLte, mm_broadband_modem_novatel_lte, MM_TYPE_BROADBAND_MODEM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init));
 
-MMBroadbandModemNovatel *
-mm_broadband_modem_novatel_new (const gchar *device,
-                                const gchar *driver,
-                                const gchar *plugin,
-                                guint16 vendor_id,
-                                guint16 product_id)
+MMBroadbandModemNovatelLte *
+mm_broadband_modem_novatel_lte_new (const gchar *device,
+                                    const gchar *driver,
+                                    const gchar *plugin,
+                                    guint16 vendor_id,
+                                    guint16 product_id)
 {
-    return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL,
+    return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE,
                          MM_BASE_MODEM_DEVICE, device,
                          MM_BASE_MODEM_DRIVER, driver,
                          MM_BASE_MODEM_PLUGIN, plugin,
@@ -114,7 +114,7 @@ mm_broadband_modem_novatel_new (const gchar *device,
 }
 
 static void
-mm_broadband_modem_novatel_init (MMBroadbandModemNovatel *self)
+mm_broadband_modem_novatel_lte_init (MMBroadbandModemNovatelLte *self)
 {
 }
 
@@ -364,6 +364,6 @@ iface_modem_init (MMIfaceModem *iface)
 }
 
 static void
-mm_broadband_modem_novatel_class_init (MMBroadbandModemNovatelClass *klass)
+mm_broadband_modem_novatel_lte_class_init (MMBroadbandModemNovatelLteClass *klass)
 {
 }
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.h b/plugins/novatel/mm-broadband-modem-novatel-lte.h
new file mode 100644
index 00000000..8e31fc5d
--- /dev/null
+++ b/plugins/novatel/mm-broadband-modem-novatel-lte.h
@@ -0,0 +1,50 @@
+/* -*- 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.
+ * Author: Nathan Williams <njw@google.com>
+ */
+
+#ifndef MM_BROADBAND_MODEM_NOVATEL_LTE_H
+#define MM_BROADBAND_MODEM_NOVATEL_LTE_H
+
+#include "mm-broadband-modem.h"
+
+#define MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE            (mm_broadband_modem_novatel_lte_get_type ())
+#define MM_BROADBAND_MODEM_NOVATEL_LTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE, MMBroadbandModemNovatelLte))
+#define MM_BROADBAND_MODEM_NOVATEL_LTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE_AIRLINK, MMBroadbandModemNovatelLteClass))
+#define MM_IS_BROADBAND_MODEM_NOVATEL_LTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE_AIRLINK))
+#define MM_IS_BROADBAND_MODEM_NOVATEL_LTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE_AIRLINK))
+#define MM_BROADBAND_MODEM_NOVATEL_LTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE_AIRLINK, MMBroadbandModemNovatelLteClass))
+
+typedef struct _MMBroadbandModemNovatelLte MMBroadbandModemNovatelLte;
+typedef struct _MMBroadbandModemNovatelLteClass MMBroadbandModemNovatelLteClass;
+typedef struct _MMBroadbandModemNovatelLtePrivate MMBroadbandModemNovatelLtePrivate;
+
+struct _MMBroadbandModemNovatelLte {
+    MMBroadbandModem parent;
+    MMBroadbandModemNovatelLtePrivate *priv;
+};
+
+struct _MMBroadbandModemNovatelLteClass{
+    MMBroadbandModemClass parent;
+};
+
+GType mm_broadband_modem_novatel_lte_get_type (void);
+
+MMBroadbandModemNovatelLte *mm_broadband_modem_novatel_lte_new (const gchar *device,
+                                                                const gchar *driver,
+                                                                const gchar *plugin,
+                                                                guint16 vendor_id,
+                                                                guint16 product_id);
+
+#endif /* MM_BROADBAND_MODEM_NOVATEL_LTE_H */
diff --git a/plugins/novatel/mm-broadband-modem-novatel.h b/plugins/novatel/mm-broadband-modem-novatel.h
deleted file mode 100644
index 67d51236..00000000
--- a/plugins/novatel/mm-broadband-modem-novatel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- 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.
- * Author: Nathan Williams <njw@google.com>
- */
-
-#ifndef MM_BROADBAND_MODEM_NOVATEL_H
-#define MM_BROADBAND_MODEM_NOVATEL_H
-
-#include "mm-broadband-modem.h"
-
-#define MM_TYPE_BROADBAND_MODEM_NOVATEL            (mm_broadband_modem_novatel_get_type ())
-#define MM_BROADBAND_MODEM_NOVATEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_NOVATEL, MMBroadbandModemNovatel))
-#define MM_BROADBAND_MODEM_NOVATEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_MODEM_NOVATEL_AIRLINK, MMBroadbandModemNovatelClass))
-#define MM_IS_BROADBAND_MODEM_NOVATEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_NOVATEL_AIRLINK))
-#define MM_IS_BROADBAND_MODEM_NOVATEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_MODEM_NOVATEL_AIRLINK))
-#define MM_BROADBAND_MODEM_NOVATEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_MODEM_NOVATEL_AIRLINK, MMBroadbandModemNovatelClass))
-
-typedef struct _MMBroadbandModemNovatel MMBroadbandModemNovatel;
-typedef struct _MMBroadbandModemNovatelClass MMBroadbandModemNovatelClass;
-typedef struct _MMBroadbandModemNovatelPrivate MMBroadbandModemNovatelPrivate;
-
-struct _MMBroadbandModemNovatel {
-    MMBroadbandModem parent;
-    MMBroadbandModemNovatelPrivate *priv;
-};
-
-struct _MMBroadbandModemNovatelClass{
-    MMBroadbandModemClass parent;
-};
-
-GType mm_broadband_modem_novatel_get_type (void);
-
-MMBroadbandModemNovatel *mm_broadband_modem_novatel_new (const gchar *device,
-                                                         const gchar *driver,
-                                                         const gchar *plugin,
-                                                         guint16 vendor_id,
-                                                         guint16 product_id);
-
-#endif /* MM_BROADBAND_MODEM_NOVATEL_H */
diff --git a/plugins/novatel/mm-plugin-novatel.c b/plugins/novatel/mm-plugin-novatel-lte.c
index ca156618..296a2033 100644
--- a/plugins/novatel/mm-plugin-novatel.c
+++ b/plugins/novatel/mm-plugin-novatel-lte.c
@@ -23,12 +23,12 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "mm-plugin-novatel.h"
+#include "mm-plugin-novatel-lte.h"
 #include "mm-private-boxed-types.h"
-#include "mm-broadband-modem-novatel.h"
+#include "mm-broadband-modem-novatel-lte.h"
 #include "mm-log.h"
 
-G_DEFINE_TYPE (MMPluginNovatel, mm_plugin_novatel, MM_TYPE_PLUGIN)
+G_DEFINE_TYPE (MMPluginNovatelLte, mm_plugin_novatel_lte, MM_TYPE_PLUGIN)
 
 int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
 int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
@@ -42,11 +42,11 @@ create_modem (MMPlugin *self,
               GList *probes,
               GError **error)
 {
-    return MM_BASE_MODEM (mm_broadband_modem_novatel_new (sysfs_path,
-                                                          driver,
-                                                          mm_plugin_get_name (self),
-                                                          vendor,
-                                                          product));
+    return MM_BASE_MODEM (mm_broadband_modem_novatel_lte_new (sysfs_path,
+                                                              driver,
+                                                              mm_plugin_get_name (self),
+                                                              vendor,
+                                                              product));
 }
 
 /*****************************************************************************/
@@ -59,8 +59,8 @@ mm_plugin_create (void)
                                                {0, 0} };
 
     return MM_PLUGIN (
-        g_object_new (MM_TYPE_PLUGIN_NOVATEL,
-                      MM_PLUGIN_NAME,                "Novatel",
+        g_object_new (MM_TYPE_PLUGIN_NOVATEL_LTE,
+                      MM_PLUGIN_NAME,                "Novatel LTE",
                       MM_PLUGIN_ALLOWED_SUBSYSTEMS,  subsystems,
                       MM_PLUGIN_ALLOWED_PRODUCT_IDS, products,
                       MM_PLUGIN_ALLOWED_SINGLE_AT,   TRUE,
@@ -68,12 +68,12 @@ mm_plugin_create (void)
 }
 
 static void
-mm_plugin_novatel_init (MMPluginNovatel *self)
+mm_plugin_novatel_lte_init (MMPluginNovatelLte *self)
 {
 }
 
 static void
-mm_plugin_novatel_class_init (MMPluginNovatelClass *klass)
+mm_plugin_novatel_lte_class_init (MMPluginNovatelLteClass *klass)
 {
     MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
 
diff --git a/plugins/novatel/mm-plugin-novatel.h b/plugins/novatel/mm-plugin-novatel-lte.h
index 50e10270..8f6c8be1 100644
--- a/plugins/novatel/mm-plugin-novatel.h
+++ b/plugins/novatel/mm-plugin-novatel-lte.h
@@ -20,28 +20,28 @@
  * Author: Nathan Williams <njw@google.com>
  */
 
-#ifndef MM_PLUGIN_NOVATEL_H
-#define MM_PLUGIN_NOVATEL_H
+#ifndef MM_PLUGIN_NOVATEL_LTE_H
+#define MM_PLUGIN_NOVATEL_LTE_H
 
 #include "mm-plugin.h"
 
-#define MM_TYPE_PLUGIN_NOVATEL            (mm_plugin_novatel_get_type ())
-#define MM_PLUGIN_NOVATEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_NOVATEL, MMPluginNovatel))
-#define MM_PLUGIN_NOVATEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_NOVATEL, MMPluginNovatelClass))
-#define MM_IS_PLUGIN_NOVATEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_NOVATEL))
-#define MM_IS_PLUGIN_NOVATEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_NOVATEL))
-#define MM_PLUGIN_NOVATEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_NOVATEL, MMPluginNovatelClass))
+#define MM_TYPE_PLUGIN_NOVATEL_LTE            (mm_plugin_novatel_lte_get_type ())
+#define MM_PLUGIN_NOVATEL_LTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_NOVATEL_LTE, MMPluginNovatelLte))
+#define MM_PLUGIN_NOVATEL_LTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_NOVATEL_LTE, MMPluginNovatelLteClass))
+#define MM_IS_PLUGIN_NOVATEL_LTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_NOVATEL_LTE))
+#define MM_IS_PLUGIN_NOVATEL_LTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_NOVATEL_LTE))
+#define MM_PLUGIN_NOVATEL_LTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_NOVATEL_LTE, MMPluginNovatelLteClass))
 
 typedef struct {
     MMPlugin parent;
-} MMPluginNovatel;
+} MMPluginNovatelLte;
 
 typedef struct {
     MMPluginClass parent;
-} MMPluginNovatelClass;
+} MMPluginNovatelLteClass;
 
-GType mm_plugin_novatel_get_type (void);
+GType mm_plugin_novatel_lte_get_type (void);
 
 G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
 
-#endif /* MM_PLUGIN_NOVATEL_H */
+#endif /* MM_PLUGIN_NOVATEL_LTE_H */