From 16261e3f76d121abafdffedb4dcc4ce4d261718b Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 8 Jun 2016 14:58:32 +0100
Subject: [PATCH] libdfu: Show the DFU protocol version in 'dfu-tool list'

---
 libdfu/dfu-device.c | 30 ++++++++++++++++++++++++------
 libdfu/dfu-device.h |  1 +
 libdfu/dfu-tool.c   |  6 ++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/libdfu/dfu-device.c b/libdfu/dfu-device.c
index dc2aa44de..7eab4663f 100644
--- a/libdfu/dfu-device.c
+++ b/libdfu/dfu-device.c
@@ -64,6 +64,7 @@ typedef struct {
 	gboolean		 done_upload_or_download;
 	gchar			*display_name;
 	gchar			*platform_id;
+	guint16			 version;
 	guint16			 runtime_pid;
 	guint16			 runtime_vid;
 	guint16			 runtime_release;
@@ -180,6 +181,24 @@ dfu_device_get_transfer_size (DfuDevice *device)
 	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:
  * @device: a #GUsbDevice
@@ -253,7 +272,6 @@ dfu_device_parse_iface_data (DfuDevice *device, GBytes *iface_data)
 	DfuDevicePrivate *priv = GET_PRIVATE (device);
 	const DfuFuncDescriptor *desc;
 	gsize iface_data_length;
-	guint16 dfu_version;
 
 	/* parse the functional descriptor */
 	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 */
-	dfu_version = GUINT16_FROM_LE (desc->bcdDFUVersion);
+	priv->version = GUINT16_FROM_LE (desc->bcdDFUVersion);
 	if (priv->quirks & DFU_DEVICE_QUIRK_IGNORE_INVALID_VERSION) {
 		g_debug ("ignoring quirked DFU version");
 	} else {
-		if (dfu_version == 0x0100 ||
-		    dfu_version == 0x0110) {
+		if (priv->version == DFU_VERSION_DFU_1_0 ||
+		    priv->version == DFU_VERSION_DFU_1_1) {
 			g_debug ("basic DFU, no DfuSe support");
 			priv->dfuse_supported = FALSE;
-		} else if (dfu_version == 0x011a) {
+		} else if (priv->version == DFU_VERSION_DFUSE) {
 			g_debug ("DfuSe support");
 			priv->dfuse_supported = TRUE;
 		} else {
 			g_warning ("DFU version is invalid: 0x%04x",
-				   dfu_version);
+				   priv->version);
 		}
 	}
 
diff --git a/libdfu/dfu-device.h b/libdfu/dfu-device.h
index a2c18a5fd..c79b8cf07 100644
--- a/libdfu/dfu-device.h
+++ b/libdfu/dfu-device.h
@@ -177,6 +177,7 @@ DfuMode		 dfu_device_get_mode			(DfuDevice	*device);
 DfuState	 dfu_device_get_state			(DfuDevice	*device);
 DfuStatus	 dfu_device_get_status			(DfuDevice	*device);
 guint16		 dfu_device_get_transfer_size		(DfuDevice	*device);
+guint16		 dfu_device_get_version			(DfuDevice	*device);
 guint		 dfu_device_get_timeout			(DfuDevice	*device);
 gboolean	 dfu_device_can_upload			(DfuDevice	*device);
 gboolean	 dfu_device_can_download		(DfuDevice	*device);
diff --git a/libdfu/dfu-tool.c b/libdfu/dfu-tool.c
index 6200aaa39..0d737189a 100644
--- a/libdfu/dfu-tool.c
+++ b/libdfu/dfu-tool.c
@@ -1926,6 +1926,12 @@ dfu_tool_list (DfuToolPrivate *priv, gchar **values, GError **error)
 			 g_usb_device_get_pid (dev),
 			 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 */
 		if (!dfu_device_open (device,
 				      DFU_DEVICE_OPEN_FLAG_NONE,