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

trivial: Rename the internal NvmProductId to NvmModelId to match Intel docs

Browse Source 
This preserves sanity when comparing numbers from vendors.
This commit is contained in:
Richard Hughes 2022-09-13 13:06:52 +01:00
parent 561c8661f8
commit 404ab8e3e9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/intel-usb4/fu-intel-usb4-device.c
View File

@ -69,8 +69,8 @@ struct _FuIntelUsb4Device {
FuUsbDevice parent_instance; FuUsbDevice parent_instance;
guint blocksz; guint blocksz;
guint8 intf_nr; guint8 intf_nr;
guint16 nvm_product_id;
guint16 nvm_vendor_id; guint16 nvm_vendor_id;
guint16 nvm_model_id;
}; };
G_DEFINE_TYPE(FuIntelUsb4Device, fu_intel_usb4_device, FU_TYPE_USB_DEVICE) G_DEFINE_TYPE(FuIntelUsb4Device, fu_intel_usb4_device, FU_TYPE_USB_DEVICE)
@ -428,7 +428,7 @@ fu_intel_usb4_device_prepare_firmware(FuDevice *device,
{ {
FuIntelUsb4Device *self = FU_INTEL_USB4_DEVICE(device); FuIntelUsb4Device *self = FU_INTEL_USB4_DEVICE(device);
guint16 fw_vendor_id; guint16 fw_vendor_id;
guint16 fw_product_id; guint16 fw_model_id;
g_autoptr(FuFirmware) firmware = fu_intel_thunderbolt_firmware_new(); g_autoptr(FuFirmware) firmware = fu_intel_thunderbolt_firmware_new();
/* get vid:pid:rev */ /* get vid:pid:rev */
@ -437,24 +437,24 @@ fu_intel_usb4_device_prepare_firmware(FuDevice *device,
/* check is compatible */ /* check is compatible */
fw_vendor_id = fu_intel_thunderbolt_nvm_get_vendor_id(FU_INTEL_THUNDERBOLT_NVM(firmware)); fw_vendor_id = fu_intel_thunderbolt_nvm_get_vendor_id(FU_INTEL_THUNDERBOLT_NVM(firmware));
fw_product_id = fu_intel_thunderbolt_nvm_get_model_id(FU_INTEL_THUNDERBOLT_NVM(firmware)); fw_model_id = fu_intel_thunderbolt_nvm_get_model_id(FU_INTEL_THUNDERBOLT_NVM(firmware));
if (self->nvm_vendor_id != fw_vendor_id || self->nvm_product_id != fw_product_id) { if (self->nvm_vendor_id != fw_vendor_id || self->nvm_model_id != fw_model_id) {
if ((flags & FWUPD_INSTALL_FLAG_FORCE) == 0) { if ((flags & FWUPD_INSTALL_FLAG_FORCE) == 0) {
g_set_error(error, g_set_error(error,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED, FWUPD_ERROR_NOT_SUPPORTED,
"firmware 0x%04x:0x%04x does not match device 0x%04x:0x%04x", "firmware 0x%04x:0x%04x does not match device 0x%04x:0x%04x",
fw_vendor_id, fw_vendor_id,
fw_product_id, fw_model_id,
self->nvm_vendor_id, self->nvm_vendor_id,
self->nvm_product_id); self->nvm_model_id);
return NULL; return NULL;
} }
g_warning("firmware 0x%04x:0x%04x does not match device 0x%04x:0x%04x", g_warning("firmware 0x%04x:0x%04x does not match device 0x%04x:0x%04x",
fw_vendor_id, fw_vendor_id,
fw_product_id, fw_model_id,
self->nvm_vendor_id, self->nvm_vendor_id,
self->nvm_product_id); self->nvm_model_id);
} }
/* success */ /* success */
@ -520,9 +520,9 @@ fu_intel_usb4_device_setup(FuDevice *device, GError **error)
return FALSE; return FALSE;
} }
self->nvm_vendor_id = fu_intel_thunderbolt_nvm_get_vendor_id(FU_INTEL_THUNDERBOLT_NVM(fw)); self->nvm_vendor_id = fu_intel_thunderbolt_nvm_get_vendor_id(FU_INTEL_THUNDERBOLT_NVM(fw));
self->nvm_product_id = fu_intel_thunderbolt_nvm_get_model_id(FU_INTEL_THUNDERBOLT_NVM(fw)); self->nvm_model_id = fu_intel_thunderbolt_nvm_get_model_id(FU_INTEL_THUNDERBOLT_NVM(fw));
name = g_strdup_printf("TBT-%04x%04x", self->nvm_vendor_id, self->nvm_product_id); name = g_strdup_printf("TBT-%04x%04x", self->nvm_vendor_id, self->nvm_model_id);
fu_device_add_instance_id(device, name); fu_device_add_instance_id(device, name);
fu_device_set_version(device, fu_firmware_get_version(fw)); fu_device_set_version(device, fu_firmware_get_version(fw));
return TRUE; return TRUE;
@ -533,7 +533,7 @@ fu_intel_usb4_device_to_string(FuDevice *device, guint idt, GString *str)
{ {
FuIntelUsb4Device *self = FU_INTEL_USB4_DEVICE(device); FuIntelUsb4Device *self = FU_INTEL_USB4_DEVICE(device);
fu_string_append_kx(str, idt, "NvmVendorId", self->nvm_vendor_id); fu_string_append_kx(str, idt, "NvmVendorId", self->nvm_vendor_id);
fu_string_append_kx(str, idt, "NvmProductId", self->nvm_product_id); fu_string_append_kx(str, idt, "NvmModelId", self->nvm_model_id);
} }
static void static void