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

Support more than one protocol for a given device

Browse Source 
Devices may want to support more than one protocol, and for some devices
(e.g. Unifying peripherals stuck in bootloader mode) you might not even be able
to query for the correct protocol anyway.
This commit is contained in:
Richard Hughes 2021-03-01 13:17:57 +00:00
parent 0724620f1e
commit b3f9841924
74 changed files with 248 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libfwupd/README.md
View File

@ -7,6 +7,7 @@ Planned API/ABI changes for next release
* Remove the deprecated flags like `FWUPD_DEVICE_FLAG_MD_SET_ICON` * Remove the deprecated flags like `FWUPD_DEVICE_FLAG_MD_SET_ICON`
* Remove `fwupd_release_get_uri()` and `fwupd_release_set_uri()` * Remove `fwupd_release_get_uri()` and `fwupd_release_set_uri()`
* Rename `fwupd_client_install_release2_async()` to `fwupd_client_install_release_async()` * Rename `fwupd_client_install_release2_async()` to `fwupd_client_install_release_async()`
* Remove fwupd_device_set_protocol() and fwupd_device_get_protocol()
Migration from Version 0.9.x Migration from Version 0.9.x
============================ ============================

130
libfwupd/fwupd-device.c
View File

@ -35,6 +35,7 @@ typedef struct {
guint64 flags; guint64 flags;
GPtrArray *guids; GPtrArray *guids;
GPtrArray *vendor_ids; GPtrArray *vendor_ids;
GPtrArray *protocols;
GPtrArray *instance_ids; GPtrArray *instance_ids;
GPtrArray *icons; GPtrArray *icons;
gchar *name; gchar *name;
@ -1184,6 +1185,8 @@ fwupd_device_set_plugin (FwupdDevice *device, const gchar *plugin)
* Returns: the protocol name, or %NULL if unset * Returns: the protocol name, or %NULL if unset
* *
* Since: 1.3.6 * Since: 1.3.6
*
* Deprecated: 1.5.8: Use fwupd_device_get_protocols() instead.
**/ **/
const gchar * const gchar *
fwupd_device_get_protocol (FwupdDevice *device) fwupd_device_get_protocol (FwupdDevice *device)
@ -1201,19 +1204,98 @@ fwupd_device_get_protocol (FwupdDevice *device)
* Sets the protocol that is used to update the device. * Sets the protocol that is used to update the device.
* *
* Since: 1.3.6 * Since: 1.3.6
*
* Deprecated: 1.5.8: Use fwupd_device_add_protocol() instead.
**/ **/
void void
fwupd_device_set_protocol (FwupdDevice *device, const gchar *protocol) fwupd_device_set_protocol (FwupdDevice *device, const gchar *protocol)
{ {
FwupdDevicePrivate *priv = GET_PRIVATE (device); g_auto(GStrv) protocols = NULL;
g_return_if_fail (FWUPD_IS_DEVICE (device)); g_return_if_fail (FWUPD_IS_DEVICE (device));
g_return_if_fail (protocol != NULL);
/* not changed */ /* add all */
if (g_strcmp0 (priv->protocol, protocol) == 0) protocols = g_strsplit (protocol, "|", -1);
for (guint i = 0; protocols[i] != NULL; i++)
fwupd_device_add_protocol (device, protocols[i]);
}
/**
* fwupd_device_get_protocols:
* @device: A #FwupdDevice
*
* Gets the device protocol.
*
* Returns: (element-type utf8) (transfer none): the device protocol
*
* Since: 1.5.8
**/
GPtrArray *
fwupd_device_get_protocols (FwupdDevice *device)
{
FwupdDevicePrivate *priv = GET_PRIVATE (device);
g_return_val_if_fail (FWUPD_IS_DEVICE (device), NULL);
return priv->protocols;
}
/**
* fwupd_device_has_protocol:
* @device: A #FwupdDevice
* @protocol: the ID, e.g. 'USB:0x1234'
*
* Finds out if the device has this specific protocol.
*
* Returns: %TRUE if the ID is found
*
* Since: 1.5.8
**/
gboolean
fwupd_device_has_protocol (FwupdDevice *device, const gchar *protocol)
{
FwupdDevicePrivate *priv = GET_PRIVATE (device);
g_return_val_if_fail (FWUPD_IS_DEVICE (device), FALSE);
g_return_val_if_fail (protocol != NULL, FALSE);
for (guint i = 0; i < priv->protocols->len; i++) {
const gchar *protocol_tmp = g_ptr_array_index (priv->protocols, i);
if (g_strcmp0 (protocol, protocol_tmp) == 0)
return TRUE;
}
return FALSE;
}
/**
* fwupd_device_add_protocol:
* @device: A #FwupdDevice
* @protocol: the ID, e.g. 'USB:0x1234'
*
* Adds a device protocol.
*
* Since: 1.5.8
**/
void
fwupd_device_add_protocol (FwupdDevice *device, const gchar *protocol)
{
FwupdDevicePrivate *priv = GET_PRIVATE (device);
g_auto(GStrv) protocols_tmp = NULL;
g_return_if_fail (FWUPD_IS_DEVICE (device));
g_return_if_fail (protocol != NULL);
if (fwupd_device_has_protocol (device, protocol))
return; return;
g_ptr_array_add (priv->protocols, g_strdup (protocol));
/* build for compatibility */
protocols_tmp = g_new0 (gchar *, priv->protocols->len + 1);
for (guint i = 0; i < priv->protocols->len; i++) {
const gchar *protocol_tmp = g_ptr_array_index (priv->protocols, i);
protocols_tmp[i] = g_strdup (protocol_tmp);
}
g_free (priv->protocol); g_free (priv->protocol);
priv->protocol = g_strdup (protocol); priv->protocol = g_strjoinv ("|", protocols_tmp);
} }
/** /**
@ -1435,8 +1517,10 @@ fwupd_device_incorporate (FwupdDevice *self, FwupdDevice *donor)
} }
if (priv->plugin == NULL) if (priv->plugin == NULL)
fwupd_device_set_plugin (self, priv_donor->plugin); fwupd_device_set_plugin (self, priv_donor->plugin);
if (priv->protocol == NULL) for (guint i = 0; i < priv_donor->protocols->len; i++) {
fwupd_device_set_protocol (self, priv_donor->protocol); const gchar *tmp = g_ptr_array_index (priv_donor->protocols, i);
fwupd_device_add_protocol (self, tmp);
}
if (priv->update_error == NULL) if (priv->update_error == NULL)
fwupd_device_set_update_error (self, priv_donor->update_error); fwupd_device_set_update_error (self, priv_donor->update_error);
if (priv->update_message == NULL) if (priv->update_message == NULL)
@ -1593,10 +1677,17 @@ fwupd_device_to_variant_full (FwupdDevice *device, FwupdDeviceFlags flags)
FWUPD_RESULT_KEY_PLUGIN, FWUPD_RESULT_KEY_PLUGIN,
g_variant_new_string (priv->plugin)); g_variant_new_string (priv->plugin));
} }
if (priv->protocol != NULL) { if (priv->protocols->len > 0) {
g_autoptr(GString) str = g_string_new (NULL);
for (guint i = 0; i < priv->protocols->len; i++) {
const gchar *tmp = g_ptr_array_index (priv->protocols, i);
g_string_append_printf (str, "%s|", tmp);
}
if (str->len > 0)
g_string_truncate (str, str->len - 1);
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
FWUPD_RESULT_KEY_PROTOCOL, FWUPD_RESULT_KEY_PROTOCOL,
g_variant_new_string (priv->protocol)); g_variant_new_string (str->str));
} }
if (priv->version != NULL) { if (priv->version != NULL) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
@ -1813,7 +1904,10 @@ fwupd_device_from_key_value (FwupdDevice *device, const gchar *key, GVariant *va
return; return;
} }
if (g_strcmp0 (key, FWUPD_RESULT_KEY_PROTOCOL) == 0) { if (g_strcmp0 (key, FWUPD_RESULT_KEY_PROTOCOL) == 0) {
fwupd_device_set_protocol (device, g_variant_get_string (value, NULL)); g_auto(GStrv) protocols = NULL;
protocols = g_strsplit (g_variant_get_string (value, NULL), "|", -1);
for (guint i = 0; protocols[i] != NULL; i++)
fwupd_device_add_protocol (device, protocols[i]);
return; return;
} }
if (g_strcmp0 (key, FWUPD_RESULT_KEY_VERSION) == 0) { if (g_strcmp0 (key, FWUPD_RESULT_KEY_VERSION) == 0) {
@ -2316,6 +2410,15 @@ fwupd_device_to_json (FwupdDevice *device, JsonBuilder *builder)
fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_BRANCH, priv->branch); fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_BRANCH, priv->branch);
fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_PLUGIN, priv->plugin); fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_PLUGIN, priv->plugin);
fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_PROTOCOL, priv->protocol); fwupd_device_json_add_string (builder, FWUPD_RESULT_KEY_PROTOCOL, priv->protocol);
if (priv->protocols->len > 1) { /* --> 0 when bumping API */
json_builder_set_member_name (builder, "VendorIds");
json_builder_begin_array (builder);
for (guint i = 0; i < priv->protocols->len; i++) {
const gchar *tmp = g_ptr_array_index (priv->protocols, i);
json_builder_add_string_value (builder, tmp);
}
json_builder_end_array (builder);
}
if (priv->flags != FWUPD_DEVICE_FLAG_NONE) { if (priv->flags != FWUPD_DEVICE_FLAG_NONE) {
json_builder_set_member_name (builder, FWUPD_RESULT_KEY_FLAGS); json_builder_set_member_name (builder, FWUPD_RESULT_KEY_FLAGS);
json_builder_begin_array (builder); json_builder_begin_array (builder);
@ -2461,7 +2564,10 @@ fwupd_device_to_string (FwupdDevice *device)
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DESCRIPTION, priv->description); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DESCRIPTION, priv->description);
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_BRANCH, priv->branch); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_BRANCH, priv->branch);
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_PLUGIN, priv->plugin); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_PLUGIN, priv->plugin);
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_PROTOCOL, priv->protocol); for (guint i = 0; i < priv->protocols->len; i++) {
const gchar *tmp = g_ptr_array_index (priv->protocols, i);
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_PROTOCOL, tmp);
}
fwupd_pad_kv_dfl (str, FWUPD_RESULT_KEY_FLAGS, priv->flags); fwupd_pad_kv_dfl (str, FWUPD_RESULT_KEY_FLAGS, priv->flags);
for (guint i = 0; i < priv->checksums->len; i++) { for (guint i = 0; i < priv->checksums->len; i++) {
const gchar *checksum = g_ptr_array_index (priv->checksums, i); const gchar *checksum = g_ptr_array_index (priv->checksums, i);
@ -2563,7 +2669,7 @@ fwupd_device_set_property (GObject *object, guint prop_id,
fwupd_device_set_flags (self, g_value_get_uint64 (value)); fwupd_device_set_flags (self, g_value_get_uint64 (value));
break; break;
case PROP_PROTOCOL: case PROP_PROTOCOL:
fwupd_device_set_protocol (self, g_value_get_string (value)); fwupd_device_add_protocol (self, g_value_get_string (value));
break; break;
case PROP_STATUS: case PROP_STATUS:
fwupd_device_set_status (self, g_value_get_uint (value)); fwupd_device_set_status (self, g_value_get_uint (value));
@ -2644,6 +2750,7 @@ fwupd_device_init (FwupdDevice *device)
priv->icons = g_ptr_array_new_with_free_func (g_free); priv->icons = g_ptr_array_new_with_free_func (g_free);
priv->checksums = g_ptr_array_new_with_free_func (g_free); priv->checksums = g_ptr_array_new_with_free_func (g_free);
priv->vendor_ids = g_ptr_array_new_with_free_func (g_free); priv->vendor_ids = g_ptr_array_new_with_free_func (g_free);
priv->protocols = g_ptr_array_new_with_free_func (g_free);
priv->children = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); priv->children = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
priv->releases = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); priv->releases = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
} }
@ -2682,6 +2789,7 @@ fwupd_device_finalize (GObject *object)
g_free (priv->version_bootloader); g_free (priv->version_bootloader);
g_ptr_array_unref (priv->guids); g_ptr_array_unref (priv->guids);
g_ptr_array_unref (priv->vendor_ids); g_ptr_array_unref (priv->vendor_ids);
g_ptr_array_unref (priv->protocols);
g_ptr_array_unref (priv->instance_ids); g_ptr_array_unref (priv->instance_ids);
g_ptr_array_unref (priv->icons); g_ptr_array_unref (priv->icons);
g_ptr_array_unref (priv->checksums); g_ptr_array_unref (priv->checksums);

