diff options
Diffstat (limited to 'plugins/generic/mm-plugin-generic.c')
| -rw-r--r-- | plugins/generic/mm-plugin-generic.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c index b9bea6ae..e18b8854 100644 --- a/plugins/generic/mm-plugin-generic.c +++ b/plugins/generic/mm-plugin-generic.c @@ -31,7 +31,7 @@ #include "mm-plugin-generic.h" #include "mm-broadband-modem.h" #include "mm-serial-parsers.h" -#include "mm-log.h" +#include "mm-log-object.h" #if defined WITH_QMI #include "mm-broadband-modem-qmi.h" @@ -43,14 +43,14 @@ 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; +MM_PLUGIN_DEFINE_MAJOR_VERSION +MM_PLUGIN_DEFINE_MINOR_VERSION /*****************************************************************************/ static MMBaseModem * create_modem (MMPlugin *self, - const gchar *sysfs_path, + const gchar *uid, const gchar **drivers, guint16 vendor, guint16 product, @@ -59,8 +59,8 @@ create_modem (MMPlugin *self, { #if defined WITH_QMI if (mm_port_probe_list_has_qmi_port (probes)) { - mm_dbg ("QMI-powered generic modem found..."); - return MM_BASE_MODEM (mm_broadband_modem_qmi_new (sysfs_path, + mm_obj_dbg (self, "QMI-powered generic modem found..."); + return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid, drivers, mm_plugin_get_name (self), vendor, @@ -70,8 +70,8 @@ create_modem (MMPlugin *self, #if defined WITH_MBIM if (mm_port_probe_list_has_mbim_port (probes)) { - mm_dbg ("MBIM-powered generic modem found..."); - return MM_BASE_MODEM (mm_broadband_modem_mbim_new (sysfs_path, + mm_obj_dbg (self, "MBIM-powered generic modem found..."); + return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid, drivers, mm_plugin_get_name (self), vendor, @@ -79,7 +79,7 @@ create_modem (MMPlugin *self, } #endif - return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path, + return MM_BASE_MODEM (mm_broadband_modem_new (uid, drivers, mm_plugin_get_name (self), vendor, @@ -91,11 +91,12 @@ create_modem (MMPlugin *self, G_MODULE_EXPORT MMPlugin * mm_plugin_create (void) { - static const gchar *subsystems[] = { "tty", "net", "usb", NULL }; + static const gchar *subsystems[] = { "tty", "net", "usbmisc", "wwan", NULL }; return MM_PLUGIN ( g_object_new (MM_TYPE_PLUGIN_GENERIC, - MM_PLUGIN_NAME, MM_PLUGIN_GENERIC_NAME, + MM_PLUGIN_NAME, MM_MODULE_NAME, + MM_PLUGIN_IS_GENERIC, TRUE, MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, MM_PLUGIN_ALLOWED_AT, TRUE, MM_PLUGIN_ALLOWED_QCDM, TRUE, |