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

synaptics-rmi: Set the version after ->setup has run

Browse Source 
The build_id might be overwritten in the BL-specific setup.
This commit is contained in:
Richard Hughes 2019-10-04 16:37:02 +01:00
parent 339f823ee2
commit 08ddb2b7c4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -553,13 +553,6 @@ fu_synaptics_rmi_device_setup (FuDevice *device, GError **error)
priv->flash.build_id = fu_common_read_uint32 (buf32, G_LITTLE_ENDIAN); priv->flash.build_id = fu_common_read_uint32 (buf32, G_LITTLE_ENDIAN);
} }
/* set main composite version */
fw_ver = g_strdup_printf ("%u.%u.%u",
f01_basic->data[2],
f01_basic->data[3],
priv->flash.build_id);
fu_device_set_version (device, fw_ver, FWUPD_VERSION_FORMAT_TRIPLET);
priv->f34 = fu_synaptics_rmi_device_get_function (self, 0x34, error); priv->f34 = fu_synaptics_rmi_device_get_function (self, 0x34, error);
if (priv->f34 == NULL) if (priv->f34 == NULL)
return FALSE; return FALSE;
@ -598,8 +591,6 @@ fu_synaptics_rmi_device_setup (FuDevice *device, GError **error)
g_prefix_error (error, "failed to read bootloader status: "); g_prefix_error (error, "failed to read bootloader status: ");
return FALSE; return FALSE;
} }
bl_ver = g_strdup_printf ("%u.0", priv->flash.bootloader_id[1]);
fu_device_set_version_bootloader (device, bl_ver);
/* in bootloader mode */ /* in bootloader mode */
f01_db = fu_synaptics_rmi_device_read (self, priv->f01->data_base, 0x1, error); f01_db = fu_synaptics_rmi_device_read (self, priv->f01->data_base, 0x1, error);
@ -613,6 +604,15 @@ fu_synaptics_rmi_device_setup (FuDevice *device, GError **error)
fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_IS_BOOTLOADER); fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
} }
/* set versions */
fw_ver = g_strdup_printf ("%u.%u.%u",
f01_basic->data[2],
f01_basic->data[3],
priv->flash.build_id);
fu_device_set_version (device, fw_ver, FWUPD_VERSION_FORMAT_TRIPLET);
bl_ver = g_strdup_printf ("%u.0", priv->flash.bootloader_id[1]);
fu_device_set_version_bootloader (device, bl_ver);
/* success */ /* success */
return TRUE; return TRUE;
} }