proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-03 21:17:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Add fu_plugin_get_devices() for general plugin use

Browse Source
This commit is contained in:
Richard Hughes 2021-01-13 14:01:17 +00:00
parent faf2afed02
commit 68ab1e44fd
4 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libfwupdplugin/fu-plugin.c
View File

@ -40,6 +40,7 @@ typedef struct {
guint order;
guint priority;
GPtrArray *rules[FU_PLUGIN_RULE_LAST];
GPtrArray *devices; /* (nullable) (element-type FuDevice) */
gchar *build_hash;
FuHwids *hwids;
FuQuirks *quirks;
@ -477,6 +478,15 @@ fu_plugin_build_device_update_error (FuPlugin *self)
return NULL;
}
static void
fu_plugin_ensure_devices (FuPlugin *self)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
if (priv->devices != NULL)
return;
priv->devices = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
}
/**
* fu_plugin_device_add:
* @self: A #FuPlugin
@ -495,6 +505,7 @@ fu_plugin_build_device_update_error (FuPlugin *self)
void
fu_plugin_device_add (FuPlugin *self, FuDevice *device)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
GPtrArray *children;
g_autoptr(GError) error = NULL;
@ -507,6 +518,10 @@ fu_plugin_device_add (FuPlugin *self, FuDevice *device)
return;
}
/* add to array */
fu_plugin_ensure_devices (self);
g_ptr_array_add (priv->devices, g_object_ref (device));
/* proxy to device where required */
if (fu_plugin_has_flag (self, FWUPD_PLUGIN_FLAG_CLEAR_UPDATABLE)) {
g_debug ("plugin %s has _CLEAR_UPDATABLE, so removing from %s",
@ -538,6 +553,26 @@ fu_plugin_device_add (FuPlugin *self, FuDevice *device)
}
}
/**
* fu_plugin_get_devices:
* @self: A #FuPlugin
*
* Returns all devices added by the plugin using fu_plugin_device_add() and
* not yet removed with fu_plugin_device_remove().
*
* Returns: (transfer none) (element-type FuDevice): devices
*
* Since: 1.5.6
**/
GPtrArray *
fu_plugin_get_devices (FuPlugin *self)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FU_IS_PLUGIN (self), NULL);
fu_plugin_ensure_devices (self);
return priv->devices;
}
/**
* fu_plugin_device_register:
* @self: A #FuPlugin
@ -584,9 +619,15 @@ fu_plugin_device_register (FuPlugin *self, FuDevice *device)
void
fu_plugin_device_remove (FuPlugin *self, FuDevice *device)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FU_IS_PLUGIN (self));
g_return_if_fail (FU_IS_DEVICE (device));
/* remove from array */
if (priv->devices != NULL)
g_ptr_array_remove (priv->devices, device);
g_debug ("emit removed from %s: %s",
fu_plugin_get_name (self),
fu_device_get_id (device));
@ -2906,6 +2947,8 @@ fu_plugin_finalize (GObject *object)
if (priv->rules[i] != NULL)
g_ptr_array_unref (priv->rules[i]);
}
if (priv->devices != NULL)
g_ptr_array_unref (priv->devices);
if (priv->usb_ctx != NULL)
g_object_unref (priv->usb_ctx);
if (priv->hwids != NULL)

1
libfwupdplugin/fu-plugin.h
View File

@ -140,6 +140,7 @@ gchar *fu_plugin_get_hwid_replace_value (FuPlugin *self,
const gchar *keys,
GError **error)
G_GNUC_WARN_UNUSED_RESULT;
GPtrArray *fu_plugin_get_devices (FuPlugin *self);
GPtrArray *fu_plugin_get_hwids (FuPlugin *self);
const gchar *fu_plugin_get_dmi_value (FuPlugin *self,
const gchar *dmi_id);

19
libfwupdplugin/fu-self-test.c
View File

@ -423,6 +423,24 @@ _plugin_device_added_cb (FuPlugin *plugin, FuDevice *device, gpointer user_data)
fu_test_loop_quit ();
}
static void
fu_plugin_devices_func (void)
{
g_autoptr(FuDevice) device = fu_device_new ();
g_autoptr(FuPlugin) plugin = fu_plugin_new ();
GPtrArray *devices;
devices = fu_plugin_get_devices (plugin);
g_assert_nonnull (devices);
g_assert_cmpint (devices->len, ==, 0);
fu_device_set_id (device, "testdev");
fu_plugin_device_add (plugin, device);
g_assert_cmpint (devices->len, ==, 1);
fu_plugin_device_remove (plugin, device);
g_assert_cmpint (devices->len, ==, 0);
}
static void
fu_plugin_delay_func (void)
{
@ -2129,6 +2147,7 @@ main (int argc, char **argv)
g_setenv ("FWUPD_LOCALSTATEDIR", "/tmp/fwupd-self-test/var", TRUE);
g_test_add_func ("/fwupd/security-attrs{hsi}", fu_security_attrs_hsi_func);
g_test_add_func ("/fwupd/plugin{devices}", fu_plugin_devices_func);
g_test_add_func ("/fwupd/plugin{delay}", fu_plugin_delay_func);
g_test_add_func ("/fwupd/plugin{quirks}", fu_plugin_quirks_func);
g_test_add_func ("/fwupd/plugin{quirks-performance}", fu_plugin_quirks_performance_func);

6
libfwupdplugin/fwupdplugin.map
View File

@ -721,3 +721,9 @@ LIBFWUPDPLUGIN_1.5.5 {
fu_firmware_image_get_checksum;
local: *;
} LIBFWUPDPLUGIN_1.5.4;
LIBFWUPDPLUGIN_1.5.6 {
global:
fu_plugin_get_devices;
local: *;
} LIBFWUPDPLUGIN_1.5.5;