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

Fall back to the misc device for serio devices

Browse Source
This commit is contained in:
Richard Hughes 2020-12-01 20:48:11 +00:00
parent 5198bdcde2
commit ab63e94107
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libfwupdplugin/fu-udev-device.c
View File

@ -155,6 +155,8 @@ fu_udev_device_to_string (FuDevice *device, guint idt, GString *str)
fu_common_string_append_kv (str, idt, "Subsystem", priv->subsystem); fu_common_string_append_kv (str, idt, "Subsystem", priv->subsystem);
if (priv->driver != NULL) if (priv->driver != NULL)
fu_common_string_append_kv (str, idt, "Driver", priv->driver); fu_common_string_append_kv (str, idt, "Driver", priv->driver);
if (priv->device_file != NULL)
fu_common_string_append_kv (str, idt, "DeviceFile", priv->device_file);
} }
if (g_getenv ("FU_UDEV_DEVICE_DEBUG") != NULL) { if (g_getenv ("FU_UDEV_DEVICE_DEBUG") != NULL) {
g_autoptr(GUdevDevice) udev_parent = NULL; g_autoptr(GUdevDevice) udev_parent = NULL;
@ -504,6 +506,26 @@ fu_udev_device_probe (FuDevice *device, GError **error)
return TRUE; return TRUE;
} }
#ifdef HAVE_GUDEV
static gchar *
fu_udev_device_get_miscdev0 (FuUdevDevice *self)
{
FuUdevDevicePrivate *priv = GET_PRIVATE (self);
const gchar *fn;
g_autofree gchar *miscdir = NULL;
g_autoptr(GDir) dir = NULL;
miscdir = g_build_filename (g_udev_device_get_sysfs_path (priv->udev_device), "misc", NULL);
dir = g_dir_open (miscdir, 0, NULL);
if (dir == NULL)
return NULL;
fn = g_dir_read_name (dir);
if (fn == NULL)
return NULL;
return g_strdup_printf ("/dev/%s", fn);
}
#endif
static void static void
fu_udev_device_set_dev (FuUdevDevice *self, GUdevDevice *udev_device) fu_udev_device_set_dev (FuUdevDevice *self, GUdevDevice *udev_device)
{ {
@ -539,6 +561,16 @@ fu_udev_device_set_dev (FuUdevDevice *self, GUdevDevice *udev_device)
fu_udev_device_set_driver (self, g_udev_device_get_driver (priv->udev_device)); fu_udev_device_set_driver (self, g_udev_device_get_driver (priv->udev_device));
fu_udev_device_set_device_file (self, g_udev_device_get_device_file (priv->udev_device)); fu_udev_device_set_device_file (self, g_udev_device_get_device_file (priv->udev_device));
/* fall back to the first thing handled by misc drivers */
if (priv->device_file == NULL) {
/* perhaps we should unconditionally fall back? or perhaps
* require FU_UDEV_DEVICE_FLAG_FALLBACK_MISC... */
if (g_strcmp0 (priv->subsystem, "serio") == 0)
priv->device_file = fu_udev_device_get_miscdev0 (self);
if (priv->device_file != NULL)
g_debug ("falling back to misc %s", priv->device_file);
}
/* try to get one line summary */ /* try to get one line summary */
summary = g_udev_device_get_sysfs_attr (priv->udev_device, "description"); summary = g_udev_device_get_sysfs_attr (priv->udev_device, "description");
if (summary == NULL) { if (summary == NULL) {