diff options
| -rw-r--r-- | plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra-icera.c | 59 | ||||
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra-icera.h | 49 | ||||
| -rw-r--r-- | plugins/sierra/mm-plugin-sierra.c | 12 |
4 files changed, 117 insertions, 7 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 42217853..c2ef9574 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -151,7 +151,9 @@ libmm_plugin_sierra_la_SOURCES = \ sierra/mm-common-sierra.c \ sierra/mm-common-sierra.h \ sierra/mm-broadband-modem-sierra.c \ - sierra/mm-broadband-modem-sierra.h + sierra/mm-broadband-modem-sierra.h \ + sierra/mm-broadband-modem-sierra-icera.c \ + sierra/mm-broadband-modem-sierra-icera.h libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.c b/plugins/sierra/mm-broadband-modem-sierra-icera.c new file mode 100644 index 00000000..82daa163 --- /dev/null +++ b/plugins/sierra/mm-broadband-modem-sierra-icera.c @@ -0,0 +1,59 @@ +/* -*- 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 - 2012 Red Hat, Inc. + * Copyright (C) 2012 Lanedo GmbH + */ + +#include <config.h> + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <ctype.h> + +#include "ModemManager.h" +#include "mm-broadband-modem-sierra-icera.h" +#include "mm-modem-helpers.h" +#include "mm-log.h" + +G_DEFINE_TYPE (MMBroadbandModemSierraIcera, mm_broadband_modem_sierra_icera, MM_TYPE_BROADBAND_MODEM_ICERA) + +/*****************************************************************************/ + +MMBroadbandModemSierraIcera * +mm_broadband_modem_sierra_icera_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id) +{ + return g_object_new (MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA, + MM_BASE_MODEM_DEVICE, device, + MM_BASE_MODEM_DRIVER, driver, + 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_sierra_icera_init (MMBroadbandModemSierraIcera *self) +{ +} + +static void +mm_broadband_modem_sierra_icera_class_init (MMBroadbandModemSierraIceraClass *klass) +{ +} diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.h b/plugins/sierra/mm-broadband-modem-sierra-icera.h new file mode 100644 index 00000000..5c9a1206 --- /dev/null +++ b/plugins/sierra/mm-broadband-modem-sierra-icera.h @@ -0,0 +1,49 @@ +/* -*- 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 - 2012 Red Hat, Inc. + * Copyright (C) 2012 Lanedo GmbH + */ + +#ifndef MM_BROADBAND_MODEM_SIERRA_ICERA_H +#define MM_BROADBAND_MODEM_SIERRA_ICERA_H + +#include "mm-broadband-modem-icera.h" + +#define MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA (mm_broadband_modem_sierra_icera_get_type ()) +#define MM_BROADBAND_MODEM_SIERRA_ICERA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA, MMBroadbandModemSierraIcera)) +#define MM_BROADBAND_MODEM_SIERRA_ICERA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA_AIRLINK, MMBroadbandModemSierraIceraClass)) +#define MM_IS_BROADBAND_MODEM_SIERRA_ICERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA_AIRLINK)) +#define MM_IS_BROADBAND_MODEM_SIERRA_ICERA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA_AIRLINK)) +#define MM_BROADBAND_MODEM_SIERRA_ICERA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA_AIRLINK, MMBroadbandModemSierraIceraClass)) + +typedef struct _MMBroadbandModemSierraIcera MMBroadbandModemSierraIcera; +typedef struct _MMBroadbandModemSierraIceraClass MMBroadbandModemSierraIceraClass; + +struct _MMBroadbandModemSierraIcera { + MMBroadbandModemIcera parent; +}; + +struct _MMBroadbandModemSierraIceraClass { + MMBroadbandModemIceraClass parent; +}; + +GType mm_broadband_modem_sierra_icera_get_type (void); + +MMBroadbandModemSierraIcera *mm_broadband_modem_sierra_icera_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id); + +#endif /* MM_BROADBAND_MODEM_SIERRA_ICERA_H */ diff --git a/plugins/sierra/mm-plugin-sierra.c b/plugins/sierra/mm-plugin-sierra.c index 26c56df0..09a089cd 100644 --- a/plugins/sierra/mm-plugin-sierra.c +++ b/plugins/sierra/mm-plugin-sierra.c @@ -23,7 +23,7 @@ #include "mm-log.h" #include "mm-plugin-sierra.h" #include "mm-broadband-modem-sierra.h" -#include "mm-broadband-modem-icera.h" +#include "mm-broadband-modem-sierra-icera.h" G_DEFINE_TYPE (MMPluginSierra, mm_plugin_sierra, MM_TYPE_PLUGIN) @@ -171,11 +171,11 @@ create_modem (MMPlugin *self, } if (is_icera) - return MM_BASE_MODEM (mm_broadband_modem_icera_new (sysfs_path, - driver, - mm_plugin_get_name (self), - vendor, - product)); + return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (sysfs_path, + driver, + mm_plugin_get_name (self), + vendor, + product)); return MM_BASE_MODEM (mm_broadband_modem_sierra_new (sysfs_path, driver, |