7
libfwupd/fwupd-device.h
View File

@ -107,9 +107,16 @@ void fwupd_device_add_checksum (FwupdDevice *device,
const gchar *fwupd_device_get_plugin (FwupdDevice *device); const gchar *fwupd_device_get_plugin (FwupdDevice *device);
void fwupd_device_set_plugin (FwupdDevice *device, void fwupd_device_set_plugin (FwupdDevice *device,
const gchar *plugin); const gchar *plugin);
G_DEPRECATED_FOR(fwupd_device_get_protocols)
const gchar *fwupd_device_get_protocol (FwupdDevice *device); const gchar *fwupd_device_get_protocol (FwupdDevice *device);
G_DEPRECATED_FOR(fwupd_device_add_protocol)
void fwupd_device_set_protocol (FwupdDevice *device, void fwupd_device_set_protocol (FwupdDevice *device,
const gchar *protocol); const gchar *protocol);
void fwupd_device_add_protocol (FwupdDevice *device,
const gchar *protocol);
gboolean fwupd_device_has_protocol (FwupdDevice *device,
const gchar *protocol);
GPtrArray *fwupd_device_get_protocols (FwupdDevice *device);
const gchar *fwupd_device_get_vendor (FwupdDevice *device); const gchar *fwupd_device_get_vendor (FwupdDevice *device);
void fwupd_device_set_vendor (FwupdDevice *device, void fwupd_device_set_vendor (FwupdDevice *device,
const gchar *vendor); const gchar *vendor);

8
libfwupd/fwupd.map
View File

@ -648,3 +648,11 @@ LIBFWUPD_1.5.6 {
fwupd_release_get_locations; fwupd_release_get_locations;
local: *; local: *;
} LIBFWUPD_1.5.5; } LIBFWUPD_1.5.5;
LIBFWUPD_1.5.8 {
global:
fwupd_device_add_protocol;
fwupd_device_get_protocols;
fwupd_device_has_protocol;
local: *;
} LIBFWUPD_1.5.6;

1
libfwupdplugin/README.md
View File

@ -9,3 +9,4 @@ Planned API/ABI changes for next release
* Remove FuHidDevice->open() and FuHidDevice->close() * Remove FuHidDevice->open() and FuHidDevice->close()
* Remove FuUsbDevice->probe(), FuUsbDevice->open() and FuUsbDevice->close() * Remove FuUsbDevice->probe(), FuUsbDevice->open() and FuUsbDevice->close()
* Remove FuUdevDevice->to_string(), FuUdevDevice->probe(), FuUdevDevice->open() and FuUdevDevice->close() * Remove FuUdevDevice->to_string(), FuUdevDevice->probe(), FuUdevDevice->open() and FuUdevDevice->close()
* Remove fu_device_get_protocol() and fu_device_set_protocol()

9
libfwupdplugin/fu-device.c
View File

@ -1156,7 +1156,9 @@ fu_device_set_quirk_kv (FuDevice *self,
return TRUE; return TRUE;
} }
if (g_strcmp0 (key, FU_QUIRKS_PROTOCOL) == 0) { if (g_strcmp0 (key, FU_QUIRKS_PROTOCOL) == 0) {
fu_device_set_protocol (self, value); g_auto(GStrv) sections = g_strsplit (value, ",", -1);
for (guint i = 0; sections[i] != NULL; i++)
fu_device_add_protocol (self, sections[i]);
return TRUE; return TRUE;
} }
if (g_strcmp0 (key, FU_QUIRKS_VERSION) == 0) { if (g_strcmp0 (key, FU_QUIRKS_VERSION) == 0) {
@ -2164,7 +2166,10 @@ const gchar *
fu_device_get_protocol (FuDevice *self) fu_device_get_protocol (FuDevice *self)
{ {
g_return_val_if_fail (FU_IS_DEVICE (self), NULL); g_return_val_if_fail (FU_IS_DEVICE (self), NULL);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return fwupd_device_get_protocol (FWUPD_DEVICE (self)); return fwupd_device_get_protocol (FWUPD_DEVICE (self));
#pragma GCC diagnostic pop
} }
/** /**
@ -2180,7 +2185,7 @@ void
fu_device_set_protocol (FuDevice *self, const gchar *protocol) fu_device_set_protocol (FuDevice *self, const gchar *protocol)
{ {
g_return_if_fail (FU_IS_DEVICE (self)); g_return_if_fail (FU_IS_DEVICE (self));
fwupd_device_set_protocol (FWUPD_DEVICE (self), protocol); fwupd_device_add_protocol (FWUPD_DEVICE (self), protocol);
} }
/** /**

5
libfwupdplugin/fu-device.h
View File

@ -143,6 +143,7 @@ FuDevice *fu_device_new (void);
#define fu_device_has_flag(d,v) fwupd_device_has_flag(FWUPD_DEVICE(d),v) #define fu_device_has_flag(d,v) fwupd_device_has_flag(FWUPD_DEVICE(d),v)
#define fu_device_has_instance_id(d,v) fwupd_device_has_instance_id(FWUPD_DEVICE(d),v) #define fu_device_has_instance_id(d,v) fwupd_device_has_instance_id(FWUPD_DEVICE(d),v)
#define fu_device_has_vendor_id(d,v) fwupd_device_has_vendor_id(FWUPD_DEVICE(d),v) #define fu_device_has_vendor_id(d,v) fwupd_device_has_vendor_id(FWUPD_DEVICE(d),v)
#define fu_device_has_protocol(d,v) fwupd_device_has_protocol(FWUPD_DEVICE(d),v)
#define fu_device_add_checksum(d,v) fwupd_device_add_checksum(FWUPD_DEVICE(d),v) #define fu_device_add_checksum(d,v) fwupd_device_add_checksum(FWUPD_DEVICE(d),v)
#define fu_device_add_release(d,v) fwupd_device_add_release(FWUPD_DEVICE(d),v) #define fu_device_add_release(d,v) fwupd_device_add_release(FWUPD_DEVICE(d),v)
#define fu_device_add_icon(d,v) fwupd_device_add_icon(FWUPD_DEVICE(d),v) #define fu_device_add_icon(d,v) fwupd_device_add_icon(FWUPD_DEVICE(d),v)
@ -160,6 +161,7 @@ FuDevice *fu_device_new (void);
#define fu_device_set_update_state(d,v) fwupd_device_set_update_state(FWUPD_DEVICE(d),v) #define fu_device_set_update_state(d,v) fwupd_device_set_update_state(FWUPD_DEVICE(d),v)
#define fu_device_set_vendor(d,v) fwupd_device_set_vendor(FWUPD_DEVICE(d),v) #define fu_device_set_vendor(d,v) fwupd_device_set_vendor(FWUPD_DEVICE(d),v)
#define fu_device_add_vendor_id(d,v) fwupd_device_add_vendor_id(FWUPD_DEVICE(d),v) #define fu_device_add_vendor_id(d,v) fwupd_device_add_vendor_id(FWUPD_DEVICE(d),v)
#define fu_device_add_protocol(d,v) fwupd_device_add_protocol(FWUPD_DEVICE(d),v)
#define fu_device_set_version_raw(d,v) fwupd_device_set_version_raw(FWUPD_DEVICE(d),v) #define fu_device_set_version_raw(d,v) fwupd_device_set_version_raw(FWUPD_DEVICE(d),v)
#define fu_device_set_version_lowest_raw(d,v) fwupd_device_set_version_lowest_raw(FWUPD_DEVICE(d),v) #define fu_device_set_version_lowest_raw(d,v) fwupd_device_set_version_lowest_raw(FWUPD_DEVICE(d),v)
#define fu_device_set_version_bootloader_raw(d,v) fwupd_device_set_version_bootloader_raw(FWUPD_DEVICE(d),v) #define fu_device_set_version_bootloader_raw(d,v) fwupd_device_set_version_bootloader_raw(FWUPD_DEVICE(d),v)
@ -190,6 +192,7 @@ FuDevice *fu_device_new (void);
#define fu_device_get_version_lowest_raw(d) fwupd_device_get_version_lowest_raw(FWUPD_DEVICE(d)) #define fu_device_get_version_lowest_raw(d) fwupd_device_get_version_lowest_raw(FWUPD_DEVICE(d))
#define fu_device_get_version_bootloader_raw(d) fwupd_device_get_version_bootloader_raw(FWUPD_DEVICE(d)) #define fu_device_get_version_bootloader_raw(d) fwupd_device_get_version_bootloader_raw(FWUPD_DEVICE(d))
#define fu_device_get_vendor_ids(d) fwupd_device_get_vendor_ids(FWUPD_DEVICE(d)) #define fu_device_get_vendor_ids(d) fwupd_device_get_vendor_ids(FWUPD_DEVICE(d))
#define fu_device_get_protocols(d) fwupd_device_get_protocols(FWUPD_DEVICE(d))
#define fu_device_get_flashes_left(d) fwupd_device_get_flashes_left(FWUPD_DEVICE(d)) #define fu_device_get_flashes_left(d) fwupd_device_get_flashes_left(FWUPD_DEVICE(d))
#define fu_device_get_install_duration(d) fwupd_device_get_install_duration(FWUPD_DEVICE(d)) #define fu_device_get_install_duration(d) fwupd_device_get_install_duration(FWUPD_DEVICE(d))
@ -292,7 +295,9 @@ void fu_device_set_backend_id (FuDevice *self,
const gchar *fu_device_get_proxy_guid (FuDevice *self); const gchar *fu_device_get_proxy_guid (FuDevice *self);
void fu_device_set_proxy_guid (FuDevice *self, void fu_device_set_proxy_guid (FuDevice *self,
const gchar *proxy_guid); const gchar *proxy_guid);
G_DEPRECATED_FOR(fu_device_get_protocols)
const gchar *fu_device_get_protocol (FuDevice *self); const gchar *fu_device_get_protocol (FuDevice *self);
G_DEPRECATED_FOR(fu_device_add_protocol)
void fu_device_set_protocol (FuDevice *self, void fu_device_set_protocol (FuDevice *self,
const gchar *protocol); const gchar *protocol);
guint fu_device_get_priority (FuDevice *self); guint fu_device_get_priority (FuDevice *self);

2
plugins/altos/fu-altos-device.c
View File

@ -560,7 +560,7 @@ fu_altos_device_init (FuAltosDevice *self)
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_vendor (FU_DEVICE (self), "altusmetrum.org"); fu_device_set_vendor (FU_DEVICE (self), "altusmetrum.org");
fu_device_set_summary (FU_DEVICE (self), "A USB hardware random number generator"); fu_device_set_summary (FU_DEVICE (self), "A USB hardware random number generator");
fu_device_set_protocol (FU_DEVICE (self), "org.altusmetrum.altos"); fu_device_add_protocol (FU_DEVICE (self), "org.altusmetrum.altos");
/* requires manual step */ /* requires manual step */
if (!fu_device_has_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER)) if (!fu_device_has_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER))

