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

22
plugins/generic/mm-plugin-generic.c
View File

@@ -32,7 +32,7 @@
#include "mm-serial-parsers.h"
#include "mm-log.h"
G_DEFINE_TYPE (MMPluginGeneric, mm_plugin_generic, MM_TYPE_PLUGIN_BASE)
G_DEFINE_TYPE (MMPluginGeneric, mm_plugin_generic, MM_TYPE_PLUGIN)
int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
@@ -40,7 +40,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,
@@ -50,13 +50,13 @@ create_modem (MMPluginBase *plugin,
{
return MM_BASE_MODEM (mm_broadband_modem_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)
@@ -88,10 +88,10 @@ mm_plugin_create (void)
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_GENERIC,
MM_PLUGIN_BASE_NAME, MM_PLUGIN_GENERIC_NAME,
MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE,
MM_PLUGIN_NAME, MM_PLUGIN_GENERIC_NAME,
MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_ALLOWED_AT, TRUE,
MM_PLUGIN_ALLOWED_QCDM, TRUE,
NULL));
}
@@ -103,8 +103,8 @@ mm_plugin_generic_init (MMPluginGeneric *self)
static void
mm_plugin_generic_class_init (MMPluginGenericClass *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;
}