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

api,modem: new 'Physdev' property

Browse Source 
Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
This commit is contained in:
Lukas Voegl
2023-09-15 12:59:54 +02:00
parent 1fc061b6a5
commit 8cd1c1bdb9
150 changed files with 446 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cli/mmcli-common.c
View File

@@ -121,6 +121,7 @@ get_object_lookup_info (const gchar *str,
const gchar *object_prefix,
gchar **object_path,
gchar **modem_uid,
gchar **modem_physdev,
gboolean *find_any)
{
gboolean all_numeric;
@@ -132,16 +133,19 @@ get_object_lookup_info (const gchar *str,
exit (EXIT_FAILURE);
}
/* User string may come in four ways:
/* User string may come in five ways:
* a) full DBus path
* b) object index
* c) modem UID (for modem or SIM lookup only)
* d) "any" string (for modem or SIM lookup only)
* c) modem physdev path (for modem lookup only)
* e) "any" string (for modem or SIM lookup only)
*/
*object_path = NULL;
if (modem_uid)
*modem_uid = NULL;
if (modem_physdev)
*modem_physdev = NULL;
if (find_any)
*find_any = FALSE;
@@ -174,6 +178,13 @@ get_object_lookup_info (const gchar *str,
return;
}
/* If starts with / we have the physdev path */
if (g_str_has_prefix (str, "/")) {
g_debug ("Assuming '%s' is the %s physdev path", str, object_type);
*modem_physdev = g_strdup (str);
return;
}
/* Otherwise we have the UID */
if (modem_uid) {
g_debug ("Assuming '%s' is the modem UID", str);
@@ -193,6 +204,7 @@ static MMObject *
find_modem (MMManager *manager,
const gchar *modem_path,
const gchar *modem_uid,
const gchar *modem_physdev,
gboolean modem_any)
{
GList *modems;
@@ -211,7 +223,8 @@ find_modem (MMManager *manager,
if (modem_any ||
(modem_path && g_str_equal (mm_object_get_path (obj), modem_path)) ||
(modem_uid && g_str_equal (mm_modem_get_device (modem), modem_uid))) {
(modem_uid && g_str_equal (mm_modem_get_device (modem), modem_uid)) ||
(modem_physdev && g_str_equal (mm_modem_get_physdev (modem), modem_physdev))) {
found = g_object_ref (obj);
break;
}
@@ -231,6 +244,7 @@ find_modem (MMManager *manager,
typedef struct {
gchar *modem_path;
gchar *modem_uid;
gchar *modem_physdev;
gboolean modem_any;
} GetModemContext;
@@ -252,6 +266,7 @@ get_modem_context_free (GetModemContext *ctx)
{
g_free (ctx->modem_path);
g_free (ctx->modem_uid);
g_free (ctx->modem_physdev);
g_free (ctx);
}
@@ -283,7 +298,7 @@ get_manager_ready (GDBusConnection *connection,
results = g_new (GetModemResults, 1);
results->manager = mmcli_get_manager_finish (res);
results->object = find_modem (results->manager, ctx->modem_path, ctx->modem_uid, ctx->modem_any);
results->object = find_modem (results->manager, ctx->modem_path, ctx->modem_uid, ctx->modem_physdev, ctx->modem_any);
g_task_return_pointer (task, results, (GDestroyNotify)get_modem_results_free);
g_object_unref (task);
}
@@ -302,8 +317,8 @@ mmcli_get_modem (GDBusConnection *connection,
ctx = g_new0 (GetModemContext, 1);
get_object_lookup_info (str, "modem", MM_DBUS_MODEM_PREFIX,
&ctx->modem_path, &ctx->modem_uid, &ctx->modem_any);
g_assert (!!ctx->modem_path + !!ctx->modem_uid + ctx->modem_any == 1);
&ctx->modem_path, &ctx->modem_uid, &ctx->modem_physdev, &ctx->modem_any);
g_assert (!!ctx->modem_path + !!ctx->modem_uid + !!ctx->modem_physdev + ctx->modem_any == 1);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_modem_context_free);
mmcli_get_manager (connection,
@@ -321,13 +336,14 @@ mmcli_get_modem_sync (GDBusConnection *connection,
MMObject *found;
gchar *modem_path = NULL;
gchar *modem_uid = NULL;
gchar *modem_physdev = NULL;
gboolean modem_any = FALSE;
manager = mmcli_get_manager_sync (connection);
get_object_lookup_info (str, "modem", MM_DBUS_MODEM_PREFIX,
&modem_path, &modem_uid, &modem_any);
g_assert (!!modem_path + !!modem_uid + modem_any == 1);
found = find_modem (manager, modem_path, modem_uid, modem_any);
&modem_path, &modem_uid, &modem_physdev, &modem_any);
g_assert (!!modem_path + !!modem_uid + !!modem_physdev + modem_any == 1);
found = find_modem (manager, modem_path, modem_uid, modem_physdev, modem_any);
if (o_manager)
*o_manager = manager;
@@ -335,6 +351,7 @@ mmcli_get_modem_sync (GDBusConnection *connection,
g_object_unref (manager);
g_free (modem_path);
g_free (modem_uid);
g_free (modem_physdev);
return found;
}
@@ -592,7 +609,7 @@ mmcli_get_bearer (GDBusConnection *connection,
ctx = g_new0 (GetBearerContext, 1);
get_object_lookup_info (str, "bearer", MM_DBUS_BEARER_PREFIX,
&ctx->bearer_path, NULL, NULL);
&ctx->bearer_path, NULL, NULL, NULL);
g_assert (ctx->bearer_path);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_bearer_context_free);
@@ -615,7 +632,7 @@ mmcli_get_bearer_sync (GDBusConnection *connection,
gchar *bearer_path = NULL;
get_object_lookup_info (str, "bearer", MM_DBUS_BEARER_PREFIX,
&bearer_path, NULL, NULL);
&bearer_path, NULL, NULL, NULL);
g_assert (bearer_path);
manager = mmcli_get_manager_sync (connection);
@@ -915,7 +932,7 @@ mmcli_get_sim (GDBusConnection *connection,
ctx = g_new0 (GetSimContext, 1);
get_object_lookup_info (str, "SIM", MM_DBUS_SIM_PREFIX,
&ctx->sim_path, &ctx->modem_uid, &ctx->sim_any);
&ctx->sim_path, &ctx->modem_uid, NULL, &ctx->sim_any);
g_assert (!!ctx->sim_path + !!ctx->modem_uid + ctx->sim_any == 1);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_sim_context_free);
@@ -940,7 +957,7 @@ mmcli_get_sim_sync (GDBusConnection *connection,
gboolean sim_any = FALSE;
get_object_lookup_info (str, "SIM", MM_DBUS_SIM_PREFIX,
&sim_path, &modem_uid, &sim_any);
&sim_path, &modem_uid, NULL, &sim_any);
g_assert (!!sim_path + !!modem_uid + sim_any == 1);
manager = mmcli_get_manager_sync (connection);
@@ -1222,7 +1239,7 @@ mmcli_get_sms (GDBusConnection *connection,
ctx = g_new0 (GetSmsContext, 1);
get_object_lookup_info (str, "SMS", MM_DBUS_SMS_PREFIX,
&ctx->sms_path, NULL, NULL);
&ctx->sms_path, NULL, NULL, NULL);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_sms_context_free);
mmcli_get_manager (connection,
@@ -1244,7 +1261,7 @@ mmcli_get_sms_sync (GDBusConnection *connection,
gchar *sms_path = NULL;
get_object_lookup_info (str, "SMS", MM_DBUS_SMS_PREFIX,
&sms_path, NULL, NULL);
&sms_path, NULL, NULL, NULL);
manager = mmcli_get_manager_sync (connection);
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (manager));
@@ -1485,7 +1502,7 @@ mmcli_get_call (GDBusConnection *connection,
ctx = g_new0 (GetCallContext, 1);
get_object_lookup_info (str, "call", MM_DBUS_CALL_PREFIX,
&ctx->call_path, NULL, NULL);
&ctx->call_path, NULL, NULL, NULL);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_call_context_free);
mmcli_get_manager (connection,
@@ -1507,7 +1524,7 @@ mmcli_get_call_sync (GDBusConnection *connection,
gchar *call_path = NULL;
get_object_lookup_info (str, "call", MM_DBUS_CALL_PREFIX,
&call_path, NULL, NULL);
&call_path, NULL, NULL, NULL);
manager = mmcli_get_manager_sync (connection);
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (manager));

1
cli/mmcli-modem.c
View File

@@ -371,6 +371,7 @@ print_modem_info (void)
mmcli_output_string (MMC_F_HARDWARE_EQUIPMENT_ID, mm_modem_get_equipment_identifier (ctx->modem));
mmcli_output_string (MMC_F_SYSTEM_DEVICE, mm_modem_get_device (ctx->modem));
mmcli_output_string (MMC_F_SYSTEM_PHYSDEV, mm_modem_get_physdev (ctx->modem));
mmcli_output_string_array (MMC_F_SYSTEM_DRIVERS, (const gchar **) mm_modem_get_drivers (ctx->modem), FALSE);
mmcli_output_string (MMC_F_SYSTEM_PLUGIN, mm_modem_get_plugin (ctx->modem));
mmcli_output_string (MMC_F_SYSTEM_PRIMARY_PORT, mm_modem_get_primary_port (ctx->modem));

1
cli/mmcli-output.c
View File

@@ -111,6 +111,7 @@ static FieldInfo field_infos[] = {
[MMC_F_HARDWARE_CURRENT_CAPABILITIES] = { "modem.generic.current-capabilities", "current", MMC_S_MODEM_HARDWARE, },
[MMC_F_HARDWARE_EQUIPMENT_ID] = { "modem.generic.equipment-identifier", "equipment id", MMC_S_MODEM_HARDWARE, },
[MMC_F_SYSTEM_DEVICE] = { "modem.generic.device", "device", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_PHYSDEV] = { "modem.generic.physdev", "physdev", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_DRIVERS] = { "modem.generic.drivers", "drivers", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_PLUGIN] = { "modem.generic.plugin", "plugin", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_PRIMARY_PORT] = { "modem.generic.primary-port", "primary port", MMC_S_MODEM_SYSTEM, },

1
cli/mmcli-output.h
View File

@@ -105,6 +105,7 @@ typedef enum {
MMC_F_HARDWARE_EQUIPMENT_ID,
/* System section */
MMC_F_SYSTEM_DEVICE,
MMC_F_SYSTEM_PHYSDEV,
MMC_F_SYSTEM_DRIVERS,
MMC_F_SYSTEM_PLUGIN,
MMC_F_SYSTEM_PRIMARY_PORT,

4
docs/reference/libmm-glib/libmm-glib-sections.txt
View File

@@ -157,6 +157,8 @@ mm_modem_peek_ports
mm_modem_get_ports
mm_modem_get_device
mm_modem_dup_device
mm_modem_get_physdev
mm_modem_dup_physdev
mm_modem_get_equipment_identifier
mm_modem_dup_equipment_identifier
mm_modem_get_device_identifier
@@ -2679,6 +2681,8 @@ mm_gdbus_modem_dup_current_bands
mm_gdbus_modem_get_current_capabilities
mm_gdbus_modem_get_device
mm_gdbus_modem_dup_device
mm_gdbus_modem_get_physdev
mm_gdbus_modem_dup_physdev
mm_gdbus_modem_get_device_identifier
mm_gdbus_modem_dup_device_identifier
mm_gdbus_modem_get_drivers

13
introspection/org.freedesktop.ModemManager1.Modem.xml
View File

@@ -929,6 +929,19 @@
-->
<property name="Device" type="s" access="read" />
<!--
Physdev:
The physical modem device path (ie, USB, PCI, PCMCIA device), which
may be dependent upon the operating system.
In Linux for example, this points to a sysfs path of the usb_device
object.
Since: 1.22
-->
<property name="Physdev" type="s" access="read" />
<!--
Drivers:

48
libmm-glib/mm-modem.c
View File

@@ -775,6 +775,54 @@ mm_modem_dup_device (MMModem *self)
/*****************************************************************************/
/**
* mm_modem_get_physdev:
* @self: A #MMModem.
*
* Gets the physical modem device path (ie, USB, PCI, PCMCIA device), which
* may be dependent upon the operating system.
*
* <warning>The returned value is only valid until the property changes so it is
* only safe to use this function on the thread where @self was constructed. Use
* mm_modem_dup_physdev() if on another thread.</warning>
*
* Returns: (transfer none): The physdev path, or %NULL if none available. Do not
* free the returned value, it belongs to @self.
*
* Since: 1.22
*/
const gchar *
mm_modem_get_physdev (MMModem *self)
{
g_return_val_if_fail (MM_IS_MODEM (self), NULL);
RETURN_NON_EMPTY_CONSTANT_STRING (
mm_gdbus_modem_get_physdev (MM_GDBUS_MODEM (self)));
}
/**
* mm_modem_dup_physdev:
* @self: A #MMModem.
*
* Gets a copy of the physical modem device path (ie, USB, PCI, PCMCIA
* device), which may be dependent upon the operating system.
*
* Returns: (transfer full): The physdev path, or %NULL if none available. The
* returned value should be freed with g_free().
*
* Since: 1.22
*/
gchar *
mm_modem_dup_physdev (MMModem *self)
{
g_return_val_if_fail (MM_IS_MODEM (self), NULL);
RETURN_NON_EMPTY_STRING (
mm_gdbus_modem_dup_physdev (MM_GDBUS_MODEM (self)));
}
/*****************************************************************************/
/**
* mm_modem_get_drivers:
* @self: A #MMModem.

3
libmm-glib/mm-modem.h
View File

@@ -119,6 +119,9 @@ gchar *mm_modem_dup_device_identifier (MMModem *self);
const gchar *mm_modem_get_device (MMModem *self);
gchar *mm_modem_dup_device (MMModem *self);
const gchar *mm_modem_get_physdev (MMModem *self);
gchar *mm_modem_dup_physdev (MMModem *self);
const gchar * const *mm_modem_get_drivers (MMModem *self);
gchar **mm_modem_dup_drivers (MMModem *self);

8
src/mm-base-manager.c
View File

@@ -355,12 +355,15 @@ device_added (MMBaseManager *self,
/* See if we already created an object to handle ports in this device */
device = find_device_by_physdev_uid (self, physdev_uid);
if (!device) {
const gchar *physdev;
FindDeviceSupportContext *ctx;
mm_obj_dbg (self, "port %s is first in device %s", name, physdev_uid);
physdev = mm_kernel_device_get_physdev_sysfs_path (port);
/* Keep the device listed in the Manager */
device = mm_device_new (physdev_uid, hotplugged, FALSE, self->priv->object_manager);
device = mm_device_new (physdev_uid, physdev, hotplugged, FALSE, self->priv->object_manager);
g_hash_table_insert (self->priv->devices,
g_strdup (physdev_uid),
device);
@@ -1366,13 +1369,14 @@ handle_set_profile (MmGdbusTest *skeleton,
MMPlugin *plugin;
MMDevice *device;
gchar *physdev_uid;
gchar *physdev = NULL;
GError *error = NULL;
mm_obj_msg (self, "test profile set to: '%s'", id);
/* Create device and keep it listed in the Manager */
physdev_uid = g_strdup_printf ("/virtual/%s", id);
device = mm_device_new (physdev_uid, TRUE, TRUE, self->priv->object_manager);
device = mm_device_new (physdev_uid, physdev, TRUE, TRUE, self->priv->object_manager);
g_hash_table_insert (self->priv->devices, physdev_uid, device);
/* Grab virtual ports */

26
src/mm-base-modem.c
View File

@@ -53,6 +53,7 @@ enum {
PROP_VALID,
PROP_MAX_TIMEOUTS,
PROP_DEVICE,
PROP_PHYSDEV,
PROP_DRIVERS,
PROP_PLUGIN,
PROP_VENDOR_ID,
@@ -85,6 +86,7 @@ struct _MMBaseModemPrivate {
gulong invalid_if_cancelled;
gchar *device;
gchar *physdev;
gchar **drivers;
gchar *plugin;
@@ -1723,6 +1725,14 @@ mm_base_modem_get_device (MMBaseModem *self)
return self->priv->device;
}
const gchar *
mm_base_modem_get_physdev (MMBaseModem *self)
{
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
return self->priv->physdev;
}
const gchar **
mm_base_modem_get_drivers (MMBaseModem *self)
{
@@ -1908,6 +1918,10 @@ set_property (GObject *object,
g_free (self->priv->device);
self->priv->device = g_value_dup_string (value);
break;
case PROP_PHYSDEV:
g_free (self->priv->physdev);
self->priv->physdev = g_value_dup_string (value);
break;
case PROP_DRIVERS:
g_strfreev (self->priv->drivers);
self->priv->drivers = g_value_dup_boxed (value);
@@ -1962,6 +1976,9 @@ get_property (GObject *object,
case PROP_DEVICE:
g_value_set_string (value, self->priv->device);
break;
case PROP_PHYSDEV:
g_value_set_string (value, self->priv->physdev);
break;
case PROP_DRIVERS:
g_value_set_boxed (value, self->priv->drivers);
break;
@@ -2007,6 +2024,7 @@ finalize (GObject *object)
mm_obj_dbg (self, "completely disposed");
g_free (self->priv->device);
g_free (self->priv->physdev);
g_strfreev (self->priv->drivers);
g_free (self->priv->plugin);
@@ -2098,6 +2116,14 @@ mm_base_modem_class_init (MMBaseModemClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_DEVICE, properties[PROP_DEVICE]);
properties[PROP_PHYSDEV] =
g_param_spec_string (MM_BASE_MODEM_PHYSDEV,
"Physdev path",
"Main modem parent physical device path",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_PHYSDEV, properties[PROP_PHYSDEV]);
properties[PROP_DRIVERS] =
g_param_spec_boxed (MM_BASE_MODEM_DRIVERS,
"Drivers",

2
src/mm-base-modem.h
View File

@@ -59,6 +59,7 @@ typedef struct _MMBaseModemPrivate MMBaseModemPrivate;
#define MM_BASE_MODEM_MAX_TIMEOUTS "base-modem-max-timeouts"
#define MM_BASE_MODEM_VALID "base-modem-valid"
#define MM_BASE_MODEM_DEVICE "base-modem-device"
#define MM_BASE_MODEM_PHYSDEV "base-modem-physdev-path"
#define MM_BASE_MODEM_DRIVERS "base-modem-drivers"
#define MM_BASE_MODEM_PLUGIN "base-modem-plugin"
#define MM_BASE_MODEM_VENDOR_ID "base-modem-vendor-id"
@@ -205,6 +206,7 @@ void mm_base_modem_set_reprobe (MMBaseModem *self,
gboolean mm_base_modem_get_reprobe (MMBaseModem *self);
const gchar *mm_base_modem_get_device (MMBaseModem *self);
const gchar *mm_base_modem_get_physdev (MMBaseModem *self);
const gchar **mm_base_modem_get_drivers (MMBaseModem *self);
const gchar *mm_base_modem_get_plugin (MMBaseModem *self);

2
src/mm-broadband-modem-mbim.c
View File

@@ -9731,6 +9731,7 @@ modem_set_carrier_lock (MMIfaceModem3gpp *_self,
MMBroadbandModemMbim *
mm_broadband_modem_mbim_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -9738,6 +9739,7 @@ mm_broadband_modem_mbim_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/mm-broadband-modem-mbim.h
View File

@@ -49,6 +49,7 @@ GType mm_broadband_modem_mbim_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModemMbim, g_object_unref)
MMBroadbandModemMbim *mm_broadband_modem_mbim_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/mm-broadband-modem-qmi.c
View File

@@ -13581,6 +13581,7 @@ initialization_started (MMBroadbandModem *self,
MMBroadbandModemQmi *
mm_broadband_modem_qmi_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -13588,6 +13589,7 @@ mm_broadband_modem_qmi_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/mm-broadband-modem-qmi.h
View File

@@ -47,6 +47,7 @@ GType mm_broadband_modem_qmi_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModemQmi, g_object_unref)
MMBroadbandModemQmi *mm_broadband_modem_qmi_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/mm-broadband-modem.c
View File

@@ -12958,6 +12958,7 @@ mm_broadband_modem_create_device_identifier (MMBroadbandModem *self,
MMBroadbandModem *
mm_broadband_modem_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -12965,6 +12966,7 @@ mm_broadband_modem_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/mm-broadband-modem.h
View File

@@ -103,6 +103,7 @@ GType mm_broadband_modem_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModem, g_object_unref)
MMBroadbandModem *mm_broadband_modem_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

27
src/mm-device.c
View File

@@ -35,6 +35,7 @@ G_DEFINE_TYPE_EXTENDED (MMDevice, mm_device, G_TYPE_OBJECT, 0,
enum {
PROP_0,
PROP_UID,
PROP_PHYSDEV,
PROP_OBJECT_MANAGER,
PROP_PLUGIN,
PROP_MODEM,
@@ -60,6 +61,9 @@ struct _MMDevicePrivate {
/* Unique id */
gchar *uid;
/* Physdev path */
gchar *physdev;
/* The object manager */
GDBusObjectManagerServer *object_manager;
@@ -526,6 +530,12 @@ mm_device_get_uid (MMDevice *self)
return self->priv->uid;
}
const gchar *
mm_device_get_physdev (MMDevice *self)
{
return self->priv->physdev;
}
const gchar **
mm_device_get_drivers (MMDevice *self)
{
@@ -756,6 +766,7 @@ log_object_build_id (MMLogObject *_self)
MMDevice *
mm_device_new (const gchar *uid,
const gchar *physdev,
gboolean hotplugged,
gboolean virtual,
GDBusObjectManagerServer *object_manager)
@@ -764,6 +775,7 @@ mm_device_new (const gchar *uid,
return MM_DEVICE (g_object_new (MM_TYPE_DEVICE,
MM_DEVICE_UID, uid,
MM_DEVICE_PHYSDEV, physdev,
MM_DEVICE_HOTPLUGGED, hotplugged,
MM_DEVICE_VIRTUAL, virtual,
MM_DEVICE_OBJECT_MANAGER, object_manager,
@@ -790,6 +802,10 @@ set_property (GObject *object,
/* construct only */
self->priv->uid = g_value_dup_string (value);
break;
case PROP_PHYSDEV:
/* construct only */
self->priv->physdev = g_value_dup_string (value);
break;
case PROP_OBJECT_MANAGER:
/* construct only */
self->priv->object_manager = g_value_dup_object (value);
@@ -829,6 +845,9 @@ get_property (GObject *object,
case PROP_UID:
g_value_set_string (value, self->priv->uid);
break;
case PROP_PHYSDEV:
g_value_set_object (value, self->priv->physdev);
break;
case PROP_OBJECT_MANAGER:
g_value_set_object (value, self->priv->object_manager);
break;
@@ -913,6 +932,14 @@ mm_device_class_init (MMDeviceClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_UID, properties[PROP_UID]);
properties[PROP_PHYSDEV] =
g_param_spec_string (MM_DEVICE_PHYSDEV,
"Physdev",
"Physical device path",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_PHYSDEV, properties[PROP_PHYSDEV]);
properties[PROP_OBJECT_MANAGER] =
g_param_spec_object (MM_DEVICE_OBJECT_MANAGER,
"Object manager",

3
src/mm-device.h
View File

@@ -34,6 +34,7 @@ typedef struct _MMDeviceClass MMDeviceClass;
typedef struct _MMDevicePrivate MMDevicePrivate;
#define MM_DEVICE_UID "uid"
#define MM_DEVICE_PHYSDEV "physdev"
#define MM_DEVICE_PLUGIN "plugin"
#define MM_DEVICE_MODEM "modem"
#define MM_DEVICE_HOTPLUGGED "hotplugged"
@@ -63,6 +64,7 @@ GType mm_device_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMDevice, g_object_unref)
MMDevice *mm_device_new (const gchar *uid,
const gchar *physdev,
gboolean hotplugged,
gboolean virtual,
GDBusObjectManagerServer *object_manager);
@@ -96,6 +98,7 @@ gboolean mm_device_uninhibit (MMDevice *self,
const gchar *mm_device_get_uid (MMDevice *self);
const gchar *mm_device_get_physdev (MMDevice *self);
const gchar **mm_device_get_drivers (MMDevice *self);
guint16 mm_device_get_vendor (MMDevice *self);
guint16 mm_device_get_product (MMDevice *self);

11
src/mm-iface-modem.c
View File

@@ -5332,6 +5332,16 @@ interface_initialization_step (GTask *task)
mm_gdbus_modem_set_device (ctx->skeleton, device);
g_free (device);
}
/* Load physdev path if not done before */
if (!mm_gdbus_modem_get_physdev (ctx->skeleton)) {
gchar *physdev;
g_object_get (self,
MM_BASE_MODEM_PHYSDEV, &physdev,
NULL);
mm_gdbus_modem_set_physdev (ctx->skeleton, physdev);
g_free (physdev);
}
/* Load driver if not done before */
if (!mm_gdbus_modem_get_drivers (ctx->skeleton)) {
gchar **drivers;
@@ -6035,6 +6045,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
mm_gdbus_modem_set_own_numbers (skeleton, NULL);
mm_gdbus_modem_set_device_identifier (skeleton, NULL);
mm_gdbus_modem_set_device (skeleton, NULL);
mm_gdbus_modem_set_physdev (skeleton, NULL);
mm_gdbus_modem_set_drivers (skeleton, NULL);
mm_gdbus_modem_set_plugin (skeleton, NULL);
mm_gdbus_modem_set_equipment_identifier (skeleton, NULL);

1
src/mm-plugin.c
View File

@@ -947,6 +947,7 @@ mm_plugin_create_modem (MMPlugin *self,
/* Let the plugin create the modem from the port probe results */
modem = MM_PLUGIN_GET_CLASS (self)->create_modem (MM_PLUGIN (self),
mm_device_get_uid (device),
mm_device_get_physdev (device),
drivers,
mm_device_get_vendor (device),
mm_device_get_product (device),

1
src/mm-plugin.h
View File

@@ -105,6 +105,7 @@ struct _MMPluginClass {
* a list of port probes (Mandatory) */
MMBaseModem *(*create_modem) (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,

2
src/plugins/altair/mm-broadband-modem-altair-lte.c
View File

@@ -1156,6 +1156,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemAltairLte *
mm_broadband_modem_altair_lte_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1164,6 +1165,7 @@ mm_broadband_modem_altair_lte_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_ALTAIR_LTE,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/altair/mm-broadband-modem-altair-lte.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemAltairLteClass{
GType mm_broadband_modem_altair_lte_get_type (void);
MMBroadbandModemAltairLte *mm_broadband_modem_altair_lte_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/altair/mm-plugin-altair-lte.c
View File

@@ -50,6 +50,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -58,6 +59,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_altair_lte_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/anydata/mm-broadband-modem-anydata.c
View File

@@ -308,6 +308,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemAnydata *
mm_broadband_modem_anydata_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -315,6 +316,7 @@ mm_broadband_modem_anydata_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_ANYDATA,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/anydata/mm-broadband-modem-anydata.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemAnydataClass{
GType mm_broadband_modem_anydata_get_type (void);
MMBroadbandModemAnydata *mm_broadband_modem_anydata_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

3
src/plugins/anydata/mm-plugin-anydata.c
View File

@@ -37,6 +37,7 @@ MM_DEFINE_PLUGIN (ANYDATA, anydata, Anydata)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -48,6 +49,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered AnyDATA modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -56,6 +58,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_anydata_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

3
src/plugins/broadmobi/mm-plugin-broadmobi.c
View File

@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (BROADMOBI, broadmobi, Broadmobi)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered BroadMobi modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -54,6 +56,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/cinterion/mm-broadband-modem-cinterion.c
View File

@@ -3116,6 +3116,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemCinterion *
mm_broadband_modem_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -3123,6 +3124,7 @@ mm_broadband_modem_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_CINTERION,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/cinterion/mm-broadband-modem-cinterion.h
View File

@@ -44,6 +44,7 @@ struct _MMBroadbandModemCinterionClass{
GType mm_broadband_modem_cinterion_get_type (void);
MMBroadbandModemCinterion *mm_broadband_modem_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
View File

@@ -52,6 +52,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_c
MMBroadbandModemMbimCinterion *
mm_broadband_modem_mbim_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -59,6 +60,7 @@ mm_broadband_modem_mbim_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_CINTERION,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
View File

@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimCinterionClass{
GType mm_broadband_modem_mbim_cinterion_get_type (void);
MMBroadbandModemMbimCinterion *mm_broadband_modem_mbim_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
View File

@@ -53,6 +53,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cin
MMBroadbandModemQmiCinterion *
mm_broadband_modem_qmi_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -60,6 +61,7 @@ mm_broadband_modem_qmi_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_CINTERION,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
View File

@@ -40,6 +40,7 @@ struct _MMBroadbandModemQmiCinterionClass{
GType mm_broadband_modem_qmi_cinterion_get_type (void);
MMBroadbandModemQmiCinterion *mm_broadband_modem_qmi_cinterion_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

4
src/plugins/cinterion/mm-plugin-cinterion.c
View File

@@ -138,6 +138,7 @@ cinterion_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -149,6 +150,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Cinterion modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_cinterion_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -160,6 +162,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Cinterion modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_cinterion_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -168,6 +171,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_cinterion_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

10
src/plugins/dell/mm-plugin-dell.c
View File

@@ -370,6 +370,7 @@ port_probe_list_has_manufacturer_port (GList *probes,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -385,6 +386,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -398,6 +400,7 @@ create_modem (MMPlugin *self,
if (vendor == 0x413c && (product == 0x81d7 || product == 0x81e0 || product == 0x81e4 || product == 0x81e6)) {
mm_obj_dbg (self, "MBIM-powered DW5821e/DW5829e (T77W968) modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_foxconn_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -407,6 +410,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "MBIM-powered XMM-based modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -415,6 +419,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "MBIM-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -425,6 +430,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_NOVATEL)) {
mm_obj_dbg (self, "Novatel-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_novatel_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -434,6 +440,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_SIERRA)) {
mm_obj_dbg (self, "Sierra-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_sierra_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -443,6 +450,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_TELIT)) {
mm_obj_dbg (self, "Telit-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_telit_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -452,6 +460,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "XMM-based modem found...");
return MM_BASE_MODEM (mm_broadband_modem_xmm_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -460,6 +469,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Dell-branded generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

3
src/plugins/dlink/mm-plugin-dlink.c
View File

@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (DLINK, dlink, Dlink)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered D-Link modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -54,6 +56,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/fibocom/mm-broadband-modem-fibocom.c
View File

@@ -676,6 +676,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemFibocom *
mm_broadband_modem_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -683,6 +684,7 @@ mm_broadband_modem_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/fibocom/mm-broadband-modem-fibocom.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemFibocomClass{
GType mm_broadband_modem_fibocom_get_type (void);
MMBroadbandModemFibocom *mm_broadband_modem_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
View File

@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fib
MMBroadbandModemMbimFibocom *
mm_broadband_modem_mbim_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_mbim_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
View File

@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimFibocomClass{
GType mm_broadband_modem_mbim_fibocom_get_type (void);
MMBroadbandModemMbimFibocom *mm_broadband_modem_mbim_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
View File

@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_
MMBroadbandModemMbimXmmFibocom *
mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_XMM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
View File

@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimXmmFibocomClass{
GType mm_broadband_modem_mbim_xmm_fibocom_get_type (void);
MMBroadbandModemMbimXmmFibocom *mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

6
src/plugins/fibocom/mm-plugin-fibocom.c
View File

@@ -44,6 +44,7 @@ MM_DEFINE_PLUGIN (FIBOCOM, fibocom, Fibocom)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "MBIM-powered XMM-based Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_fibocom_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -63,6 +65,7 @@ create_modem (MMPlugin *self,
}
mm_obj_dbg (self, "MBIM-powered Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_fibocom_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -74,6 +77,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -84,6 +88,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "XMM-based Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_xmm_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -92,6 +97,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_fibocom_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
View File

@@ -543,6 +543,7 @@ enable_location_gathering (MMIfaceModemLocation *self,
MMBroadbandModemMbimFoxconn *
mm_broadband_modem_mbim_foxconn_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -558,6 +559,7 @@ mm_broadband_modem_mbim_foxconn_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_FOXCONN,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
MM_BASE_MODEM_PRODUCT_ID, product_id,

1
src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemMbimFoxconnClass{
GType mm_broadband_modem_mbim_foxconn_get_type (void);
MMBroadbandModemMbimFoxconn *mm_broadband_modem_mbim_foxconn_new (const gchar *device,
const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,

4
src/plugins/foxconn/mm-plugin-foxconn.c
View File

@@ -45,6 +45,7 @@ MM_DEFINE_PLUGIN (FOXCONN, foxconn, Foxconn)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Foxconn-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -67,6 +69,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Foxconn-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_foxconn_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -76,6 +79,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Foxconn-branded generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

4
src/plugins/generic/mm-plugin-generic.c
View File

@@ -49,6 +49,7 @@ MM_DEFINE_PLUGIN (GENERIC, generic, Generic)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -60,6 +61,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -71,6 +73,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -79,6 +82,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

4
src/plugins/gosuncn/mm-plugin-gosuncn.c
View File

@@ -39,6 +39,7 @@ MM_DEFINE_PLUGIN (GOSUNCN, gosuncn, Gosuncn)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -61,6 +63,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -70,6 +73,7 @@ create_modem (MMPlugin *self,
/* Fallback to default modem in the worst case */
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/haier/mm-plugin-haier.c
View File

@@ -30,6 +30,7 @@ MM_DEFINE_PLUGIN (HAIER, haier, Haier)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -38,6 +39,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -4421,6 +4421,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemHuawei *
mm_broadband_modem_huawei_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -4428,6 +4429,7 @@ mm_broadband_modem_huawei_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_HUAWEI,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/huawei/mm-broadband-modem-huawei.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemHuaweiClass{
GType mm_broadband_modem_huawei_get_type (void);
MMBroadbandModemHuawei *mm_broadband_modem_huawei_new (const gchar *device,
const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,

4
src/plugins/huawei/mm-plugin-huawei.c
View File

@@ -619,6 +619,7 @@ propagate_port_type_hints (MMPlugin *self,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -632,6 +633,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Huawei modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -643,6 +645,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Huawei modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -651,6 +654,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_huawei_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/icera/mm-broadband-modem-icera.c
View File

@@ -2190,6 +2190,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemIcera *
mm_broadband_modem_icera_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -2197,6 +2198,7 @@ mm_broadband_modem_icera_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_ICERA,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/icera/mm-broadband-modem-icera.h
View File

@@ -47,6 +47,7 @@ GType mm_broadband_modem_icera_get_type (void);
G_MODULE_EXPORT
MMBroadbandModemIcera *mm_broadband_modem_icera_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/intel/mm-broadband-modem-mbim-intel.c
View File

@@ -72,6 +72,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemMbimIntel *
mm_broadband_modem_mbim_intel_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -79,6 +80,7 @@ mm_broadband_modem_mbim_intel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_INTEL,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/intel/mm-broadband-modem-mbim-intel.h
View File

@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimIntelClass{
GType mm_broadband_modem_mbim_intel_get_type (void);
MMBroadbandModemMbimIntel *mm_broadband_modem_mbim_intel_new (const gchar *device,
const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,

3
src/plugins/intel/mm-plugin-intel.c
View File

@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (INTEL, intel, Intel)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Intel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_intel_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -55,6 +57,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Generic Intel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/iridium/mm-broadband-modem-iridium.c
View File

@@ -340,6 +340,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemIridium *
mm_broadband_modem_iridium_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -347,6 +348,7 @@ mm_broadband_modem_iridium_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_IRIDIUM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/iridium/mm-broadband-modem-iridium.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemIridiumClass{
GType mm_broadband_modem_iridium_get_type (void);
MMBroadbandModemIridium *mm_broadband_modem_iridium_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/iridium/mm-plugin-iridium.c
View File

@@ -38,6 +38,7 @@ MM_DEFINE_PLUGIN (IRIDIUM, iridium, Iridium)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_iridium_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/linktop/mm-broadband-modem-linktop.c
View File

@@ -228,6 +228,7 @@ set_current_modes (MMIfaceModem *self,
MMBroadbandModemLinktop *
mm_broadband_modem_linktop_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -235,6 +236,7 @@ mm_broadband_modem_linktop_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_LINKTOP,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/linktop/mm-broadband-modem-linktop.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemLinktopClass{
GType mm_broadband_modem_linktop_get_type (void);
MMBroadbandModemLinktop *mm_broadband_modem_linktop_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/linktop/mm-plugin-linktop.c
View File

@@ -32,6 +32,7 @@ MM_DEFINE_PLUGIN (LINKTOP, linktop, Linktop)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -40,6 +41,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_linktop_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/longcheer/mm-broadband-modem-longcheer.c
View File

@@ -371,6 +371,7 @@ load_unlock_retries (MMIfaceModem *self,
MMBroadbandModemLongcheer *
mm_broadband_modem_longcheer_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -378,6 +379,7 @@ mm_broadband_modem_longcheer_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_LONGCHEER,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/longcheer/mm-broadband-modem-longcheer.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemLongcheerClass{
GType mm_broadband_modem_longcheer_get_type (void);
MMBroadbandModemLongcheer *mm_broadband_modem_longcheer_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/longcheer/mm-plugin-longcheer.c
View File

@@ -182,6 +182,7 @@ longcheer_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -190,6 +191,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_longcheer_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/mbm/mm-broadband-modem-mbm.c
View File

@@ -1445,6 +1445,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemMbm *
mm_broadband_modem_mbm_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1452,6 +1453,7 @@ mm_broadband_modem_mbm_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBM,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/mbm/mm-broadband-modem-mbm.h
View File

@@ -50,6 +50,7 @@ struct _MMBroadbandModemMbmClass{
GType mm_broadband_modem_mbm_get_type (void);
MMBroadbandModemMbm *mm_broadband_modem_mbm_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

3
src/plugins/mbm/mm-plugin-mbm.c
View File

@@ -39,6 +39,7 @@ MM_DEFINE_PLUGIN (MBM, mbm, Mbm)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Ericsson modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -58,6 +60,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_mbm_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/motorola/mm-broadband-modem-motorola.c
View File

@@ -39,6 +39,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMotorola, mm_broadband_modem_motorola, M
MMBroadbandModemMotorola *
mm_broadband_modem_motorola_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -46,6 +47,7 @@ mm_broadband_modem_motorola_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MOTOROLA,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/motorola/mm-broadband-modem-motorola.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemMotorolaClass{
GType mm_broadband_modem_motorola_get_type (void);
MMBroadbandModemMotorola *mm_broadband_modem_motorola_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/motorola/mm-plugin-motorola.c
View File

@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (MOTOROLA, motorola, Motorola)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_motorola_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/mtk/mm-broadband-modem-mtk.c
View File

@@ -834,6 +834,7 @@ setup_ports (MMBroadbandModem *self)
/*****************************************************************************/
MMBroadbandModemMtk *
mm_broadband_modem_mtk_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -841,6 +842,7 @@ mm_broadband_modem_mtk_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MTK,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/mtk/mm-broadband-modem-mtk.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemMtkClass {
GType mm_broadband_modem_mtk_get_type (void);
MMBroadbandModemMtk *mm_broadband_modem_mtk_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/mtk/mm-plugin-mtk.c
View File

@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (MTK, mtk, Mtk)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_mtk_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/nokia/mm-broadband-modem-nokia.c
View File

@@ -327,6 +327,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemNokia *
mm_broadband_modem_nokia_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -334,6 +335,7 @@ mm_broadband_modem_nokia_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOKIA,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/nokia/mm-broadband-modem-nokia.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemNokiaClass{
GType mm_broadband_modem_nokia_get_type (void);
MMBroadbandModemNokia *mm_broadband_modem_nokia_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/nokia/mm-plugin-nokia-icera.c
View File

@@ -41,6 +41,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -49,6 +50,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_icera_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/nokia/mm-plugin-nokia.c
View File

@@ -42,6 +42,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_nokia_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/novatel/mm-broadband-modem-novatel-lte.c
View File

@@ -638,6 +638,7 @@ scan_networks (MMIfaceModem3gpp *self,
MMBroadbandModemNovatelLte *
mm_broadband_modem_novatel_lte_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -645,6 +646,7 @@ mm_broadband_modem_novatel_lte_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/novatel/mm-broadband-modem-novatel-lte.h
View File

@@ -42,6 +42,7 @@ struct _MMBroadbandModemNovatelLteClass{
GType mm_broadband_modem_novatel_lte_get_type (void);
MMBroadbandModemNovatelLte *mm_broadband_modem_novatel_lte_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/novatel/mm-broadband-modem-novatel.c
View File

@@ -1535,6 +1535,7 @@ modem_time_check_support (MMIfaceModemTime *self,
MMBroadbandModemNovatel *
mm_broadband_modem_novatel_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1542,6 +1543,7 @@ mm_broadband_modem_novatel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/novatel/mm-broadband-modem-novatel.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemNovatelClass{
GType mm_broadband_modem_novatel_get_type (void);
MMBroadbandModemNovatel *mm_broadband_modem_novatel_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/novatel/mm-plugin-novatel-lte.c
View File

@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (NOVATEL_LTE, novatel_lte, NovatelLte)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -43,6 +44,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_novatel_lte_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

3
src/plugins/novatel/mm-plugin-novatel.c
View File

@@ -45,6 +45,7 @@ MM_DEFINE_PLUGIN (NOVATEL, novatel, Novatel)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Novatel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -64,6 +66,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_novatel_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/option/mm-broadband-modem-hso.c
View File

@@ -691,6 +691,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemHso *
mm_broadband_modem_hso_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -698,6 +699,7 @@ mm_broadband_modem_hso_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_HSO,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/option/mm-broadband-modem-hso.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemHsoClass{
GType mm_broadband_modem_hso_get_type (void);
MMBroadbandModemHso *mm_broadband_modem_hso_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/option/mm-broadband-modem-option.c
View File

@@ -1115,6 +1115,7 @@ is_nozomi (const gchar **drivers)
MMBroadbandModemOption *
mm_broadband_modem_option_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1127,6 +1128,7 @@ mm_broadband_modem_option_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_OPTION,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/option/mm-broadband-modem-option.h
View File

@@ -43,6 +43,7 @@ struct _MMBroadbandModemOptionClass{
GType mm_broadband_modem_option_get_type (void);
MMBroadbandModemOption *mm_broadband_modem_option_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/option/mm-plugin-hso.c
View File

@@ -110,6 +110,7 @@ hso_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -118,6 +119,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_hso_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/option/mm-plugin-option.c
View File

@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (OPTION, option, Option)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_option_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/pantech/mm-broadband-modem-pantech.c
View File

@@ -139,6 +139,7 @@ modem_after_sim_unlock (MMIfaceModem *self,
MMBroadbandModemPantech *
mm_broadband_modem_pantech_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -146,6 +147,7 @@ mm_broadband_modem_pantech_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_PANTECH,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/pantech/mm-broadband-modem-pantech.h
View File

@@ -39,6 +39,7 @@ struct _MMBroadbandModemPantechClass{
GType mm_broadband_modem_pantech_get_type (void);
MMBroadbandModemPantech *mm_broadband_modem_pantech_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

3
src/plugins/pantech/mm-plugin-pantech.c
View File

@@ -75,6 +75,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -86,6 +87,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Pantech modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -94,6 +96,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_pantech_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
View File

@@ -144,6 +144,7 @@ peek_port_qmi_for_data (MMBroadbandModemQmi *self,
MMBroadbandModemQmiQcomSoc *
mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -151,6 +152,7 @@ mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_QCOM_SOC,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

1
src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
View File

@@ -41,6 +41,7 @@ struct _MMBroadbandModemQmiQcomSocClass{
GType mm_broadband_modem_qmi_qcom_soc_get_type (void);
MMBroadbandModemQmiQcomSoc *mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,

2
src/plugins/qcom-soc/mm-plugin-qcom-soc.c
View File

@@ -40,6 +40,7 @@ MM_DEFINE_PLUGIN (QCOM_SOC, qcom_soc, QcomSoc)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -55,6 +56,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Qualcomm SoC modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_qcom_soc_new (uid,
physdev,
drivers,
mm_plugin_get_name (self),
vendor,

2
src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
View File

@@ -38,6 +38,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimQuectel, mm_broadband_modem_mbim_que
MMBroadbandModemMbimQuectel *
mm_broadband_modem_mbim_quectel_new (const gchar *device,
const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -45,6 +46,7 @@ mm_broadband_modem_mbim_quectel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,

Some files were not shown because too many files have changed in this diff Show More