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

dfu: Show the DfuTargets when calling DfuDevice->to_string()

Browse Source 
This is a much more standard way of doing this.
This commit is contained in:
Richard Hughes 2021-01-26 21:43:51 +00:00
parent da7b898fb5
commit af75522a5e
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dfu/dfu-device.c
View File

@ -134,6 +134,10 @@ dfu_device_to_string (FuDevice *device, guint idt, GString *str)
fu_common_string_append_kx (str, idt, "IfaceNumber", priv->iface_number); fu_common_string_append_kx (str, idt, "IfaceNumber", priv->iface_number);
fu_common_string_append_kx (str, idt, "DnloadTimeout", priv->dnload_timeout); fu_common_string_append_kx (str, idt, "DnloadTimeout", priv->dnload_timeout);
fu_common_string_append_kx (str, idt, "TimeoutMs", priv->timeout_ms); fu_common_string_append_kx (str, idt, "TimeoutMs", priv->timeout_ms);
for (guint i = 0; i < priv->targets->len; i++) {
DfuTarget *target = g_ptr_array_index (priv->targets, i);
dfu_target_to_string (target, idt + 1, str);
}
} }
/** /**

23
plugins/dfu/dfu-target.c
View File

@ -121,19 +121,23 @@ dfu_target_finalize (GObject *object)
G_OBJECT_CLASS (dfu_target_parent_class)->finalize (object); G_OBJECT_CLASS (dfu_target_parent_class)->finalize (object);
} }
static gchar * void
dfu_target_sectors_to_string (DfuTarget *target) dfu_target_to_string (DfuTarget *target, guint idt, GString *str)
{ {
DfuTargetPrivate *priv = GET_PRIVATE (target); DfuTargetPrivate *priv = GET_PRIVATE (target);
GString *str = g_string_new (""); fu_common_string_append_kx (str, idt, "AltSetting", priv->alt_setting);
fu_common_string_append_kx (str, idt, "AltIdx", priv->alt_idx);
fu_common_string_append_kv (str, idt, "AltName", priv->alt_name);
if (priv->alt_name_for_display != NULL) {
fu_common_string_append_kv (str, idt, "AltNameForDisplay",
priv->alt_name_for_display);
}
for (guint i = 0; i < priv->sectors->len; i++) { for (guint i = 0; i < priv->sectors->len; i++) {
DfuSector *sector = g_ptr_array_index (priv->sectors, i); DfuSector *sector = g_ptr_array_index (priv->sectors, i);
g_autofree gchar *tmp = dfu_sector_to_string (sector); g_autofree gchar *tmp1 = g_strdup_printf ("Idx%02x", i);
g_string_append_printf (str, "%s\n", tmp); g_autofree gchar *tmp2 = dfu_sector_to_string (sector);
fu_common_string_append_kv (str, idt + 1, tmp1, tmp2);
} }
if (str->len > 0)
g_string_truncate (str, str->len - 1);
return g_string_free (str, FALSE);
} }
DfuSector * DfuSector *
@ -288,7 +292,6 @@ gboolean
dfu_target_parse_sectors (DfuTarget *target, const gchar *alt_name, GError **error) dfu_target_parse_sectors (DfuTarget *target, const gchar *alt_name, GError **error)
{ {
DfuTargetPrivate *priv = GET_PRIVATE (target); DfuTargetPrivate *priv = GET_PRIVATE (target);
g_autofree gchar *str_debug = NULL;
g_auto(GStrv) zones = NULL; g_auto(GStrv) zones = NULL;
/* not set */ /* not set */
@ -373,8 +376,6 @@ dfu_target_parse_sectors (DfuTarget *target, const gchar *alt_name, GError **err
} }
/* success */ /* success */
str_debug = dfu_target_sectors_to_string (target);
g_debug ("%s", str_debug);
return TRUE; return TRUE;
} }

3
plugins/dfu/dfu-target.h
View File

@ -83,3 +83,6 @@ gboolean dfu_target_download (DfuTarget *target,
GError **error); GError **error);
gboolean dfu_target_mass_erase (DfuTarget *target, gboolean dfu_target_mass_erase (DfuTarget *target,
GError **error); GError **error);
void dfu_target_to_string (DfuTarget *target,
guint idt,
GString *str);