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

plugin: allow creating 'virtual' modems with 'virtual' ports

Browse Source
This commit is contained in:
Aleksander Morgado
2013-11-22 23:40:55 +01:00
parent c182a04f64
commit 2d9d15f892
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/mm-plugin.c
View File

@@ -836,10 +836,14 @@ mm_plugin_create_modem (MMPlugin *self,
MMDevice *device, MMDevice *device,
GError **error) GError **error)
{ {
MMBaseModem *modem = NULL; MMBaseModem *modem;
GList *port_probes, *l; GList *port_probes = NULL;
const gchar **virtual_ports = NULL;
port_probes = mm_device_peek_port_probe_list (device); if (!mm_device_is_virtual (device))
port_probes = mm_device_peek_port_probe_list (device);
else
virtual_ports = mm_device_virtual_peek_ports (device);
/* Let the plugin create the modem from the port probe results */ /* Let the plugin create the modem from the port probe results */
modem = MM_PLUGIN_GET_CLASS (self)->create_modem (MM_PLUGIN (self), modem = MM_PLUGIN_GET_CLASS (self)->create_modem (MM_PLUGIN (self),
@@ -849,8 +853,13 @@ mm_plugin_create_modem (MMPlugin *self,
mm_device_get_product (device), mm_device_get_product (device),
port_probes, port_probes,
error); error);
if (modem) { if (!modem)
mm_base_modem_set_hotplugged (modem, mm_device_get_hotplugged (device)); return NULL;
mm_base_modem_set_hotplugged (modem, mm_device_get_hotplugged (device));
if (port_probes) {
GList *l;
/* Grab each port */ /* Grab each port */
for (l = port_probes; l; l = g_list_next (l)) { for (l = port_probes; l; l = g_list_next (l)) {
@@ -911,12 +920,30 @@ mm_plugin_create_modem (MMPlugin *self,
g_clear_error (&inner_error); g_clear_error (&inner_error);
} }
} }
} else if (virtual_ports) {
guint i;
/* If organizing ports fails, consider the modem invalid */ for (i = 0; virtual_ports[i]; i++) {
if (!mm_base_modem_organize_ports (modem, error)) GError *inner_error = NULL;
g_clear_object (&modem);
if (!mm_base_modem_grab_port (modem,
"virtual",
virtual_ports[i],
MM_PORT_TYPE_AT,
MM_PORT_SERIAL_AT_FLAG_NONE,
&inner_error)) {
mm_warn ("Could not grab port (virtual/%s): '%s'",
virtual_ports[i],
inner_error ? inner_error->message : "unknown error");
g_clear_error (&inner_error);
}
}
} }
/* If organizing ports fails, consider the modem invalid */
if (!mm_base_modem_organize_ports (modem, error))
g_clear_object (&modem);
return modem; return modem;
} }