2
plugins/ata/fu-ata-device.c
View File

@ -826,7 +826,7 @@ fu_ata_device_init (FuAtaDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_summary (FU_DEVICE (self), "ATA Drive"); fu_device_set_summary (FU_DEVICE (self), "ATA Drive");
fu_device_add_icon (FU_DEVICE (self), "drive-harddisk"); fu_device_add_icon (FU_DEVICE (self), "drive-harddisk");
fu_device_set_protocol (FU_DEVICE (self), "org.t13.ata"); fu_device_add_protocol (FU_DEVICE (self), "org.t13.ata");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_udev_device_set_flags (FU_UDEV_DEVICE (self), FU_UDEV_DEVICE_FLAG_OPEN_READ); fu_udev_device_set_flags (FU_UDEV_DEVICE (self), FU_UDEV_DEVICE_FLAG_OPEN_READ);
} }

2
plugins/bcm57xx/fu-bcm57xx-device.c
View File

@ -612,7 +612,7 @@ fu_bcm57xx_device_close (FuDevice *device, GError **error)
static void static void
fu_bcm57xx_device_init (FuBcm57xxDevice *self) fu_bcm57xx_device_init (FuBcm57xxDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.broadcom.bcm57xx"); fu_device_add_protocol (FU_DEVICE (self), "com.broadcom.bcm57xx");
fu_device_add_icon (FU_DEVICE (self), "network-wired"); fu_device_add_icon (FU_DEVICE (self), "network-wired");
/* other values are set from a quirk */ /* other values are set from a quirk */

2
plugins/bcm57xx/fu-bcm57xx-recovery-device.c
View File

@ -722,7 +722,7 @@ fu_bcm57xx_recovery_device_init (FuBcm57xxRecoveryDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NEEDS_REBOOT); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NEEDS_REBOOT);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_BACKUP_BEFORE_INSTALL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_BACKUP_BEFORE_INSTALL);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IGNORE_VALIDATION); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IGNORE_VALIDATION);
fu_device_set_protocol (FU_DEVICE (self), "com.broadcom.bcm57xx"); fu_device_add_protocol (FU_DEVICE (self), "com.broadcom.bcm57xx");
fu_device_add_icon (FU_DEVICE (self), "network-wired"); fu_device_add_icon (FU_DEVICE (self), "network-wired");
fu_device_set_logical_id (FU_DEVICE (self), "recovery"); fu_device_set_logical_id (FU_DEVICE (self), "recovery");

2
plugins/ccgx/fu-ccgx-dmc-device.c
View File

@ -647,7 +647,7 @@ fu_ccgx_dmc_device_init (FuCcgxDmcDevice *self)
{ {
self->ep_intr_in = DMC_INTERRUPT_PIPE_ID; self->ep_intr_in = DMC_INTERRUPT_PIPE_ID;
self->ep_bulk_out = DMC_BULK_PIPE_ID; self->ep_bulk_out = DMC_BULK_PIPE_ID;
fu_device_set_protocol (FU_DEVICE (self), "com.cypress.ccgx.dmc"); fu_device_add_protocol (FU_DEVICE (self), "com.cypress.ccgx.dmc");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE);

2
plugins/ccgx/fu-ccgx-hid-device.c
View File

@ -75,7 +75,7 @@ fu_ccgx_hid_device_setup (FuDevice *device, GError **error)
static void static void
fu_ccgx_hid_device_init (FuCcgxHidDevice *self) fu_ccgx_hid_device_init (FuCcgxHidDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.cypress.ccgx"); fu_device_add_protocol (FU_DEVICE (self), "com.cypress.ccgx");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_WILL_DISAPPEAR); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_WILL_DISAPPEAR);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);

2
plugins/ccgx/fu-ccgx-hpi-device.c
View File

@ -1585,7 +1585,7 @@ fu_ccgx_hpi_device_init (FuCcgxHpiDevice *self)
self->ep_bulk_out = PD_I2C_USB_EP_BULK_OUT; self->ep_bulk_out = PD_I2C_USB_EP_BULK_OUT;
self->ep_bulk_in = PD_I2C_USB_EP_BULK_IN; self->ep_bulk_in = PD_I2C_USB_EP_BULK_IN;
self->ep_intr_in = PD_I2C_USB_EP_INTR_IN; self->ep_intr_in = PD_I2C_USB_EP_INTR_IN;
fu_device_set_protocol (FU_DEVICE (self), "com.cypress.ccgx"); fu_device_add_protocol (FU_DEVICE (self), "com.cypress.ccgx");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE);

2
plugins/colorhug/fu-colorhug-device.c
View File

@ -480,7 +480,7 @@ fu_colorhug_device_init (FuColorhugDevice *self)
{ {
/* this is the application code */ /* this is the application code */
self->start_addr = CH_EEPROM_ADDR_RUNCODE; self->start_addr = CH_EEPROM_ADDR_RUNCODE;
fu_device_set_protocol (FU_DEVICE (self), "com.hughski.colorhug"); fu_device_add_protocol (FU_DEVICE (self), "com.hughski.colorhug");
fu_device_set_remove_delay (FU_DEVICE (self), fu_device_set_remove_delay (FU_DEVICE (self),
FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);

2
plugins/cros-ec/fu-cros-ec-usb-device.c
View File

@ -950,7 +950,7 @@ fu_cros_ec_usb_device_detach (FuDevice *device, GError **error)
static void static void
fu_cros_ec_usb_device_init (FuCrosEcUsbDevice *device) fu_cros_ec_usb_device_init (FuCrosEcUsbDevice *device)
{ {
fu_device_set_protocol (FU_DEVICE (device), "com.google.usb.crosec"); fu_device_add_protocol (FU_DEVICE (device), "com.google.usb.crosec");
fu_device_add_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_internal_flag (FU_DEVICE (device), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (device), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_set_version_format (FU_DEVICE (device), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (device), FWUPD_VERSION_FORMAT_TRIPLET);

2
plugins/dell-dock/fu-dell-dock-hub.c
View File

@ -40,7 +40,7 @@ fu_dell_dock_hub_probe (FuDevice *device, GError **error)
fu_device_set_logical_id (device, "hub"); fu_device_set_logical_id (device, "hub");
fu_device_add_instance_id (device, devid); fu_device_add_instance_id (device, devid);
fu_device_set_protocol (device, "com.dell.dock"); fu_device_add_protocol (device, "com.dell.dock");
return TRUE; return TRUE;
} }

2
plugins/dell-dock/fu-dell-dock-i2c-ec.c
View File

@ -956,7 +956,7 @@ fu_dell_dock_ec_init (FuDellDockEc *self)
{ {
self->data = g_new0 (FuDellDockDockDataStructure, 1); self->data = g_new0 (FuDellDockDockDataStructure, 1);
self->raw_versions = g_new0 (FuDellDockDockPackageFWVersion, 1); self->raw_versions = g_new0 (FuDellDockDockPackageFWVersion, 1);
fu_device_set_protocol (FU_DEVICE (self), "com.dell.dock"); fu_device_add_protocol (FU_DEVICE (self), "com.dell.dock");
} }
static void static void

2
plugins/dell-dock/fu-dell-dock-i2c-mst.c
View File

@ -965,7 +965,7 @@ fu_dell_dock_mst_close (FuDevice *device, GError **error)
static void static void
fu_dell_dock_mst_init (FuDellDockMst *self) fu_dell_dock_mst_init (FuDellDockMst *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.mst"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.mst");
} }
static void static void

2
plugins/dell-dock/fu-dell-dock-i2c-tbt.c
View File

@ -276,7 +276,7 @@ fu_dell_dock_tbt_finalize (GObject *object)
static void static void
fu_dell_dock_tbt_init (FuDellDockTbt *self) fu_dell_dock_tbt_init (FuDellDockTbt *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.intel.thunderbolt"); fu_device_add_protocol (FU_DEVICE (self), "com.intel.thunderbolt");
} }
static void static void

2
plugins/dell-dock/fu-dell-dock-status.c
View File

@ -144,7 +144,7 @@ fu_dell_dock_status_finalize (GObject *object)
static void static void
fu_dell_dock_status_init (FuDellDockStatus *self) fu_dell_dock_status_init (FuDellDockStatus *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.dell.dock"); fu_device_add_protocol (FU_DEVICE (self), "com.dell.dock");
} }
static void static void

2
plugins/dfu-csr/fu-dfu-csr-device.c
View File

@ -433,7 +433,7 @@ fu_dfu_csr_device_setup (FuDevice *device, GError **error)
static void static void
fu_dfu_csr_device_init (FuDfuCsrDevice *self) fu_dfu_csr_device_init (FuDfuCsrDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.qualcomm.dfu"); fu_device_add_protocol (FU_DEVICE (self), "com.qualcomm.dfu");
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
} }

