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

Allow setting global flags for FuHidDevice

Browse Source
This commit is contained in:
Richard Hughes 2020-11-06 19:25:37 +00:00
parent a8b3f9ed57
commit a01fdde628
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libfwupdplugin/fu-hid-device.c
View File

@ -33,6 +33,7 @@ typedef struct
FuUsbDevice *usb_device; FuUsbDevice *usb_device;
guint8 interface; guint8 interface;
gboolean interface_autodetect; gboolean interface_autodetect;
FuHidDeviceFlags flags;
} FuHidDevicePrivate; } FuHidDevicePrivate;
G_DEFINE_TYPE_WITH_PRIVATE (FuHidDevice, fu_hid_device, FU_TYPE_USB_DEVICE) G_DEFINE_TYPE_WITH_PRIVATE (FuHidDevice, fu_hid_device, FU_TYPE_USB_DEVICE)
@ -192,6 +193,23 @@ fu_hid_device_get_interface (FuHidDevice *self)
return priv->interface; return priv->interface;
} }
/**
* fu_hid_device_add_flag:
* @self: A #FuHidDevice
* @flag: #FuHidDeviceFlags, e.g. %FU_HID_DEVICE_FLAG_RETRY_FAILURE
*
* Adds a flag to be used for all set and get report messages.
*
* Since: 1.5.2
**/
void
fu_hid_device_add_flag (FuHidDevice *self, FuHidDeviceFlags flag)
{
FuHidDevicePrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FU_HID_DEVICE (self));
priv->flags |= flag;
}
typedef struct { typedef struct {
guint8 value; guint8 value;
guint8 *buf; guint8 *buf;
@ -275,6 +293,7 @@ fu_hid_device_set_report (FuHidDevice *self,
GError **error) GError **error)
{ {
FuHidDeviceRetryHelper helper; FuHidDeviceRetryHelper helper;
FuHidDevicePrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FU_HID_DEVICE (self), FALSE); g_return_val_if_fail (FU_HID_DEVICE (self), FALSE);
g_return_val_if_fail (buf != NULL, FALSE); g_return_val_if_fail (buf != NULL, FALSE);
@ -285,7 +304,7 @@ fu_hid_device_set_report (FuHidDevice *self,
helper.buf = buf; helper.buf = buf;
helper.bufsz = bufsz; helper.bufsz = bufsz;
helper.timeout = timeout; helper.timeout = timeout;
helper.flags = flags; helper.flags = priv->flags | flags;
/* special case */ /* special case */
if (flags & FU_HID_DEVICE_FLAG_RETRY_FAILURE) { if (flags & FU_HID_DEVICE_FLAG_RETRY_FAILURE) {
@ -377,6 +396,7 @@ fu_hid_device_get_report (FuHidDevice *self,
GError **error) GError **error)
{ {
FuHidDeviceRetryHelper helper; FuHidDeviceRetryHelper helper;
FuHidDevicePrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FU_HID_DEVICE (self), FALSE); g_return_val_if_fail (FU_HID_DEVICE (self), FALSE);
g_return_val_if_fail (buf != NULL, FALSE); g_return_val_if_fail (buf != NULL, FALSE);
@ -387,7 +407,7 @@ fu_hid_device_get_report (FuHidDevice *self,
helper.buf = buf; helper.buf = buf;
helper.bufsz = bufsz; helper.bufsz = bufsz;
helper.timeout = timeout; helper.timeout = timeout;
helper.flags = flags; helper.flags = priv->flags | flags;
/* special case */ /* special case */
if (flags & FU_HID_DEVICE_FLAG_RETRY_FAILURE) { if (flags & FU_HID_DEVICE_FLAG_RETRY_FAILURE) {

2
libfwupdplugin/fu-hid-device.h
View File

@ -41,6 +41,8 @@ typedef enum {
} FuHidDeviceFlags; } FuHidDeviceFlags;
FuHidDevice *fu_hid_device_new (GUsbDevice *usb_device); FuHidDevice *fu_hid_device_new (GUsbDevice *usb_device);
void fu_hid_device_add_flag (FuHidDevice *self,
FuHidDeviceFlags flag);
void fu_hid_device_set_interface (FuHidDevice *self, void fu_hid_device_set_interface (FuHidDevice *self,
guint8 interface); guint8 interface);
guint8 fu_hid_device_get_interface (FuHidDevice *self); guint8 fu_hid_device_get_interface (FuHidDevice *self);

6
libfwupdplugin/fwupdplugin.map
View File

@ -679,3 +679,9 @@ LIBFWUPDPLUGIN_1.5.1 {
fu_volume_is_encrypted; fu_volume_is_encrypted;
local: *; local: *;
} LIBFWUPDPLUGIN_1.5.0; } LIBFWUPDPLUGIN_1.5.0;
LIBFWUPDPLUGIN_1.5.2 {
global:
fu_hid_device_add_flag;
local: *;
} LIBFWUPDPLUGIN_1.5.1;