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

wacom-usb: Fix flashing failure with latest Intuos Pro tablet

Browse Source 
The checksum is now stored as the very last flash descriptor, so we need to pad
the SREC data to include the 'missing' data range. As we're doing that, we
should optimize like the Wacom updater does and skip writing descriptors that
are unused.
This commit is contained in:
Richard Hughes 2019-02-04 12:58:07 +00:00
parent 040ac626b5
commit 4530c44f2d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,6 +597,13 @@ fu_wac_device_write_firmware (FuDevice *device, GBytes *blob, GError **error)
if (blob_block == NULL)
break;
/* ignore empty blocks */
if (dfu_utils_bytes_is_empty (blob_block)) {
g_debug ("empty block, ignoring");
fu_device_set_progress_full (device, blocks_done++, blocks_total);
continue;
}
/* erase entire block */
if (!fu_wac_device_erase_block (self, i, error))
return FALSE;
@ -637,6 +644,7 @@ fu_wac_device_write_firmware (FuDevice *device, GBytes *blob, GError **error)
return FALSE;
for (guint16 i = 0; i < self->flash_descriptors->len; i++) {
FuWacFlashDescriptor *fd = g_ptr_array_index (self->flash_descriptors, i);
GBytes *blob_block;
guint32 csum_rom;
/* if page is protected */
@ -644,8 +652,11 @@ fu_wac_device_write_firmware (FuDevice *device, GBytes *blob, GError **error)
continue;
/* no more written pages */
if (g_hash_table_lookup (fd_blobs, fd) == NULL)
break;
blob_block = g_hash_table_lookup (fd_blobs, fd);
if (blob_block == NULL)
continue;
if (dfu_utils_bytes_is_empty (blob_block))
continue;
/* check checksum matches */
csum_rom = g_array_index (self->checksums, guint32, i);