4
plugins/dfu/fu-dfu-device.c
View File

@ -350,9 +350,9 @@ fu_dfu_device_add_targets (FuDfuDevice *self, GError **error)
/* set expected protocol */ /* set expected protocol */
if (priv->version == DFU_VERSION_DFUSE) { if (priv->version == DFU_VERSION_DFUSE) {
fu_device_set_protocol (FU_DEVICE (self), "com.st.dfuse"); fu_device_add_protocol (FU_DEVICE (self), "com.st.dfuse");
} else { } else {
fu_device_set_protocol (FU_DEVICE (self), "org.usb.dfu"); fu_device_add_protocol (FU_DEVICE (self), "org.usb.dfu");
} }
/* fix up the transfer size */ /* fix up the transfer size */

2
plugins/ebitdo/fu-ebitdo-device.c
View File

@ -596,7 +596,7 @@ fu_ebitdo_device_prepare_firmware (FuDevice *device,
static void static void
fu_ebitdo_device_init (FuEbitdoDevice *self) fu_ebitdo_device_init (FuEbitdoDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.8bitdo"); fu_device_add_protocol (FU_DEVICE (self), "com.8bitdo");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
} }

2
plugins/elantp/fu-elantp-hid-device.c
View File

@ -550,7 +550,7 @@ fu_elantp_hid_device_init (FuElantpHidDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_summary (FU_DEVICE (self), "Elan Touchpad"); fu_device_set_summary (FU_DEVICE (self), "Elan Touchpad");
fu_device_add_icon (FU_DEVICE (self), "input-touchpad"); fu_device_add_icon (FU_DEVICE (self), "input-touchpad");
fu_device_set_protocol (FU_DEVICE (self), "tw.com.emc.elantp"); fu_device_add_protocol (FU_DEVICE (self), "tw.com.emc.elantp");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_HEX); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_HEX);
fu_device_set_priority (FU_DEVICE (self), 1); /* better than i2c */ fu_device_set_priority (FU_DEVICE (self), 1); /* better than i2c */
fu_udev_device_set_flags (FU_UDEV_DEVICE (self), fu_udev_device_set_flags (FU_UDEV_DEVICE (self),

2
plugins/elantp/fu-elantp-i2c-device.c
View File

@ -624,7 +624,7 @@ fu_elantp_i2c_device_init (FuElantpI2cDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_summary (FU_DEVICE (self), "Elan Touchpad (I²C Recovery)"); fu_device_set_summary (FU_DEVICE (self), "Elan Touchpad (I²C Recovery)");
fu_device_add_icon (FU_DEVICE (self), "input-touchpad"); fu_device_add_icon (FU_DEVICE (self), "input-touchpad");
fu_device_set_protocol (FU_DEVICE (self), "tw.com.emc.elantp"); fu_device_add_protocol (FU_DEVICE (self), "tw.com.emc.elantp");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_HEX); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_HEX);
fu_udev_device_set_flags (FU_UDEV_DEVICE (self), fu_udev_device_set_flags (FU_UDEV_DEVICE (self),
FU_UDEV_DEVICE_FLAG_OPEN_READ | FU_UDEV_DEVICE_FLAG_OPEN_READ |

2
plugins/emmc/fu-emmc-device.c
View File

@ -495,7 +495,7 @@ fu_emmc_device_write_firmware (FuDevice *device,
static void static void
fu_emmc_device_init (FuEmmcDevice *self) fu_emmc_device_init (FuEmmcDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "org.jedec.mmc"); fu_device_add_protocol (FU_DEVICE (self), "org.jedec.mmc");
fu_device_add_icon (FU_DEVICE (self), "media-memory"); fu_device_add_icon (FU_DEVICE (self), "media-memory");
} }

2
plugins/ep963x/fu-ep963x-device.c
View File

@ -319,7 +319,7 @@ static void
fu_ep963x_device_init (FuEp963xDevice *self) fu_ep963x_device_init (FuEp963xDevice *self)
{ {
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_protocol (FU_DEVICE (self), "tw.com.exploretech.ep963x"); fu_device_add_protocol (FU_DEVICE (self), "tw.com.exploretech.ep963x");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_NUMBER); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_NUMBER);
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_set_firmware_size (FU_DEVICE (self), FU_EP963_FIRMWARE_SIZE); fu_device_set_firmware_size (FU_DEVICE (self), FU_EP963_FIRMWARE_SIZE);

2
plugins/fastboot/fu-fastboot-device.c
View File

@ -708,7 +708,7 @@ fu_fastboot_device_init (FuFastbootDevice *self)
{ {
/* this is a safe default, even using USBv1 */ /* this is a safe default, even using USBv1 */
self->blocksz = 512; self->blocksz = 512;
fu_device_set_protocol (FU_DEVICE (self), "com.google.fastboot"); fu_device_add_protocol (FU_DEVICE (self), "com.google.fastboot");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);

2
plugins/flashrom/fu-flashrom-device.c
View File

@ -17,7 +17,7 @@ G_DEFINE_TYPE (FuFlashromDevice, fu_flashrom_device, FU_TYPE_DEVICE)
static void static void
fu_flashrom_device_init (FuFlashromDevice *self) fu_flashrom_device_init (FuFlashromDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "org.flashrom"); fu_device_add_protocol (FU_DEVICE (self), "org.flashrom");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NEEDS_REBOOT); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NEEDS_REBOOT);

2
plugins/fresco-pd/fu-fresco-pd-device.c
View File

@ -388,7 +388,7 @@ fu_fresco_pd_device_init (FuFrescoPdDevice *self)
fu_device_add_icon (FU_DEVICE (self), "audio-card"); fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_protocol (FU_DEVICE (self), "com.frescologic.pd"); fu_device_add_protocol (FU_DEVICE (self), "com.frescologic.pd");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD);
fu_device_set_install_duration (FU_DEVICE (self), 15); fu_device_set_install_duration (FU_DEVICE (self), 15);
fu_device_set_remove_delay (FU_DEVICE (self), 20000); fu_device_set_remove_delay (FU_DEVICE (self), 20000);

2
plugins/goodix-moc/fu-goodixmoc-device.c
View File

