D51608.id159372.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51608.id159372.diff
View Options

	diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c
	--- a/sys/dev/hid/hidraw.c
	+++ b/sys/dev/hid/hidraw.c
	@@ -85,6 +85,12 @@
	free((buf), M_DEVBUF); \
	}

	+#ifdef HIDRAW_MAKE_UHID_ALIAS
	+#define HIDRAW_NAME "uhid"
	+#else
	+#define HIDRAW_NAME "hidraw"
	+#endif
	+
	struct hidraw_softc {
	device_t sc_dev; /* base device */

	@@ -183,8 +189,8 @@
	{
	device_t child;

	- if (device_find_child(parent, "hidraw", DEVICE_UNIT_ANY) == NULL) {
	- child = BUS_ADD_CHILD(parent, 0, "hidraw",
	+ if (device_find_child(parent, HIDRAW_NAME, DEVICE_UNIT_ANY) == NULL) {
	+ child = BUS_ADD_CHILD(parent, 0, HIDRAW_NAME,
	device_get_unit(parent));
	if (child != NULL)
	hidbus_set_index(child, HIDRAW_INDEX);
	@@ -1050,7 +1056,7 @@
	};

	static driver_t hidraw_driver = {
	- "hidraw",
	+ HIDRAW_NAME,
	hidraw_methods,
	sizeof(struct hidraw_softc)
	};
	diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
	--- a/sys/dev/usb/input/uhid.c
	+++ b/sys/dev/usb/input/uhid.c
	@@ -40,8 +40,6 @@
	* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
	*/

	-#include "opt_hid.h"
	-
	#include <sys/stdint.h>
	#include <sys/stddef.h>
	#include <sys/param.h>
	@@ -928,11 +926,7 @@
	};

	static driver_t uhid_driver = {
	-#ifdef HIDRAW_MAKE_UHID_ALIAS
	- .name = "hidraw",
	-#else
	.name = "uhid",
	-#endif
	.methods = uhid_methods,
	.size = sizeof(struct uhid_softc),
	};