colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: merge MMPluginBase' and MMPlugin'

Browse Source 
There's no real point in maintaining a separate `MMPlugin' interface, as all the
plugins will inherit from `MMPluginBase', so just merge them and simplify
everything.
This commit is contained in:
Aleksander Morgado
2012-07-10 11:15:23 +02:00
parent 7e9d3e4b68
commit e5e46f489e
33 changed files with 1350 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/anydata/mm-plugin-anydata.c
View File

@@ -24,7 +24,7 @@
#include "mm-plugin-anydata.h"
#include "mm-broadband-modem-anydata.h"
G_DEFINE_TYPE (MMPluginAnydata, mm_plugin_anydata, MM_TYPE_PLUGIN_BASE)
G_DEFINE_TYPE (MMPluginAnydata, mm_plugin_anydata, MM_TYPE_PLUGIN)
int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
@@ -32,7 +32,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
/*****************************************************************************/
static MMBaseModem *
create_modem (MMPluginBase *plugin,
create_modem (MMPlugin *self,
const gchar *sysfs_path,
const gchar *driver,
guint16 vendor,
@@ -42,13 +42,13 @@ create_modem (MMPluginBase *plugin,
{
return MM_BASE_MODEM (mm_broadband_modem_anydata_new (sysfs_path,
driver,
mm_plugin_get_name (MM_PLUGIN (plugin)),
mm_plugin_get_name (self),
vendor,
product));
}
static gboolean
grab_port (MMPluginBase *base,
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
@@ -71,11 +71,11 @@ mm_plugin_create (void)
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_ANYDATA,
MM_PLUGIN_BASE_NAME, "AnyDATA",
MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids,
MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE,
MM_PLUGIN_NAME, "AnyDATA",
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
MM_PLUGIN_ALLOWED_AT, TRUE,
MM_PLUGIN_ALLOWED_QCDM, TRUE,
NULL));
}
@@ -87,8 +87,8 @@ mm_plugin_anydata_init (MMPluginAnydata *self)
static void
mm_plugin_anydata_class_init (MMPluginAnydataClass *klass)
{
MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
pb_class->create_modem = create_modem;
pb_class->grab_port = grab_port;
plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
}

6
plugins/anydata/mm-plugin-anydata.h
View File

@@ -19,7 +19,7 @@
#ifndef MM_PLUGIN_ANYDATA_H
#define MM_PLUGIN_ANYDATA_H
#include "mm-plugin-base.h"
#include "mm-plugin.h"
#define MM_TYPE_PLUGIN_ANYDATA (mm_plugin_anydata_get_type ())
#define MM_PLUGIN_ANYDATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_ANYDATA, MMPluginAnydata))
@@ -29,11 +29,11 @@
#define MM_PLUGIN_ANYDATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_ANYDATA, MMPluginAnydataClass))
typedef struct {
MMPluginBase parent;
MMPlugin parent;
} MMPluginAnydata;
typedef struct {
MMPluginBaseClass parent;
MMPluginClass parent;
} MMPluginAnydataClass;
GType mm_plugin_anydata_get_type (void);