From 8704f5af2e9d0dfa0014634efe57a1ec73a2b388 Mon Sep 17 00:00:00 2001
From: kevans <kevans@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 16 Jun 2020 12:21:55 +0000
Subject: [PATCH] MFC r361977: libusb: improve compatibility

Specifically, add LIBUSB_CLASS_PHYSICAL and the libusb_has_capability API.
Descriptions and functionality for these derived from the
documentation at [0].  The current set of capabilities are all supported by
libusb.

These were detected as missing after updating net/freerdp to 2.1.1, which
attempted to use both.

[0] http://libusb.sourceforge.net/api-1.0/group__libusb__misc.html


git-svn-id: svn://svn.freebsd.org/base/stable/9@362224 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 lib/libusb/Makefile   |  1 +
 lib/libusb/libusb.3   | 29 ++++++++++++++++++++++++++++-
 lib/libusb/libusb.h   | 17 +++++++++++++++++
 lib/libusb/libusb10.c | 15 +++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 06cdf75f5..3bde86c23 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -44,6 +44,7 @@ CFLAGS+=	-DCOMPAT_32BIT
 MLINKS += libusb.3 libusb_get_version.3
 MLINKS += libusb.3 libusb_init.3
 MLINKS += libusb.3 libusb_exit.3
+MLINKS += libusb.3 libusb_has_capability.3
 MLINKS += libusb.3 libusb_strerror.3
 MLINKS += libusb.3 libusb_error_name.3
 MLINKS += libusb.3 libusb_set_debug.3
diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3
index c6f4082c7..c5d016b1e 100644
--- a/lib/libusb/libusb.3
+++ b/lib/libusb/libusb.3
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 23, 2016
+.Dd June 16, 2020
 .Dt LIBUSB 3
 .Os
 .Sh NAME
@@ -61,6 +61,33 @@ Deinitialise libusb.
 Must be called at the end of the application.
 Other libusb routines may not be called after this function.
 .Pp
+.Ft int
+.Fn libusb_has_capability "uint32_t capability"
+This function checks the runtime capabilities of
+.Nm .
+This function will return non-zero if the given
+.Fa capability
+is supported, 0 if it is not supported.
+The valid values for
+.Fa capability
+are:
+.Bl -tag -width LIBUSB_CAP -offset indent
+.It Va LIBUSB_CAP_HAS_CAPABILITY
+.Nm
+supports
+.Fn libusb_has_capability .
+.It Va LIBUSB_CAP_HAS_HOTPLUG
+.Nm
+supports hotplug notifications.
+.It Va LIBUSB_CAP_HAS_HID_ACCESS
+.Nm
+can access HID devices without requiring user intervention.
+.It Va LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+.Nm
+supports detaching of the default USB driver with
+.Fn libusb_detach_kernel_driver .
+.El
+.Pp
 .Ft const char *
 .Fn libusb_strerror "int code"
 Get the ASCII representation of the error given by the
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 5819fc04c..5c1a97e68 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -49,6 +49,7 @@ enum libusb_class_code {
 	LIBUSB_CLASS_AUDIO = 1,
 	LIBUSB_CLASS_COMM = 2,
 	LIBUSB_CLASS_HID = 3,
+	LIBUSB_CLASS_PHYSICAL = 5,
 	LIBUSB_CLASS_PTP = 6,
 	LIBUSB_CLASS_IMAGE = 6,
 	LIBUSB_CLASS_PRINTER = 7,
@@ -173,6 +174,21 @@ enum libusb_bos_type {
 	LIBUSB_BT_CONTAINER_ID = 4,
 };
 
+enum libusb_capability {
+	/* libusb supports libusb_has_capability(). */
+	LIBUSB_CAP_HAS_CAPABILITY = 0,
+	/* Hotplug support is available. */
+	LIBUSB_CAP_HAS_HOTPLUG,
+	/* Can access HID devices without requiring user intervention. */
+	LIBUSB_CAP_HAS_HID_ACCESS,
+
+	/*
+	 * Supports detaching of the default USB driver with
+	 * libusb_detach_kernel_driver().
+	 */
+	LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+};
+
 enum libusb_error {
 	LIBUSB_SUCCESS = 0,
 	LIBUSB_ERROR_IO = -1,
@@ -432,6 +448,7 @@ const char *libusb_strerror(int code);
 const char *libusb_error_name(int code);
 int	libusb_init(libusb_context ** context);
 void	libusb_exit(struct libusb_context *ctx);
+int	libusb_has_capability(uint32_t capability);
 
 /* Device handling and enumeration */
 
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 84d0c132c..9b8846013 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -1705,3 +1705,18 @@ libusb_error_name(int code)
 		return ("LIBUSB_ERROR_UNKNOWN");
 	}
 }
+
+int
+libusb_has_capability(uint32_t capability)
+{
+
+	switch (capability) {
+	case LIBUSB_CAP_HAS_CAPABILITY:
+	case LIBUSB_CAP_HAS_HOTPLUG:
+	case LIBUSB_CAP_HAS_HID_ACCESS:
+	case LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER:
+		return (1);
+	default:
+		return (0);
+	}
+}
-- 
2.42.0