@ -413,7 +413,7 @@ fu_goodixmoc_device_init (FuGoodixMocDevice *self)
fu_device_add_flag (FU_DEVICE(self), FWUPD_DEVICE_FLAG_USE_RUNTIME_VERSION); fu_device_add_flag (FU_DEVICE(self), FWUPD_DEVICE_FLAG_USE_RUNTIME_VERSION);
fu_device_set_version_format (FU_DEVICE(self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE(self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_remove_delay (FU_DEVICE(self), 5000); fu_device_set_remove_delay (FU_DEVICE(self), 5000);
fu_device_set_protocol (FU_DEVICE (self), "com.goodix.goodixmoc"); fu_device_add_protocol (FU_DEVICE (self), "com.goodix.goodixmoc");
fu_device_set_name (FU_DEVICE(self), "Fingerprint Sensor"); fu_device_set_name (FU_DEVICE(self), "Fingerprint Sensor");
fu_device_set_summary (FU_DEVICE(self), "Match-On-Chip Fingerprint Sensor"); fu_device_set_summary (FU_DEVICE(self), "Match-On-Chip Fingerprint Sensor");
fu_device_set_vendor (FU_DEVICE(self), "Goodix"); fu_device_set_vendor (FU_DEVICE(self), "Goodix");

2
plugins/hailuck/fu-hailuck-bl-device.c
View File

@ -265,7 +265,7 @@ static void
fu_hailuck_bl_device_init (FuHailuckBlDevice *self) fu_hailuck_bl_device_init (FuHailuckBlDevice *self)
{ {
fu_device_set_firmware_size (FU_DEVICE (self), 0x4000); fu_device_set_firmware_size (FU_DEVICE (self), 0x4000);
fu_device_set_protocol (FU_DEVICE (self), "com.hailuck.kbd"); fu_device_add_protocol (FU_DEVICE (self), "com.hailuck.kbd");
fu_device_set_name (FU_DEVICE (self), "Keyboard [bootloader]"); fu_device_set_name (FU_DEVICE (self), "Keyboard [bootloader]");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);

2
plugins/hailuck/fu-hailuck-kbd-device.c
View File

@ -67,7 +67,7 @@ static void
fu_hailuck_kbd_device_init (FuHailuckKbdDevice *self) fu_hailuck_kbd_device_init (FuHailuckKbdDevice *self)
{ {
fu_device_set_firmware_size (FU_DEVICE (self), 0x4000); fu_device_set_firmware_size (FU_DEVICE (self), 0x4000);
fu_device_set_protocol (FU_DEVICE (self), "com.hailuck.kbd"); fu_device_add_protocol (FU_DEVICE (self), "com.hailuck.kbd");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);

2
plugins/hailuck/fu-hailuck-tp-device.c
View File

@ -202,7 +202,7 @@ fu_hailuck_tp_device_init (FuHailuckTpDevice *self)
{ {
fu_device_retry_set_delay (FU_DEVICE (self), 50); /* ms */ fu_device_retry_set_delay (FU_DEVICE (self), 50); /* ms */
fu_device_set_firmware_size (FU_DEVICE (self), 0x6018); fu_device_set_firmware_size (FU_DEVICE (self), 0x6018);
fu_device_set_protocol (FU_DEVICE (self), "com.hailuck.tp"); fu_device_add_protocol (FU_DEVICE (self), "com.hailuck.tp");
fu_device_set_logical_id (FU_DEVICE (self), "TP"); fu_device_set_logical_id (FU_DEVICE (self), "TP");
fu_device_set_name (FU_DEVICE (self), "Touchpad"); fu_device_set_name (FU_DEVICE (self), "Touchpad");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);

2
plugins/jabra/fu-jabra-device.c
View File

@ -150,7 +150,7 @@ fu_jabra_device_init (FuJabraDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_set_remove_delay (FU_DEVICE (self), 20000); /* 10+10s! */ fu_device_set_remove_delay (FU_DEVICE (self), 20000); /* 10+10s! */
fu_device_set_protocol (FU_DEVICE (self), "org.usb.dfu"); fu_device_add_protocol (FU_DEVICE (self), "org.usb.dfu");
} }
static void static void

4
plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c
View File

@ -251,9 +251,9 @@ fu_logitech_hidpp_bootloader_set_bl_version (FuLogitechHidPpBootloader *self, GE
if ((major == 0x01 && minor >= 0x04) || if ((major == 0x01 && minor >= 0x04) ||
(major == 0x03 && minor >= 0x02)) (major == 0x03 && minor >= 0x02))
fu_device_set_protocol (FU_DEVICE (self), "com.logitech.unifyingsigned"); fu_device_add_protocol (FU_DEVICE (self), "com.logitech.unifyingsigned");
else else
fu_device_set_protocol (FU_DEVICE (self), "com.logitech.unifying"); fu_device_add_protocol (FU_DEVICE (self), "com.logitech.unifying");
return TRUE; return TRUE;
} }

8
plugins/logitech-hidpp/fu-logitech-hidpp-peripheral.c
View File

@ -585,6 +585,7 @@ fu_logitech_hidpp_peripheral_setup (FuDevice *device, GError **error)
if (idx != 0x00) { if (idx != 0x00) {
self->is_updatable = TRUE; self->is_updatable = TRUE;
fu_device_remove_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER); fu_device_remove_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
fu_device_add_protocol (FU_DEVICE (self), "com.logitech.unifying");
} }
idx = fu_logitech_hidpp_peripheral_feature_get_idx (self, HIDPP_FEATURE_DFU_CONTROL_SIGNED); idx = fu_logitech_hidpp_peripheral_feature_get_idx (self, HIDPP_FEATURE_DFU_CONTROL_SIGNED);
if (idx != 0x00) { if (idx != 0x00) {
@ -605,7 +606,7 @@ fu_logitech_hidpp_peripheral_setup (FuDevice *device, GError **error)
self->is_updatable = TRUE; self->is_updatable = TRUE;
fu_device_remove_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER); fu_device_remove_flag (FU_DEVICE (device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
} }
fu_device_set_protocol (FU_DEVICE (device), "com.logitech.unifyingsigned"); fu_device_add_protocol (FU_DEVICE (device), "com.logitech.unifyingsigned");
} }
idx = fu_logitech_hidpp_peripheral_feature_get_idx (self, HIDPP_FEATURE_DFU); idx = fu_logitech_hidpp_peripheral_feature_get_idx (self, HIDPP_FEATURE_DFU);
if (idx != 0x00) { if (idx != 0x00) {
@ -615,6 +616,10 @@ fu_logitech_hidpp_peripheral_setup (FuDevice *device, GError **error)
g_debug ("repairing device in bootloader mode"); g_debug ("repairing device in bootloader mode");
fu_device_set_version (FU_DEVICE (device), "MPK00.00_B0000"); fu_device_set_version (FU_DEVICE (device), "MPK00.00_B0000");
} }
/* we do not actually know which protocol when in recovery mode,
* so force the metadata to have the specific regex set up */
fu_device_add_protocol (FU_DEVICE (self), "com.logitech.unifying");
fu_device_add_protocol (FU_DEVICE (self), "com.logitech.unifyingsigned");
} }
/* this device may have changed state */ /* this device may have changed state */
@ -1049,7 +1054,6 @@ fu_logitech_hidpp_peripheral_init (FuLogitechHidPpPeripheral *self)
self->feature_index = g_ptr_array_new_with_free_func (g_free); self->feature_index = g_ptr_array_new_with_free_func (g_free);
fu_device_add_parent_guid (FU_DEVICE (self), "HIDRAW\\VEN_046D&DEV_C52B"); fu_device_add_parent_guid (FU_DEVICE (self), "HIDRAW\\VEN_046D&DEV_C52B");
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_set_protocol (FU_DEVICE (self), "com.logitech.unifying");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
/* there are a lot of unifying peripherals, but not all respond /* there are a lot of unifying peripherals, but not all respond

4
plugins/logitech-hidpp/fu-logitech-hidpp-runtime.c
View File

@ -234,11 +234,11 @@ fu_logitech_hidpp_runtime_setup_internal (FuDevice *device, GError **error)
if ((self->version_bl_major == 0x01 && config[8] >= 0x04) || if ((self->version_bl_major == 0x01 && config[8] >= 0x04) ||
(self->version_bl_major == 0x03 && config[8] >= 0x02)) { (self->version_bl_major == 0x03 && config[8] >= 0x02)) {
self->signed_firmware = TRUE; self->signed_firmware = TRUE;
fu_device_set_protocol (device, "com.logitech.unifyingsigned"); fu_device_add_protocol (device, "com.logitech.unifyingsigned");
} }
} }
if (!self->signed_firmware) if (!self->signed_firmware)
fu_device_set_protocol (device, "com.logitech.unifying"); fu_device_add_protocol (device, "com.logitech.unifying");
/* enable HID++ notifications */ /* enable HID++ notifications */
if (!fu_logitech_hidpp_runtime_enable_notifications (self, error)) { if (!fu_logitech_hidpp_runtime_enable_notifications (self, error)) {

6
plugins/modem-manager/fu-mm-device.c
View File

@ -214,7 +214,7 @@ fu_mm_device_probe_default (FuDevice *device, GError **error)
break; break;
} }
} }
fu_device_set_protocol (device, "com.google.fastboot"); fu_device_add_protocol (device, "com.google.fastboot");
} }
if (self->update_methods & MM_MODEM_FIRMWARE_UPDATE_METHOD_QMI_PDC) { if (self->update_methods & MM_MODEM_FIRMWARE_UPDATE_METHOD_QMI_PDC) {
for (guint i = 0; i < n_ports; i++) { for (guint i = 0; i < n_ports; i++) {
@ -225,8 +225,8 @@ fu_mm_device_probe_default (FuDevice *device, GError **error)
} }
} }
/* only set if fastboot wasn't already set */ /* only set if fastboot wasn't already set */
if (fu_device_get_protocol (device) == NULL) if (fu_device_get_protocols (device)->len == 0)
fu_device_set_protocol (device, "com.qualcomm.qmi_pdc"); fu_device_add_protocol (device, "com.qualcomm.qmi_pdc");
} }
mm_modem_port_info_array_free (ports, n_ports); mm_modem_port_info_array_free (ports, n_ports);

2
plugins/nitrokey/fu-nitrokey-device.c
View File

@ -137,7 +137,7 @@ fu_nitrokey_device_init (FuNitrokeyDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);
fu_device_set_protocol (FU_DEVICE (self), "org.usb.dfu"); fu_device_add_protocol (FU_DEVICE (self), "org.usb.dfu");
fu_device_retry_set_delay (FU_DEVICE (self), 100); fu_device_retry_set_delay (FU_DEVICE (self), 100);
} }

1
plugins/nitrokey/meson.build
View File

