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

plugins: propagate cached probing result to supports task

Browse Source 
We need to ensure that the supports task always has the results of the probing,
no matter if the probing was just launched by the plugin grabbing the port, or
by a previous plugin. We do this during supports_port(), by propagating to the
supports task any possible previously cached probing results.
This commit is contained in:
Aleksander Morgado
2011-06-06 17:21:47 +02:00
parent 3921559901
commit f9f6d1dfdb
20 changed files with 166 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-plugin-base.c
+28 -20
View File
@@ -278,6 +278,28 @@ mm_plugin_base_supports_task_get_probed_product (MMPluginBaseSupportsTask *task)
return MM_PLUGIN_BASE_SUPPORTS_TASK_GET_PRIVATE (task)->probed_product;
}
gboolean
mm_plugin_base_supports_task_propagate_cached (MMPluginBaseSupportsTask *task)
{
MMPluginBaseSupportsTaskPrivate *priv;
g_return_val_if_fail (task != NULL, FALSE);
g_return_val_if_fail (MM_IS_PLUGIN_BASE_SUPPORTS_TASK (task), FALSE);
priv = MM_PLUGIN_BASE_SUPPORTS_TASK_GET_PRIVATE (task);
g_free (priv->probed_vendor);
g_free (priv->probed_product);
/* Returns TRUE if a previous supports task already cached probing results.
* It will also store a copy of the cached result. */
return mm_plugin_base_get_cached_probe_result (priv->plugin,
priv->port,
&priv->probed_caps,
&priv->probed_vendor,
&priv->probed_product);
}
void
mm_plugin_base_supports_task_complete (MMPluginBaseSupportsTask *task,
guint32 level)
@@ -1049,27 +1071,9 @@ mm_plugin_base_probe_port (MMPluginBase *self,
}
gboolean
mm_plugin_base_get_cached_port_capabilities (MMPluginBase *self,
GUdevDevice *port,
guint32 *capabilities)
{
MMPluginBaseProbedInfo *info;
if (g_hash_table_lookup_extended (probed_info,
g_udev_device_get_name (port),
NULL,
(gpointer *)&info)) {
*capabilities = info->capabilities;
return TRUE;
}
*capabilities = 0;
return FALSE;
}
gboolean
mm_plugin_base_get_cached_product_info (MMPluginBase *self,
mm_plugin_base_get_cached_probe_result (MMPluginBase *self,
GUdevDevice *port,
guint32 *capabilities,
gchar **vendor,
gchar **product)
{
@@ -1079,6 +1083,8 @@ mm_plugin_base_get_cached_product_info (MMPluginBase *self,
g_udev_device_get_name (port),
NULL,
(gpointer *)&info)) {
if (capabilities)
*capabilities = info->capabilities;
if (vendor)
*vendor = (info->vendor ? g_strdup (info->vendor) : NULL);
if (product)
@@ -1086,6 +1092,8 @@ mm_plugin_base_get_cached_product_info (MMPluginBase *self,
return TRUE;
}
if (capabilities)
*capabilities = 0;
if (vendor)
*vendor = NULL;
if (product)
src/mm-plugin-base.h
+5 -6
View File
@@ -90,6 +90,9 @@ const gchar *mm_plugin_base_supports_task_get_probed_vendor (MMPluginBaseSupport
const gchar *mm_plugin_base_supports_task_get_probed_product (MMPluginBaseSupportsTask *task);
gboolean mm_plugin_base_supports_task_propagate_cached (MMPluginBaseSupportsTask *task);
void mm_plugin_base_supports_task_complete (MMPluginBaseSupportsTask *task,
guint32 level);
@@ -160,13 +163,9 @@ gboolean mm_plugin_base_probe_port (MMPluginBase *self,
GError **error);
/* Returns TRUE if the port was previously probed, FALSE if not */
gboolean mm_plugin_base_get_cached_port_capabilities (MMPluginBase *self,
GUdevDevice *port,
guint32 *capabilities);
/* Returns TRUE if the port was previously probed, FALSE if not */
gboolean mm_plugin_base_get_cached_product_info (MMPluginBase *self,
gboolean mm_plugin_base_get_cached_probe_result (MMPluginBase *self,
GUdevDevice *port,
guint32 *capabilities,
gchar **vendor,
gchar **product);