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

libdfu: Show the DFU protocol version in 'dfu-tool list'

Browse Source
This commit is contained in:
Richard Hughes 2016-06-08 14:58:32 +01:00
parent 10d4c84fbd
commit 16261e3f76
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libdfu/dfu-device.c
View File

@ -64,6 +64,7 @@ typedef struct {
gboolean done_upload_or_download; gboolean done_upload_or_download;
gchar *display_name; gchar *display_name;
gchar *platform_id; gchar *platform_id;
guint16 version;
guint16 runtime_pid; guint16 runtime_pid;
guint16 runtime_vid; guint16 runtime_vid;
guint16 runtime_release; guint16 runtime_release;
@ -180,6 +181,24 @@ dfu_device_get_transfer_size (DfuDevice *device)
return priv->transfer_size; return priv->transfer_size;
} }
/**
* dfu_device_get_version:
* @device: a #GUsbDevice
*
* Gets the DFU specification version supported by the device.
*
* Return value: integer, or 0 for unknown, e.g. %DFU_VERSION_DFU_1_1
*
* Since: 0.7.2
**/
guint16
dfu_device_get_version (DfuDevice *device)
{
DfuDevicePrivate *priv = GET_PRIVATE (device);
g_return_val_if_fail (DFU_IS_DEVICE (device), 0xffff);
return priv->version;
}
/** /**
* dfu_device_get_download_timeout: * dfu_device_get_download_timeout:
* @device: a #GUsbDevice * @device: a #GUsbDevice
@ -253,7 +272,6 @@ dfu_device_parse_iface_data (DfuDevice *device, GBytes *iface_data)
DfuDevicePrivate *priv = GET_PRIVATE (device); DfuDevicePrivate *priv = GET_PRIVATE (device);
const DfuFuncDescriptor *desc; const DfuFuncDescriptor *desc;
gsize iface_data_length; gsize iface_data_length;
guint16 dfu_version;
/* parse the functional descriptor */ /* parse the functional descriptor */
desc = g_bytes_get_data (iface_data, &iface_data_length); desc = g_bytes_get_data (iface_data, &iface_data_length);
@ -277,20 +295,20 @@ dfu_device_parse_iface_data (DfuDevice *device, GBytes *iface_data)
} }
/* check DFU version */ /* check DFU version */
dfu_version = GUINT16_FROM_LE (desc->bcdDFUVersion); priv->version = GUINT16_FROM_LE (desc->bcdDFUVersion);
if (priv->quirks & DFU_DEVICE_QUIRK_IGNORE_INVALID_VERSION) { if (priv->quirks & DFU_DEVICE_QUIRK_IGNORE_INVALID_VERSION) {
g_debug ("ignoring quirked DFU version"); g_debug ("ignoring quirked DFU version");
} else { } else {
if (dfu_version == 0x0100 || if (priv->version == DFU_VERSION_DFU_1_0 ||
dfu_version == 0x0110) { priv->version == DFU_VERSION_DFU_1_1) {
g_debug ("basic DFU, no DfuSe support"); g_debug ("basic DFU, no DfuSe support");
priv->dfuse_supported = FALSE; priv->dfuse_supported = FALSE;
} else if (dfu_version == 0x011a) { } else if (priv->version == DFU_VERSION_DFUSE) {
g_debug ("DfuSe support"); g_debug ("DfuSe support");
priv->dfuse_supported = TRUE; priv->dfuse_supported = TRUE;
} else { } else {
g_warning ("DFU version is invalid: 0x%04x", g_warning ("DFU version is invalid: 0x%04x",
dfu_version); priv->version);
} }
} }

1
libdfu/dfu-device.h
View File

@ -177,6 +177,7 @@ DfuMode dfu_device_get_mode (DfuDevice *device);
DfuState dfu_device_get_state (DfuDevice *device); DfuState dfu_device_get_state (DfuDevice *device);
DfuStatus dfu_device_get_status (DfuDevice *device); DfuStatus dfu_device_get_status (DfuDevice *device);
guint16 dfu_device_get_transfer_size (DfuDevice *device); guint16 dfu_device_get_transfer_size (DfuDevice *device);
guint16 dfu_device_get_version (DfuDevice *device);
guint dfu_device_get_timeout (DfuDevice *device); guint dfu_device_get_timeout (DfuDevice *device);
gboolean dfu_device_can_upload (DfuDevice *device); gboolean dfu_device_can_upload (DfuDevice *device);
gboolean dfu_device_can_download (DfuDevice *device); gboolean dfu_device_can_download (DfuDevice *device);

6
libdfu/dfu-tool.c
View File

@ -1926,6 +1926,12 @@ dfu_tool_list (DfuToolPrivate *priv, gchar **values, GError **error)
g_usb_device_get_pid (dev), g_usb_device_get_pid (dev),
version); version);
tmp = dfu_version_to_string (dfu_device_get_version (device));
if (tmp != NULL) {
/* TRANSLATORS: DFU protocol version, e.g. 1.1 */
dfu_tool_print_indent (_("Protocol"), tmp, 1);
}
/* open */ /* open */
if (!dfu_device_open (device, if (!dfu_device_open (device,
DFU_DEVICE_OPEN_FLAG_NONE, DFU_DEVICE_OPEN_FLAG_NONE,