@ -19,6 +19,7 @@ shared_module('fu_plugin_nitrokey',
install : true, install : true,
install_dir: plugin_dir, install_dir: plugin_dir,
link_with : [ link_with : [
fwupd,
fwupdplugin, fwupdplugin,
], ],
c_args : cargs, c_args : cargs,

2
plugins/nvme/fu-nvme-device.c
View File

@ -399,7 +399,7 @@ fu_nvme_device_init (FuNvmeDevice *self)
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_summary (FU_DEVICE (self), "NVM Express Solid State Drive"); fu_device_set_summary (FU_DEVICE (self), "NVM Express Solid State Drive");
fu_device_add_icon (FU_DEVICE (self), "drive-harddisk"); fu_device_add_icon (FU_DEVICE (self), "drive-harddisk");
fu_device_set_protocol (FU_DEVICE (self), "org.nvmexpress"); fu_device_add_protocol (FU_DEVICE (self), "org.nvmexpress");
fu_udev_device_set_flags (FU_UDEV_DEVICE (self), fu_udev_device_set_flags (FU_UDEV_DEVICE (self),
FU_UDEV_DEVICE_FLAG_OPEN_READ | FU_UDEV_DEVICE_FLAG_OPEN_READ |
FU_UDEV_DEVICE_FLAG_VENDOR_FROM_PARENT); FU_UDEV_DEVICE_FLAG_VENDOR_FROM_PARENT);

2
plugins/pixart-rf/fu-pxi-device.c
View File

@ -654,7 +654,7 @@ fu_pxi_device_init (FuPxiDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_add_vendor_id (FU_DEVICE (self), "USB:0x093A"); fu_device_add_vendor_id (FU_DEVICE (self), "USB:0x093A");
fu_device_set_protocol (FU_DEVICE (self), "com.pixart.rf"); fu_device_add_protocol (FU_DEVICE (self), "com.pixart.rf");
} }
static void static void

2
plugins/redfish/fu-redfish-client.c
View File

@ -147,7 +147,7 @@ fu_redfish_client_coldplug_member (FuRedfishClient *self,
id = g_strdup_printf ("Redfish-Inventory-%s", id = g_strdup_printf ("Redfish-Inventory-%s",
json_object_get_string_member (member, "Id")); json_object_get_string_member (member, "Id"));
fu_device_set_id (dev, id); fu_device_set_id (dev, id);
fu_device_set_protocol (dev, "org.dmtf.redfish"); fu_device_add_protocol (dev, "org.dmtf.redfish");
fu_device_add_guid (dev, guid); fu_device_add_guid (dev, guid);
if (json_object_has_member (member, "Name")) if (json_object_has_member (member, "Name"))

2
plugins/rts54hid/fu-rts54hid-device.c
View File

@ -314,7 +314,7 @@ fu_rts54hid_device_write_firmware (FuDevice *device,
static void static void
fu_rts54hid_device_init (FuRts54HidDevice *self) fu_rts54hid_device_init (FuRts54HidDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.realtek.rts54"); fu_device_add_protocol (FU_DEVICE (self), "com.realtek.rts54");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);
} }

2
plugins/rts54hub/fu-rts54hub-device.c
View File

@ -500,7 +500,7 @@ fu_rts54hub_device_prepare_firmware (FuDevice *device,
static void static void
fu_rts54hub_device_init (FuRts54HubDevice *self) fu_rts54hub_device_init (FuRts54HubDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.realtek.rts54"); fu_device_add_protocol (FU_DEVICE (self), "com.realtek.rts54");
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
} }

2
plugins/rts54hub/fu-rts54hub-rtd21xx-device.c
View File

@ -573,7 +573,7 @@ static void
fu_rts54hub_rtd21xx_device_init (FuRts54hubRtd21xxDevice *self) fu_rts54hub_rtd21xx_device_init (FuRts54hubRtd21xxDevice *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "video-display"); fu_device_add_icon (FU_DEVICE (self), "video-display");
fu_device_set_protocol (FU_DEVICE (self), "com.realtek.rts54.i2c"); fu_device_add_protocol (FU_DEVICE (self), "com.realtek.rts54.i2c");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);

2
plugins/solokey/fu-solokey-device.c
View File

@ -500,7 +500,7 @@ fu_solokey_device_init (FuSolokeyDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_USER_REPLUG); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_USER_REPLUG);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_protocol (FU_DEVICE (self), "com.solokeys"); fu_device_add_protocol (FU_DEVICE (self), "com.solokeys");
fu_device_set_name (FU_DEVICE (self), "Solo Secure"); fu_device_set_name (FU_DEVICE (self), "Solo Secure");
fu_device_set_summary (FU_DEVICE (self), "An open source FIDO2 security key"); fu_device_set_summary (FU_DEVICE (self), "An open source FIDO2 security key");
fu_device_add_icon (FU_DEVICE (self), "applications-internet"); fu_device_add_icon (FU_DEVICE (self), "applications-internet");

2
plugins/superio/fu-superio-device.c
View File

@ -395,7 +395,7 @@ fu_superio_device_init (FuSuperioDevice *self)
fu_device_set_physical_id (FU_DEVICE (self), "/dev/port"); fu_device_set_physical_id (FU_DEVICE (self), "/dev/port");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);
fu_device_set_protocol (FU_DEVICE (self), "tw.com.ite.superio"); fu_device_add_protocol (FU_DEVICE (self), "tw.com.ite.superio");
fu_device_set_summary (FU_DEVICE (self), "Embedded Controller"); fu_device_set_summary (FU_DEVICE (self), "Embedded Controller");
fu_device_add_icon (FU_DEVICE (self), "computer"); fu_device_add_icon (FU_DEVICE (self), "computer");
} }

2
plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c
View File

@ -761,7 +761,7 @@ fu_synaptics_cxaudio_device_init (FuSynapticsCxaudioDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_install_duration (FU_DEVICE (self), 3); /* seconds */ fu_device_set_install_duration (FU_DEVICE (self), 3); /* seconds */
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.cxaudio"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.cxaudio");
fu_device_retry_set_delay (FU_DEVICE (self), 100); /* ms */ fu_device_retry_set_delay (FU_DEVICE (self), 100); /* ms */
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
} }

2
plugins/synaptics-mst/fu-synaptics-mst-device.c
View File

@ -69,7 +69,7 @@ fu_synaptics_mst_device_finalize (GObject *object)
static void static void
fu_synaptics_mst_device_init (FuSynapticsMstDevice *self) fu_synaptics_mst_device_init (FuSynapticsMstDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.mst"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.mst");
fu_device_set_vendor (FU_DEVICE (self), "Synaptics"); fu_device_set_vendor (FU_DEVICE (self), "Synaptics");
fu_device_add_vendor_id (FU_DEVICE (self), "DRM_DP_AUX_DEV:0x06CB"); fu_device_add_vendor_id (FU_DEVICE (self), "DRM_DP_AUX_DEV:0x06CB");
fu_device_set_summary (FU_DEVICE (self), "Multi-Stream Transport Device"); fu_device_set_summary (FU_DEVICE (self), "Multi-Stream Transport Device");

2
plugins/synaptics-prometheus/fu-synaprom-config.c
View File

@ -216,7 +216,7 @@ fu_synaprom_config_write_firmware (FuDevice *device,
static void static void
fu_synaprom_config_init (FuSynapromConfig *self) fu_synaprom_config_init (FuSynapromConfig *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.prometheus.config"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.prometheus.config");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_logical_id (FU_DEVICE (self), "cfg"); fu_device_set_logical_id (FU_DEVICE (self), "cfg");

2
plugins/synaptics-prometheus/fu-synaprom-device.c
View File

@ -447,7 +447,7 @@ fu_synaprom_device_init (FuSynapromDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_RETRY_OPEN); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_RETRY_OPEN);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.prometheus"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.prometheus");
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_set_name (FU_DEVICE (self), "Prometheus"); fu_device_set_name (FU_DEVICE (self), "Prometheus");
fu_device_set_summary (FU_DEVICE (self), "Fingerprint reader"); fu_device_set_summary (FU_DEVICE (self), "Fingerprint reader");

2
plugins/synaptics-rmi/fu-synaptics-rmi-device.c
View File

@ -812,7 +812,7 @@ static void
fu_synaptics_rmi_device_init (FuSynapticsRmiDevice *self) fu_synaptics_rmi_device_init (FuSynapticsRmiDevice *self)
{ {
FuSynapticsRmiDevicePrivate *priv = GET_PRIVATE (self); FuSynapticsRmiDevicePrivate *priv = GET_PRIVATE (self);
fu_device_set_protocol (FU_DEVICE (self), "com.synaptics.rmi"); fu_device_add_protocol (FU_DEVICE (self), "com.synaptics.rmi");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
priv->current_page = 0xfe; priv->current_page = 0xfe;

2
plugins/system76-launch/fu-system76-launch-device.c
View File

@ -165,7 +165,7 @@ fu_system76_launch_device_init (FuSystem76LaunchDevice *self)
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_protocol (FU_DEVICE (self), "org.usb.dfu"); fu_device_add_protocol (FU_DEVICE (self), "org.usb.dfu");
fu_device_retry_set_delay (FU_DEVICE (self), 100); fu_device_retry_set_delay (FU_DEVICE (self), 100);
} }

6
plugins/test/fu-plugin-test.c
View File

@ -38,7 +38,7 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
fu_device_add_icon (device, "preferences-desktop-keyboard"); fu_device_add_icon (device, "preferences-desktop-keyboard");
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE); fu_device_add_flag (device, FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);
fu_device_set_protocol (device, "com.acme.test"); fu_device_add_protocol (device, "com.acme.test");
fu_device_set_summary (device, "A fake webcam"); fu_device_set_summary (device, "A fake webcam");
fu_device_set_vendor (device, "ACME Corp."); fu_device_set_vendor (device, "ACME Corp.");
fu_device_add_vendor_id (device, "USB:0x046D"); fu_device_add_vendor_id (device, "USB:0x046D");
@ -64,7 +64,7 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
child1 = fu_device_new (); child1 = fu_device_new ();
fu_device_add_vendor_id (child1, "USB:FFFF"); fu_device_add_vendor_id (child1, "USB:FFFF");
fu_device_set_protocol (child1, "com.acme"); fu_device_add_protocol (child1, "com.acme");
fu_device_set_physical_id (child1, "fake"); fu_device_set_physical_id (child1, "fake");
fu_device_set_logical_id (child1, "child1"); fu_device_set_logical_id (child1, "child1");
fu_device_add_guid (child1, "7fddead7-12b5-4fb9-9fa0-6d30305df755"); fu_device_add_guid (child1, "7fddead7-12b5-4fb9-9fa0-6d30305df755");
@ -77,7 +77,7 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
child2 = fu_device_new (); child2 = fu_device_new ();
fu_device_add_vendor_id (child2, "USB:FFFF"); fu_device_add_vendor_id (child2, "USB:FFFF");
fu_device_set_protocol (child2, "com.acme"); fu_device_add_protocol (child2, "com.acme");
fu_device_set_physical_id (child2, "fake"); fu_device_set_physical_id (child2, "fake");
fu_device_set_logical_id (child2, "child2"); fu_device_set_logical_id (child2, "child2");
fu_device_add_guid (child2, "b8fe6b45-8702-4bcd-8120-ef236caac76f"); fu_device_add_guid (child2, "b8fe6b45-8702-4bcd-8120-ef236caac76f");

