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

trivial: Prefix some DfuSe errors with useful data

Browse Source
This commit is contained in:
Richard Hughes 2016-10-12 16:39:23 +01:00
parent e9dbf70cd3
commit 41541213b1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libdfu/dfu-target.c
View File

@ -703,8 +703,10 @@ dfu_target_set_address (DfuTarget *target,
buf[0] = DFU_CMD_DFUSE_SET_ADDRESS_POINTER; buf[0] = DFU_CMD_DFUSE_SET_ADDRESS_POINTER;
memcpy (buf + 1, &address, 4); memcpy (buf + 1, &address, 4);
data_in = g_bytes_new_static (buf, sizeof(buf)); data_in = g_bytes_new_static (buf, sizeof(buf));
if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) {
g_prefix_error (error, "cannot set address 0x%x: ", address);
return FALSE; return FALSE;
}
/* for ST devices, the action only occurs when we do GetStatus */ /* for ST devices, the action only occurs when we do GetStatus */
if (!dfu_target_check_status (target, cancellable, error)) if (!dfu_target_check_status (target, cancellable, error))
@ -750,8 +752,10 @@ dfu_target_erase_address (DfuTarget *target,
buf[0] = DFU_CMD_DFUSE_ERASE; buf[0] = DFU_CMD_DFUSE_ERASE;
memcpy (buf + 1, &address, 4); memcpy (buf + 1, &address, 4);
data_in = g_bytes_new_static (buf, sizeof(buf)); data_in = g_bytes_new_static (buf, sizeof(buf));
if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) {
g_prefix_error (error, "cannot erase address 0x%x: ", address);
return FALSE; return FALSE;
}
/* for ST devices, the action only occurs when we do GetStatus */ /* for ST devices, the action only occurs when we do GetStatus */
if (!dfu_target_check_status (target, cancellable, error)) if (!dfu_target_check_status (target, cancellable, error))
@ -801,8 +805,10 @@ dfu_target_mass_erase (DfuTarget *target,
/* format buffer */ /* format buffer */
buf[0] = DFU_CMD_DFUSE_ERASE; buf[0] = DFU_CMD_DFUSE_ERASE;
data_in = g_bytes_new_static (buf, sizeof(buf)); data_in = g_bytes_new_static (buf, sizeof(buf));
if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) {
g_prefix_error (error, "cannot mass-erase: ");
return FALSE; return FALSE;
}
/* for ST devices, the action only occurs when we do GetStatus */ /* for ST devices, the action only occurs when we do GetStatus */
if (!dfu_target_check_status (target, cancellable, error)) if (!dfu_target_check_status (target, cancellable, error))
@ -848,8 +854,10 @@ dfu_target_read_unprotect (DfuTarget *target,
buf[0] = DFU_CMD_DFUSE_READ_UNPROTECT; buf[0] = DFU_CMD_DFUSE_READ_UNPROTECT;
memcpy (buf + 1, &address, 4); memcpy (buf + 1, &address, 4);
data_in = g_bytes_new_static (buf, sizeof(buf)); data_in = g_bytes_new_static (buf, sizeof(buf));
if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) {
g_prefix_error (error, "cannot read-unprotect: ");
return FALSE; return FALSE;
}
/* for ST devices, the action only occurs when we do GetStatus */ /* for ST devices, the action only occurs when we do GetStatus */
return dfu_target_check_status (target, cancellable, error); return dfu_target_check_status (target, cancellable, error);
@ -1440,8 +1448,10 @@ dfu_target_get_commands (DfuTarget *target,
/* format buffer */ /* format buffer */
buf[0] = DFU_CMD_DFUSE_GET_COMMAND; buf[0] = DFU_CMD_DFUSE_GET_COMMAND;
data_in = g_bytes_new_static (buf, sizeof(buf)); data_in = g_bytes_new_static (buf, sizeof(buf));
if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) if (!dfu_target_download_chunk (target, 0, data_in, cancellable, error)) {
g_prefix_error (error, "cannot get DfuSe commands: ");
return FALSE; return FALSE;
}
/* return results */ /* return results */
data_out = dfu_target_upload_chunk (target, 0, cancellable, error); data_out = dfu_target_upload_chunk (target, 0, cancellable, error);