Merge branch 'master' into use_hid_raw

Author: mcuee

VERSION

@@ -1 +1 @@
-0.15.0
+0.16.0

hidapi/hidapi.h

@@ -52,7 +52,7 @@
 
 	@ingroup API
 */
-#define HID_API_VERSION_MINOR 15
+#define HID_API_VERSION_MINOR 16
 /** @brief Static/compile-time patch version of the library.
 
 	@ingroup API
@@ -144,6 +144,13 @@ extern "C" {
 			   Specifications:
 			   https://www.microsoft.com/download/details.aspx?id=103325 */
 			HID_API_BUS_SPI = 0x04,
+
+			/** Virtual device
+			    E.g.: https://elixir.bootlin.com/linux/v4.0/source/include/uapi/linux/input.h#L955 
+			    
+			    Since version 0.16.0, @ref HID_API_VERSION >= HID_API_MAKE_VERSION(0, 16, 0)
+			*/
+			HID_API_BUS_VIRTUAL = 0x05,
 		} hid_bus_type;
 
 		/** hidapi info structure */
@@ -379,14 +386,10 @@ extern "C" {
 
 			This function is intended for logging/debugging purposes.
 
-			This function guarantees to never return NULL.
+			This function guarantees to never return NULL for a valid @ref dev.
 			If there was no error in the last call to hid_read/hid_read_error -
 			the returned string clearly indicates that.
 
-			Any HIDAPI function that can explicitly indicate an execution failure
-			(e.g. by an error code, or by returning NULL) - may set the error string,
-			to be returned by this function.
-
 			Strings returned from hid_read_error() must not be freed by the user,
 			i.e. owned by HIDAPI library.
 			Device-specific error string may remain allocated at most until hid_close() is called.

linux/hid.c

@@ -683,6 +683,7 @@ static struct hid_device_info * create_device_info_for_device(struct udev_device
 		case BUS_I2C:
 		case BUS_USB:
 		case BUS_SPI:
+		case BUS_VIRTUAL:
 			break;
 
 		default:
@@ -779,6 +780,14 @@ static struct hid_device_info * create_device_info_for_device(struct udev_device
 
 			break;
 
+		case BUS_VIRTUAL:
+			cur_dev->manufacturer_string = wcsdup(L"");
+			cur_dev->product_string = utf8_to_wchar_t(product_name_utf8);
+
+			cur_dev->bus_type = HID_API_BUS_VIRTUAL;
+
+			break;
+
 		default:
 			/* Unknown device type - this should never happen, as we
 			 * check for USB and Bluetooth devices above */

windows/hid.c

@@ -804,6 +804,7 @@ static struct hid_device_info *hid_internal_get_device_info(const wchar_t *path,
 	case HID_API_BUS_UNKNOWN:
 	case HID_API_BUS_SPI:
 	case HID_API_BUS_I2C:
+	case HID_API_BUS_VIRTUAL:
 		/* shut down -Wswitch */
 		break;
 	}