2
plugins/test/fu-test-ble-device.c
View File

@ -17,7 +17,7 @@ G_DEFINE_TYPE (FuTestBleDevice, fu_test_ble_device, FU_TYPE_BLUEZ_DEVICE)
static void static void
fu_test_ble_device_init (FuTestBleDevice *self) fu_test_ble_device_init (FuTestBleDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "org.test.testble"); fu_device_add_protocol (FU_DEVICE (self), "org.test.testble");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
} }

2
plugins/thelio-io/fu-thelio-io-device.c
View File

@ -99,7 +99,7 @@ fu_thelio_io_device_init (FuThelioIoDevice *self)
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_protocol (FU_DEVICE (self), "org.usb.dfu"); fu_device_add_protocol (FU_DEVICE (self), "org.usb.dfu");
} }
static void static void

2
plugins/thunderbolt/fu-thunderbolt-device.c
View File

@ -790,7 +790,7 @@ fu_thunderbolt_device_init (FuThunderboltDevice *self)
{ {
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC);
fu_device_add_icon (FU_DEVICE (self), "thunderbolt"); fu_device_add_icon (FU_DEVICE (self), "thunderbolt");
fu_device_set_protocol (FU_DEVICE (self), "com.intel.thunderbolt"); fu_device_add_protocol (FU_DEVICE (self), "com.intel.thunderbolt");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);
} }

2
plugins/uefi-capsule/fu-uefi-device.c
View File

@ -721,7 +721,7 @@ fu_uefi_device_probe (FuDevice *device, GError **error)
static void static void
fu_uefi_device_init (FuUefiDevice *self) fu_uefi_device_init (FuUefiDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "org.uefi.capsule"); fu_device_add_protocol (FU_DEVICE (self), "org.uefi.capsule");
} }
static void static void

2
plugins/uefi-dbx/fu-uefi-dbx-device.c
View File

@ -141,7 +141,7 @@ fu_uefi_dbx_device_init (FuUefiDbxDevice *self)
fu_device_set_name (FU_DEVICE (self), "UEFI dbx"); fu_device_set_name (FU_DEVICE (self), "UEFI dbx");
fu_device_set_summary (FU_DEVICE (self), "UEFI Revocation Database"); fu_device_set_summary (FU_DEVICE (self), "UEFI Revocation Database");
fu_device_add_vendor_id (FU_DEVICE (self), "UEFI:Linux Foundation"); fu_device_add_vendor_id (FU_DEVICE (self), "UEFI:Linux Foundation");
fu_device_set_protocol (FU_DEVICE (self), "org.uefi.dbx"); fu_device_add_protocol (FU_DEVICE (self), "org.uefi.dbx");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_NUMBER); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_NUMBER);
fu_device_set_install_duration (FU_DEVICE (self), 1); fu_device_set_install_duration (FU_DEVICE (self), 1);
fu_device_add_icon (FU_DEVICE (self), "computer"); fu_device_add_icon (FU_DEVICE (self), "computer");

2
plugins/vli/fu-vli-pd-device.c
View File

@ -678,7 +678,7 @@ static void
fu_vli_pd_device_init (FuVliPdDevice *self) fu_vli_pd_device_init (FuVliPdDevice *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "audio-card"); fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_set_protocol (FU_DEVICE (self), "com.vli.pd"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.pd");
fu_device_set_summary (FU_DEVICE (self), "USB PD"); fu_device_set_summary (FU_DEVICE (self), "USB PD");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);

2
plugins/vli/fu-vli-pd-parade-device.c
View File

@ -647,7 +647,7 @@ fu_vli_pd_parade_device_init (FuVliPdParadeDevice *self)
fu_device_add_icon (FU_DEVICE (self), "video-display"); fu_device_add_icon (FU_DEVICE (self), "video-display");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_protocol (FU_DEVICE (self), "com.vli.i2c"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.i2c");
fu_device_set_install_duration (FU_DEVICE (self), 15); /* seconds */ fu_device_set_install_duration (FU_DEVICE (self), 15); /* seconds */
fu_device_set_logical_id (FU_DEVICE (self), "PS186"); fu_device_set_logical_id (FU_DEVICE (self), "PS186");
fu_device_set_summary (FU_DEVICE (self), "DisplayPort 1.4a to HDMI 2.0b Protocol Converter"); fu_device_set_summary (FU_DEVICE (self), "DisplayPort 1.4a to HDMI 2.0b Protocol Converter");

2
plugins/vli/fu-vli-usbhub-device.c
View File

@ -975,7 +975,7 @@ static void
fu_vli_usbhub_device_init (FuVliUsbhubDevice *self) fu_vli_usbhub_device_init (FuVliUsbhubDevice *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "audio-card"); fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_set_protocol (FU_DEVICE (self), "com.vli.usbhub"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.usbhub");
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
} }

2
plugins/vli/fu-vli-usbhub-msp430-device.c
View File

@ -323,7 +323,7 @@ static void
fu_vli_usbhub_msp430_device_init (FuVliUsbhubMsp430Device *self) fu_vli_usbhub_msp430_device_init (FuVliUsbhubMsp430Device *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "audio-card"); fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_set_protocol (FU_DEVICE (self), "com.vli.i2c"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.i2c");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);
fu_device_set_logical_id (FU_DEVICE (self), "I2C"); fu_device_set_logical_id (FU_DEVICE (self), "I2C");

2
plugins/vli/fu-vli-usbhub-pd-device.c
View File

@ -244,7 +244,7 @@ static void
fu_vli_usbhub_pd_device_init (FuVliUsbhubPdDevice *self) fu_vli_usbhub_pd_device_init (FuVliUsbhubPdDevice *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "audio-card"); fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_set_protocol (FU_DEVICE (self), "com.vli.usbhub"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.usbhub");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_QUAD);

2
plugins/vli/fu-vli-usbhub-rtd21xx-device.c
View File

@ -494,7 +494,7 @@ static void
fu_vli_usbhub_rtd21xx_device_init (FuVliUsbhubRtd21xxDevice *self) fu_vli_usbhub_rtd21xx_device_init (FuVliUsbhubRtd21xxDevice *self)
{ {
fu_device_add_icon (FU_DEVICE (self), "video-display"); fu_device_add_icon (FU_DEVICE (self), "video-display");
fu_device_set_protocol (FU_DEVICE (self), "com.vli.i2c"); fu_device_add_protocol (FU_DEVICE (self), "com.vli.i2c");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_DUAL_IMAGE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);

2
plugins/wacom-raw/fu-wacom-device.c
View File

@ -357,7 +357,7 @@ fu_wacom_device_set_quirk_kv (FuDevice *device,
static void static void
fu_wacom_device_init (FuWacomDevice *self) fu_wacom_device_init (FuWacomDevice *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.wacom.raw"); fu_device_add_protocol (FU_DEVICE (self), "com.wacom.raw");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID); fu_device_add_internal_flag (FU_DEVICE (self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);

2
plugins/wacom-usb/fu-wac-device.c
View File

@ -802,7 +802,7 @@ fu_wac_device_init (FuWacDevice *self)
self->checksums = g_array_new (FALSE, FALSE, sizeof(guint32)); self->checksums = g_array_new (FALSE, FALSE, sizeof(guint32));
self->configuration = 0xffff; self->configuration = 0xffff;
self->firmware_index = 0xffff; self->firmware_index = 0xffff;
fu_device_set_protocol (FU_DEVICE (self), "com.wacom.usb"); fu_device_add_protocol (FU_DEVICE (self), "com.wacom.usb");
fu_device_add_icon (FU_DEVICE (self), "input-tablet"); fu_device_add_icon (FU_DEVICE (self), "input-tablet");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);

2
plugins/wacom-usb/fu-wac-module.c
View File

@ -305,7 +305,7 @@ fu_wac_module_set_property (GObject *object, guint prop_id,
static void static void
fu_wac_module_init (FuWacModule *self) fu_wac_module_init (FuWacModule *self)
{ {
fu_device_set_protocol (FU_DEVICE (self), "com.wacom.usb"); fu_device_add_protocol (FU_DEVICE (self), "com.wacom.usb");
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR); fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PAIR);
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
} }

2
src/fu-engine.c
View File

@ -5389,7 +5389,7 @@ fu_engine_add_device (FuEngine *self, FuDevice *device)
/* does the device not have an assigned protocol */ /* does the device not have an assigned protocol */
if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE) && if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE) &&
fu_device_get_protocol (device) == NULL) { fu_device_get_protocols (device)->len == 0) {
g_warning ("device %s [%s] does not define an update protocol", g_warning ("device %s [%s] does not define an update protocol",
fu_device_get_id (device), fu_device_get_id (device),
fu_device_get_name (device)); fu_device_get_name (device));

10
src/fu-install-task.c
View File

@ -10,6 +10,7 @@
#include <fwupd.h> #include <fwupd.h>
#include "fu-common.h"
#include "fu-common-version.h" #include "fu-common-version.h"
#include "fu-device-private.h" #include "fu-device-private.h"
#include "fu-install-task.h" #include "fu-install-task.h"
@ -254,16 +255,17 @@ fu_install_task_check_requirements (FuInstallTask *self,
protocol = xb_node_query_text (self->component, protocol = xb_node_query_text (self->component,
"custom/value[@key='LVFS::UpdateProtocol']", "custom/value[@key='LVFS::UpdateProtocol']",
NULL); NULL);
if (fu_device_get_protocol (self->device) != NULL && protocol != NULL && if (fu_device_get_protocols (self->device)->len != 0 && protocol != NULL &&
g_strcmp0 (fu_device_get_protocol (self->device), protocol) != 0 && !fu_device_has_protocol (self->device, protocol) &&
(flags & FWUPD_INSTALL_FLAG_FORCE) == 0) { (flags & FWUPD_INSTALL_FLAG_FORCE) == 0) {
g_autofree gchar *str = NULL;
str = fu_common_strjoin_array ("|", fu_device_get_protocols (self->device));
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED, FWUPD_ERROR_NOT_SUPPORTED,
"Device %s does not support %s, only %s", "Device %s does not support %s, only %s",
fu_device_get_name (self->device), fu_device_get_name (self->device),
protocol, protocol, str);
fu_device_get_protocol (self->device));
return FALSE; return FALSE;
} }

