diff options
| -rw-r--r-- | plugins/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/gobi/mm-broadband-modem-gobi.c | 124 | ||||
| -rw-r--r-- | plugins/gobi/mm-broadband-modem-gobi.h | 49 | ||||
| -rw-r--r-- | plugins/gobi/mm-plugin-gobi.c | 95 | ||||
| -rw-r--r-- | plugins/gobi/mm-plugin-gobi.h | 41 |
5 files changed, 0 insertions, 319 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 89b1ac3f..1e30b1a3 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -126,7 +126,6 @@ pkglib_LTLIBRARIES = \ libmm-plugin-nokia-icera.la \ libmm-plugin-cinterion.la \ libmm-plugin-iridium.la \ - libmm-plugin-gobi.la \ libmm-plugin-motorola.la \ libmm-plugin-novatel.la \ libmm-plugin-novatel-lte.la \ @@ -174,15 +173,6 @@ libmm_plugin_motorola_la_SOURCES = \ libmm_plugin_motorola_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) libmm_plugin_motorola_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -# Gobi -libmm_plugin_gobi_la_SOURCES = \ - gobi/mm-plugin-gobi.c \ - gobi/mm-plugin-gobi.h \ - gobi/mm-broadband-modem-gobi.c \ - gobi/mm-broadband-modem-gobi.h -libmm_plugin_gobi_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) -libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) - # Huawei libmm_plugin_huawei_la_SOURCES = \ huawei/mm-plugin-huawei.c \ diff --git a/plugins/gobi/mm-broadband-modem-gobi.c b/plugins/gobi/mm-broadband-modem-gobi.c deleted file mode 100644 index 27aded25..00000000 --- a/plugins/gobi/mm-broadband-modem-gobi.c +++ /dev/null @@ -1,124 +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) 2008 - 2009 Novell, Inc. - * Copyright (C) 2009 - 2011 Red Hat, Inc. - * Copyright (C) 2011 - 2012 Google Inc. - */ - -#include <config.h> - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <ctype.h> - -#include "ModemManager.h" -#include "mm-modem-helpers.h" -#include "mm-serial-parsers.h" -#include "mm-log.h" -#include "mm-errors-types.h" -#include "mm-iface-modem.h" -#include "mm-iface-modem-3gpp.h" -#include "mm-base-modem-at.h" -#include "mm-broadband-modem-gobi.h" - -static void iface_modem_init (MMIfaceModem *iface); - -G_DEFINE_TYPE_EXTENDED (MMBroadbandModemGobi, mm_broadband_modem_gobi, MM_TYPE_BROADBAND_MODEM, 0, - G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)); - -/*****************************************************************************/ -/* Load access technologies (Modem interface) */ - -static gboolean -load_access_technologies_finish (MMIfaceModem *self, - GAsyncResult *res, - MMModemAccessTechnology *access_technologies, - guint *mask, - GError **error) -{ - const gchar *p; - const gchar *response; - - response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error); - if (!response) - return FALSE; - - p = mm_strip_tag (response, "*CNTI:"); - p = strchr (p, ','); - if (p) { - /* We are reporting ALL 3GPP access technologies here */ - *access_technologies = mm_string_to_access_tech (p + 1); - *mask = MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK; - return TRUE; - } - - g_set_error (error, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Couldn't parse access technologies result: '%s'", - response); - return FALSE; -} - -static void -load_access_technologies (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - mm_base_modem_at_command (MM_BASE_MODEM (self), - "*CNTI=0", - 3, - FALSE, - callback, - user_data); -} - -/*****************************************************************************/ - -MMBroadbandModemGobi * -mm_broadband_modem_gobi_new (const gchar *device, - const gchar **drivers, - const gchar *plugin, - guint16 vendor_id, - guint16 product_id) -{ - return g_object_new (MM_TYPE_BROADBAND_MODEM_GOBI, - MM_BASE_MODEM_DEVICE, device, - MM_BASE_MODEM_DRIVERS, drivers, - MM_BASE_MODEM_PLUGIN, plugin, - MM_BASE_MODEM_VENDOR_ID, vendor_id, - MM_BASE_MODEM_PRODUCT_ID, product_id, - NULL); -} - -static void -mm_broadband_modem_gobi_init (MMBroadbandModemGobi *self) -{ -} - -static void -iface_modem_init (MMIfaceModem *iface) -{ - iface->load_access_technologies = load_access_technologies; - iface->load_access_technologies_finish = load_access_technologies_finish; - - iface->modem_power_down = NULL; - iface->modem_power_down_finish = NULL; -} - -static void -mm_broadband_modem_gobi_class_init (MMBroadbandModemGobiClass *klass) -{ -} diff --git a/plugins/gobi/mm-broadband-modem-gobi.h b/plugins/gobi/mm-broadband-modem-gobi.h deleted file mode 100644 index 4164cfe6..00000000 --- a/plugins/gobi/mm-broadband-modem-gobi.h +++ /dev/null @@ -1,49 +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) 2008 - 2009 Novell, Inc. - * Copyright (C) 2009 - 2011 Red Hat, Inc. - * Copyright (C) 2011 Google Inc. - */ - -#ifndef MM_BROADBAND_MODEM_GOBI_H -#define MM_BROADBAND_MODEM_GOBI_H - -#include "mm-broadband-modem.h" - -#define MM_TYPE_BROADBAND_MODEM_GOBI (mm_broadband_modem_gobi_get_type ()) -#define MM_BROADBAND_MODEM_GOBI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobi)) -#define MM_BROADBAND_MODEM_GOBI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobiClass)) -#define MM_IS_BROADBAND_MODEM_GOBI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_GOBI)) -#define MM_IS_BROADBAND_MODEM_GOBI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_GOBI)) -#define MM_BROADBAND_MODEM_GOBI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobiClass)) - -typedef struct _MMBroadbandModemGobi MMBroadbandModemGobi; -typedef struct _MMBroadbandModemGobiClass MMBroadbandModemGobiClass; - -struct _MMBroadbandModemGobi { - MMBroadbandModem parent; -}; - -struct _MMBroadbandModemGobiClass{ - MMBroadbandModemClass parent; -}; - -GType mm_broadband_modem_gobi_get_type (void); - -MMBroadbandModemGobi *mm_broadband_modem_gobi_new (const gchar *device, - const gchar **drivers, - const gchar *plugin, - guint16 vendor_id, - guint16 product_id); - -#endif /* MM_BROADBAND_MODEM_GOBI_H */ diff --git a/plugins/gobi/mm-plugin-gobi.c b/plugins/gobi/mm-plugin-gobi.c deleted file mode 100644 index 823b95db..00000000 --- a/plugins/gobi/mm-plugin-gobi.c +++ /dev/null @@ -1,95 +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) 2008 - 2009 Novell, Inc. - * Copyright (C) 2011 Red Hat, Inc. - */ - -#include <string.h> -#include <gmodule.h> - -#define _LIBMM_INSIDE_MM -#include <libmm-glib.h> - -#include "mm-plugin-gobi.h" -#include "mm-broadband-modem-gobi.h" -#include "mm-log.h" - -#if defined WITH_QMI -#include "mm-broadband-modem-qmi.h" -#endif - -G_DEFINE_TYPE (MMPluginGobi, mm_plugin_gobi, MM_TYPE_PLUGIN) - -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; - -/*****************************************************************************/ - -static MMBaseModem * -create_modem (MMPlugin *self, - const gchar *sysfs_path, - const gchar **drivers, - guint16 vendor, - guint16 product, - GList *probes, - GError **error) -{ -#if defined WITH_QMI - if (mm_port_probe_list_has_qmi_port (probes)) { - mm_dbg ("QMI-powered Gobi modem found..."); - return MM_BASE_MODEM (mm_broadband_modem_qmi_new (sysfs_path, - drivers, - mm_plugin_get_name (self), - vendor, - product)); - } -#endif - - return MM_BASE_MODEM (mm_broadband_modem_gobi_new (sysfs_path, - drivers, - mm_plugin_get_name (self), - vendor, - product)); -} - -/*****************************************************************************/ - -G_MODULE_EXPORT MMPlugin * -mm_plugin_create (void) -{ - static const gchar *subsystems[] = { "tty", "net", "usb", NULL }; - static const gchar *drivers[] = { "qcserial", NULL }; - - return MM_PLUGIN ( - g_object_new (MM_TYPE_PLUGIN_GOBI, - MM_PLUGIN_NAME, "Gobi", - MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_ALLOWED_DRIVERS, drivers, - MM_PLUGIN_ALLOWED_AT, TRUE, - MM_PLUGIN_ALLOWED_QCDM, TRUE, - MM_PLUGIN_ALLOWED_QMI, TRUE, - NULL)); -} - -static void -mm_plugin_gobi_init (MMPluginGobi *self) -{ -} - -static void -mm_plugin_gobi_class_init (MMPluginGobiClass *klass) -{ - MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); - - plugin_class->create_modem = create_modem; -} diff --git a/plugins/gobi/mm-plugin-gobi.h b/plugins/gobi/mm-plugin-gobi.h deleted file mode 100644 index c47b172c..00000000 --- a/plugins/gobi/mm-plugin-gobi.h +++ /dev/null @@ -1,41 +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) 2008 - 2009 Novell, Inc. - * Copyright (C) 2009 Red Hat, Inc. - */ - -#ifndef MM_PLUGIN_GOBI_H -#define MM_PLUGIN_GOBI_H - -#include "mm-plugin.h" - -#define MM_TYPE_PLUGIN_GOBI (mm_plugin_gobi_get_type ()) -#define MM_PLUGIN_GOBI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_GOBI, MMPluginGobi)) -#define MM_PLUGIN_GOBI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_GOBI, MMPluginGobiClass)) -#define MM_IS_PLUGIN_GOBI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_GOBI)) -#define MM_IS_PLUGIN_GOBI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_GOBI)) -#define MM_PLUGIN_GOBI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_GOBI, MMPluginGobiClass)) - -typedef struct { - MMPlugin parent; -} MMPluginGobi; - -typedef struct { - MMPluginClass parent; -} MMPluginGobiClass; - -GType mm_plugin_gobi_get_type (void); - -G_MODULE_EXPORT MMPlugin *mm_plugin_create (void); - -#endif /* MM_PLUGIN_GOBI_H */ |