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

plugin-base: clear internally tracked probe if port unsupported

Browse Source 
If the port is supported by the plugin, leave the probe in the internal HT until
the port gets grabbed afterwards.
This commit is contained in:
Aleksander Morgado
2011-09-19 19:23:52 +02:00
committed by Aleksander Morgado
parent d9b2b6f8ec
commit 1e6b29bcca
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,6 +480,7 @@ port_probe_run_ready (MMPortProbe *probe,
PortProbeRunContext *ctx) PortProbeRunContext *ctx)
{ {
GError *error = NULL; GError *error = NULL;
gboolean keep_probe = FALSE;
if (!mm_port_probe_run_finish (probe, probe_result, &error)) { if (!mm_port_probe_run_finish (probe, probe_result, &error)) {
/* Probing failed */ /* Probing failed */
@@ -488,10 +489,16 @@ port_probe_run_ready (MMPortProbe *probe,
/* Probing succeeded */ /* Probing succeeded */
MMPluginSupportsResult supports_result; MMPluginSupportsResult supports_result;
supports_result = (apply_post_probing_filters (ctx->plugin, if (!apply_post_probing_filters (ctx->plugin, probe)) {
probe) ? /* Port is supported! Leave it in the internal HT until port gets
MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED : * grabbed. */
MM_PLUGIN_SUPPORTS_PORT_SUPPORTED); supports_result = MM_PLUGIN_SUPPORTS_PORT_SUPPORTED;
keep_probe = TRUE;
} else {
/* Unsupported port, remove from internal tracking HT */
supports_result = MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
}
g_simple_async_result_set_op_res_gpointer (ctx->result, g_simple_async_result_set_op_res_gpointer (ctx->result,
GUINT_TO_POINTER (supports_result), GUINT_TO_POINTER (supports_result),
NULL); NULL);
@@ -500,6 +507,17 @@ port_probe_run_ready (MMPortProbe *probe,
/* Complete the async supports port request */ /* Complete the async supports port request */
g_simple_async_result_complete_in_idle (ctx->result); g_simple_async_result_complete_in_idle (ctx->result);
/* If no longer needed, Remove probe from internal HT */
if (!keep_probe) {
MMPluginBasePrivate *priv = MM_PLUGIN_BASE_GET_PRIVATE (ctx->plugin);
gchar *key;
key = get_key (mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
g_hash_table_remove (priv->tasks, key);
g_free (key);
}
g_object_unref (ctx->result); g_object_unref (ctx->result);
g_object_unref (ctx->plugin); g_object_unref (ctx->plugin);
g_free (ctx); g_free (ctx);