34
src/fu-self-test.c
View File

@ -762,7 +762,7 @@ fu_engine_requirements_other_device_func (gconstpointer user_data)
/* set up a different device */ /* set up a different device */
fu_device_set_id (device2, "id2"); fu_device_set_id (device2, "id2");
fu_device_add_vendor_id (device2, "USB:FFFF"); fu_device_add_vendor_id (device2, "USB:FFFF");
fu_device_set_protocol (device2, "com.acme"); fu_device_add_protocol (device2, "com.acme");
fu_device_set_name (device2, "Secondary firmware"); fu_device_set_name (device2, "Secondary firmware");
fu_device_set_version_format (device2, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device2, FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_version (device2, "4.5.6"); fu_device_set_version (device2, "4.5.6");
@ -823,7 +823,7 @@ fu_engine_requirements_protocol_check_func (gconstpointer user_data)
fu_engine_set_silo (engine, silo_empty); fu_engine_set_silo (engine, silo_empty);
fu_device_set_id (device1, "NVME"); fu_device_set_id (device1, "NVME");
fu_device_set_protocol (device1, "com.acme"); fu_device_add_protocol (device1, "com.acme");
fu_device_set_name (device1, "NVME device"); fu_device_set_name (device1, "NVME device");
fu_device_add_vendor_id (device1, "ACME"); fu_device_add_vendor_id (device1, "ACME");
fu_device_set_version_format (device1, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device1, FWUPD_VERSION_FORMAT_TRIPLET);
@ -833,7 +833,7 @@ fu_engine_requirements_protocol_check_func (gconstpointer user_data)
fu_engine_add_device (engine, device1); fu_engine_add_device (engine, device1);
fu_device_set_id (device2, "UEFI"); fu_device_set_id (device2, "UEFI");
fu_device_set_protocol (device2, "org.bar"); fu_device_add_protocol (device2, "org.bar");
fu_device_set_name (device2, "UEFI device"); fu_device_set_name (device2, "UEFI device");
fu_device_add_vendor_id (device2, "ACME"); fu_device_add_vendor_id (device2, "ACME");
fu_device_set_version_format (device2, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device2, FWUPD_VERSION_FORMAT_TRIPLET);
@ -918,7 +918,7 @@ fu_engine_requirements_parent_device_func (gconstpointer user_data)
/* set up a parent device */ /* set up a parent device */
fu_device_set_id (device1, "parent"); fu_device_set_id (device1, "parent");
fu_device_add_vendor_id (device1, "USB:FFFF"); fu_device_add_vendor_id (device1, "USB:FFFF");
fu_device_set_protocol (device1, "com.acme"); fu_device_add_protocol (device1, "com.acme");
fu_device_set_name (device1, "parent"); fu_device_set_name (device1, "parent");
fu_device_set_version_format (device1, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device1, FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_version (device1, "1.2.3"); fu_device_set_version (device1, "1.2.3");
@ -958,7 +958,7 @@ fu_engine_device_parent_func (gconstpointer user_data)
/* add child */ /* add child */
fu_device_set_id (device1, "child"); fu_device_set_id (device1, "child");
fu_device_add_vendor_id (device2, "USB:FFFF"); fu_device_add_vendor_id (device2, "USB:FFFF");
fu_device_set_protocol (device2, "com.acme"); fu_device_add_protocol (device2, "com.acme");
fu_device_add_instance_id (device1, "child-GUID-1"); fu_device_add_instance_id (device1, "child-GUID-1");
fu_device_add_parent_guid (device1, "parent-GUID"); fu_device_add_parent_guid (device1, "parent-GUID");
fu_device_convert_instance_ids (device1); fu_device_convert_instance_ids (device1);
@ -967,7 +967,7 @@ fu_engine_device_parent_func (gconstpointer user_data)
/* parent */ /* parent */
fu_device_set_id (device2, "parent"); fu_device_set_id (device2, "parent");
fu_device_add_vendor_id (device2, "USB:FFFF"); fu_device_add_vendor_id (device2, "USB:FFFF");
fu_device_set_protocol (device2, "com.acme"); fu_device_add_protocol (device2, "com.acme");
fu_device_add_instance_id (device2, "parent-GUID"); fu_device_add_instance_id (device2, "parent-GUID");
fu_device_set_vendor (device2, "oem"); fu_device_set_vendor (device2, "oem");
fu_device_convert_instance_ids (device2); fu_device_convert_instance_ids (device2);
@ -1020,13 +1020,13 @@ fu_engine_partial_hash_func (gconstpointer user_data)
/* add two dummy devices */ /* add two dummy devices */
fu_device_set_id (device1, "device1"); fu_device_set_id (device1, "device1");
fu_device_add_vendor_id (device1, "USB:FFFF"); fu_device_add_vendor_id (device1, "USB:FFFF");
fu_device_set_protocol (device1, "com.acme"); fu_device_add_protocol (device1, "com.acme");
fu_device_set_plugin (device1, "test"); fu_device_set_plugin (device1, "test");
fu_device_add_guid (device1, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device1, "12345678-1234-1234-1234-123456789012");
fu_engine_add_device (engine, device1); fu_engine_add_device (engine, device1);
fu_device_set_id (device2, "device21"); fu_device_set_id (device2, "device21");
fu_device_add_vendor_id (device2, "USB:FFFF"); fu_device_add_vendor_id (device2, "USB:FFFF");
fu_device_set_protocol (device2, "com.acme"); fu_device_add_protocol (device2, "com.acme");
fu_device_set_plugin (device2, "test"); fu_device_set_plugin (device2, "test");
fu_device_set_equivalent_id (device2, "b92f5b7560b84ca005a79f5a15de3c003ce494cf"); fu_device_set_equivalent_id (device2, "b92f5b7560b84ca005a79f5a15de3c003ce494cf");
fu_device_add_guid (device2, "87654321-1234-1234-1234-123456789012"); fu_device_add_guid (device2, "87654321-1234-1234-1234-123456789012");
@ -1099,7 +1099,7 @@ fu_engine_device_unlock_func (gconstpointer user_data)
/* add a dummy device */ /* add a dummy device */
fu_device_set_id (device, "UEFI-dummy-dev0"); fu_device_set_id (device, "UEFI-dummy-dev0");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_add_guid (device, "2d47f29b-83a2-4f31-a2e8-63474f4d4c2e"); fu_device_add_guid (device, "2d47f29b-83a2-4f31-a2e8-63474f4d4c2e");
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_LOCKED); fu_device_add_flag (device, FWUPD_DEVICE_FLAG_LOCKED);
fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_PLAIN); fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_PLAIN);
@ -1150,7 +1150,7 @@ fu_engine_require_hwid_func (gconstpointer user_data)
/* add a dummy device */ /* add a dummy device */
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_TRIPLET);
fu_device_set_version (device, "1.2.2"); fu_device_set_version (device, "1.2.2");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
@ -1287,7 +1287,7 @@ fu_engine_downgrade_func (gconstpointer user_data)
fu_device_set_version (device, "1.2.3"); fu_device_set_version (device, "1.2.3");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_add_guid (device, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); fu_device_add_guid (device, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
@ -1402,7 +1402,7 @@ fu_engine_install_duration_func (gconstpointer user_data)
fu_device_set_version (device, "1.2.3"); fu_device_set_version (device, "1.2.3");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_add_guid (device, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); fu_device_add_guid (device, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
fu_device_set_install_duration (device, 999); fu_device_set_install_duration (device, 999);
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
@ -1472,7 +1472,7 @@ fu_engine_history_func (gconstpointer user_data)
fu_device_set_version (device, "1.2.2"); fu_device_set_version (device, "1.2.2");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_set_plugin (device, "test"); fu_device_set_plugin (device, "test");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
@ -1599,7 +1599,7 @@ fu_engine_multiple_rels_func (gconstpointer user_data)
fu_device_set_version (device, "1.2.2"); fu_device_set_version (device, "1.2.2");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_set_plugin (device, "test"); fu_device_set_plugin (device, "test");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
@ -1670,7 +1670,7 @@ fu_engine_history_inherit (gconstpointer user_data)
fu_device_set_version (device, "1.2.2"); fu_device_set_version (device, "1.2.2");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_set_plugin (device, "test"); fu_device_set_plugin (device, "test");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
@ -1732,7 +1732,7 @@ fu_engine_history_inherit (gconstpointer user_data)
device = fu_device_new (); device = fu_device_new ();
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");
fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_TRIPLET); fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_TRIPLET);
@ -1781,7 +1781,7 @@ fu_engine_history_error_func (gconstpointer user_data)
fu_device_set_version (device, "1.2.2"); fu_device_set_version (device, "1.2.2");
fu_device_set_id (device, "test_device"); fu_device_set_id (device, "test_device");
fu_device_add_vendor_id (device, "USB:FFFF"); fu_device_add_vendor_id (device, "USB:FFFF");
fu_device_set_protocol (device, "com.acme"); fu_device_add_protocol (device, "com.acme");
fu_device_set_name (device, "Test Device"); fu_device_set_name (device, "Test Device");
fu_device_set_plugin (device, "test"); fu_device_set_plugin (device, "test");
fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012"); fu_device_add_guid (device, "12345678-1234-1234-1234-123456789012");