7 files changed, 15 insertions, 276 deletions

diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c
index 4fbdb06dd167..7b9b1eb04c9c 100644
--- a/sys/dev/usb/input/atp.c
+++ b/sys/dev/usb/input/atp.c
@@ -2633,6 +2633,7 @@ static driver_t atp_driver = {
 
 DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0);
 MODULE_DEPEND(atp, usb, 1, 1, 1);
+MODULE_DEPEND(atp, hid, 1, 1, 1);
 MODULE_VERSION(atp, 1);
 USB_PNP_HOST_INFO(fg_devs);
 USB_PNP_HOST_INFO(wsp_devs);
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index a8a3bcb2f6c2..97c27608049c 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -907,5 +907,6 @@ static driver_t uhid_driver = {
 
 DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0);
 MODULE_DEPEND(uhid, usb, 1, 1, 1);
+MODULE_DEPEND(uhid, hid, 1, 1, 1);
 MODULE_VERSION(uhid, 1);
 USB_PNP_HOST_INFO(uhid_devs);
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index 4f27bf95b948..261a4b5aef95 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -2185,6 +2185,7 @@ static driver_t ukbd_driver = {
 
 DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
 MODULE_DEPEND(ukbd, usb, 1, 1, 1);
+MODULE_DEPEND(ukbd, hid, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(ukbd, evdev, 1, 1, 1);
 #endif
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index 69d177d62bc4..038ed8121df1 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -1213,6 +1213,7 @@ static driver_t ums_driver = {
 
 DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
 MODULE_DEPEND(ums, usb, 1, 1, 1);
+MODULE_DEPEND(ums, hid, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(ums, evdev, 1, 1, 1);
 #endif
diff --git a/sys/dev/usb/input/usb_rdesc.h b/sys/dev/usb/input/usb_rdesc.h
index 889381e82c15..5dbfdb91f3f2 100644
--- a/sys/dev/usb/input/usb_rdesc.h
+++ b/sys/dev/usb/input/usb_rdesc.h
@@ -1,11 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2000 Nick Hibma <n_hibma@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2005 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
+ * Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,277 +26,14 @@
  *
  * $FreeBSD$
  *
- * This file contains replacements for broken HID report descriptors.
+ * This a proxy file for replacements for broken HID report descriptors.
  */
 
-#define	UHID_GRAPHIRE_REPORT_DESCR(...) \
-    0x05, 0x0d,                    /*  USAGE_PAGE (Digitizers)		*/\
-    0x09, 0x01,                    /*  USAGE (Digitizer)		*/\
-    0xa1, 0x01,                    /*  COLLECTION (Application)		*/\
-    0x85, 0x02,                    /*    REPORT_ID (2)			*/\
-    0x05, 0x0d,                    /*    USAGE_PAGE (Digitizers)	*/\
-    0x09, 0x01,                    /*    USAGE (Digitizer)		*/\
-    0xa1, 0x00,                    /*    COLLECTION (Physical)		*/\
-    0x15, 0x00,                    /*      LOGICAL_MINIMUM (0)		*/\
-    0x25, 0x01,                    /*      LOGICAL_MAXIMUM (1)		*/\
-    0x09, 0x33,                    /*      USAGE (Touch)		*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x09, 0x44,                    /*      USAGE (Barrel Switch)	*/\
-    0x95, 0x02,                    /*      REPORT_COUNT (2)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x09, 0x00,                    /*      USAGE (Undefined)		*/\
-    0x95, 0x02,                    /*      REPORT_COUNT (2)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x03,                    /*      INPUT (Cnst,Var,Abs)		*/\
-    0x09, 0x3c,                    /*      USAGE (Invert)		*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x09, 0x38,                    /*      USAGE (Transducer Index)	*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x09, 0x32,                    /*      USAGE (In Range)		*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x05, 0x01,                    /*      USAGE_PAGE (Generic Desktop)	*/\
-    0x09, 0x30,                    /*      USAGE (X)			*/\
-    0x15, 0x00,                    /*      LOGICAL_MINIMUM (0)		*/\
-    0x26, 0xde, 0x27,              /*      LOGICAL_MAXIMUM (10206)	*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x09, 0x31,                    /*      USAGE (Y)			*/\
-    0x26, 0xfe, 0x1c,              /*      LOGICAL_MAXIMUM (7422)	*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0x05, 0x0d,                    /*      USAGE_PAGE (Digitizers)	*/\
-    0x09, 0x30,                    /*      USAGE (Tip Pressure)		*/\
-    0x26, 0xff, 0x01,              /*      LOGICAL_MAXIMUM (511)	*/\
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/\
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/\
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/\
-    0xc0,                          /*    END_COLLECTION			*/\
-    0x05, 0x0d,                    /*    USAGE_PAGE (Digitizers)	*/\
-    0x09, 0x00,                    /*    USAGE (Undefined)		*/\
-    0x85, 0x02,                    /*    REPORT_ID (2)			*/\
-    0x95, 0x01,                    /*    REPORT_COUNT (1)		*/\
-    0xb1, 0x02,                    /*    FEATURE (Data,Var,Abs)		*/\
-    0x09, 0x00,                    /*    USAGE (Undefined)		*/\
-    0x85, 0x03,                    /*    REPORT_ID (3)			*/\
-    0x95, 0x01,                    /*    REPORT_COUNT (1)		*/\
-    0xb1, 0x02,                    /*    FEATURE (Data,Var,Abs)		*/\
-    0xc0,                          /*  END_COLLECTION			*/\
-
-#define	UHID_GRAPHIRE3_4X5_REPORT_DESCR(...) \
-    0x05, 0x01,                    /* USAGE_PAGE (Generic Desktop)	*/\
-    0x09, 0x02,                    /* USAGE (Mouse)			*/\
-    0xa1, 0x01,                    /* COLLECTION (Application)		*/\
-    0x85, 0x01,                    /*   REPORT_ID (1)			*/\
-    0x09, 0x01,                    /*   USAGE (Pointer)			*/\
-    0xa1, 0x00,                    /*   COLLECTION (Physical)		*/\
-    0x05, 0x09,                    /*     USAGE_PAGE (Button)		*/\
-    0x19, 0x01,                    /*     USAGE_MINIMUM (Button 1)	*/\
-    0x29, 0x03,                    /*     USAGE_MAXIMUM (Button 3)	*/\
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/\
-    0x25, 0x01,                    /*     LOGICAL_MAXIMUM (1)		*/\
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/\
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/\
-    0x75, 0x05,                    /*     REPORT_SIZE (5)		*/\
-    0x81, 0x01,                    /*     INPUT (Cnst,Ary,Abs)		*/\
-    0x05, 0x01,                    /*     USAGE_PAGE (Generic Desktop)	*/\
-    0x09, 0x30,                    /*     USAGE (X)			*/\
-    0x09, 0x31,                    /*     USAGE (Y)			*/\
-    0x09, 0x38,                    /*     USAGE (Wheel)			*/\
-    0x15, 0x81,                    /*     LOGICAL_MINIMUM (-127)	*/\
-    0x25, 0x7f,                    /*     LOGICAL_MAXIMUM (127)		*/\
-    0x75, 0x08,                    /*     REPORT_SIZE (8)		*/\
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/\
-    0x81, 0x06,                    /*     INPUT (Data,Var,Rel)		*/\
-    0xc0,                          /*   END_COLLECTION			*/\
-    0xc0,                          /* END_COLLECTION			*/\
-    0x05, 0x0d,                    /* USAGE_PAGE (Digitizers)		*/\
-    0x09, 0x01,                    /* USAGE (Pointer)			*/\
-    0xa1, 0x01,                    /* COLLECTION (Applicaption)		*/\
-    0x85, 0x02,                    /*   REPORT_ID (2)			*/\
-    0x05, 0x0d,                    /*   USAGE_PAGE (Digitizers)		*/\
-    0x09, 0x01,                    /*   USAGE (Digitizer)		*/\
-    0xa1, 0x00,                    /*   COLLECTION (Physical)		*/\
-    0x09, 0x33,                    /*     USAGE (Touch)			*/\
-    0x09, 0x44,                    /*     USAGE (Barrel Switch)		*/\
-    0x09, 0x44,                    /*     USAGE (Barrel Switch)		*/\
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/\
-    0x25, 0x01,                    /*     LOGICAL_MAXIMUM (1)		*/\
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/\
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/\
-    0x95, 0x02,                    /*     REPORT_COUNT (2)		*/\
-    0x81, 0x01,                    /*     INPUT (Cnst,Ary,Abs)		*/\
-    0x09, 0x3c,                    /*     USAGE (Invert)		*/\
-    0x09, 0x38,                    /*     USAGE (Transducer Index)	*/\
-    0x09, 0x32,                    /*     USAGE (In Range)		*/\
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/\
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0x05, 0x01,                    /*     USAGE_PAGE (Generic Desktop)	*/\
-    0x09, 0x30,                    /*     USAGE (X)			*/\
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/\
-    0x26, 0xde, 0x27,              /*     LOGICAL_MAXIMUM (10206)	*/\
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/\
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0x09, 0x31,                    /*     USAGE (Y)			*/\
-    0x26, 0xfe, 0x1c,              /*     LOGICAL_MAXIMUM (7422)	*/\
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/\
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0x05, 0x0d,                    /*     USAGE_PAGE (Digitizers)	*/\
-    0x09, 0x30,                    /*     USAGE (Tip Pressure)		*/\
-    0x26, 0xff, 0x01,              /*     LOGICAL_MAXIMUM (511)		*/\
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/\
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/\
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/\
-    0xc0,                          /*   END_COLLECTION			*/\
-    0x05, 0x0d,                    /*   USAGE_PAGE (Digitizers)		*/\
-    0x09, 0x00,                    /*   USAGE (Undefined)		*/\
-    0x85, 0x02,                    /*   REPORT_ID (2)			*/\
-    0x95, 0x01,                    /*   REPORT_COUNT (1)		*/\
-    0xb1, 0x02,                    /*   FEATURE (Data,Var,Abs)		*/\
-    0x09, 0x00,                    /*   USAGE (Undefined)		*/\
-    0x85, 0x03,                    /*   REPORT_ID (3)			*/\
-    0x95, 0x01,                    /*   REPORT_COUNT (1)		*/\
-    0xb1, 0x02,                    /*   FEATURE (Data,Var,Abs)		*/\
-    0xc0                           /* END_COLLECTION			*/\
-
-/*
- * The descriptor has no output report format, thus preventing you from
- * controlling the LEDs and the built-in rumblers.
- */
-#define	UHID_XB360GP_REPORT_DESCR(...) \
-    0x05, 0x01,		/* USAGE PAGE (Generic Desktop)		*/\
-    0x09, 0x05,		/* USAGE (Gamepad)			*/\
-    0xa1, 0x01,		/* COLLECTION (Application)		*/\
-    /* Unused */\
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/\
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/\
-    0x81, 0x01,		/*  INPUT (Constant)			*/\
-    /* Byte count */\
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/\
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/\
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/\
-    0x09, 0x3b,		/*  USAGE (Byte Count)			*/\
-    0x81, 0x01,		/*  INPUT (Constant)			*/\
-    /* D-Pad */\
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/\
-    0x09, 0x01,		/*  USAGE (Pointer)			*/\
-    0xa1, 0x00,		/*  COLLECTION (Physical)		*/\
-    0x75, 0x01,		/*   REPORT SIZE (1)			*/\
-    0x15, 0x00,		/*   LOGICAL MINIMUM (0)		*/\
-    0x25, 0x01,		/*   LOGICAL MAXIMUM (1)		*/\
-    0x35, 0x00,		/*   PHYSICAL MINIMUM (0)		*/\
-    0x45, 0x01,		/*   PHYSICAL MAXIMUM (1)		*/\
-    0x95, 0x04,		/*   REPORT COUNT (4)			*/\
-    0x05, 0x01,		/*   USAGE PAGE (Generic Desktop)	*/\
-    0x09, 0x90,		/*   USAGE (D-Pad Up)			*/\
-    0x09, 0x91,		/*   USAGE (D-Pad Down)			*/\
-    0x09, 0x93,		/*   USAGE (D-Pad Left)			*/\
-    0x09, 0x92,		/*   USAGE (D-Pad Right)		*/\
-    0x81, 0x02,		/*   INPUT (Data, Variable, Absolute)	*/\
-    0xc0,		/*  END COLLECTION			*/\
-    /* Buttons 5-11 */\
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/\
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/\
-    0x25, 0x01,		/*  LOGICAL MAXIMUM (1)			*/\
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/\
-    0x45, 0x01,		/*  PHYSICAL MAXIMUM (1)		*/\
-    0x95, 0x07,		/*  REPORT COUNT (7)			*/\
-    0x05, 0x09,		/*  USAGE PAGE (Button)			*/\
-    0x09, 0x08,		/*  USAGE (Button 8)			*/\
-    0x09, 0x07,		/*  USAGE (Button 7)			*/\
-    0x09, 0x09,		/*  USAGE (Button 9)			*/\
-    0x09, 0x0a,		/*  USAGE (Button 10)			*/\
-    0x09, 0x05,		/*  USAGE (Button 5)			*/\
-    0x09, 0x06,		/*  USAGE (Button 6)			*/\
-    0x09, 0x0b,		/*  USAGE (Button 11)			*/\
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/\
-    /* Unused */\
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/\
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/\
-    0x81, 0x01,		/*  INPUT (Constant)			*/\
-    /* Buttons 1-4 */\
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/\
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/\
-    0x25, 0x01,		/*  LOGICAL MAXIMUM (1)			*/\
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/\
-    0x45, 0x01,		/*  PHYSICAL MAXIMUM (1)		*/\
-    0x95, 0x04,		/*  REPORT COUNT (4)			*/\
-    0x05, 0x09,		/*  USAGE PAGE (Button)			*/\
-    0x19, 0x01,		/*  USAGE MINIMUM (Button 1)		*/\
-    0x29, 0x04,		/*  USAGE MAXIMUM (Button 4)		*/\
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/\
-    /* Triggers */\
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/\
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/\
-    0x26, 0xff, 0x00,	/*  LOGICAL MAXIMUM (255)		*/\
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/\
-    0x46, 0xff, 0x00,	/*  PHYSICAL MAXIMUM (255)		*/\
-    0x95, 0x02,		/*  REPORT SIZE (2)			*/\
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/\
-    0x09, 0x32,		/*  USAGE (Z)				*/\
-    0x09, 0x35,		/*  USAGE (Rz)				*/\
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/\
-    /* Sticks */\
-    0x75, 0x10,		/*  REPORT SIZE (16)			*/\
-    0x16, 0x00, 0x80,	/*  LOGICAL MINIMUM (-32768)		*/\
-    0x26, 0xff, 0x7f,	/*  LOGICAL MAXIMUM (32767)		*/\
-    0x36, 0x00, 0x80,	/*  PHYSICAL MINIMUM (-32768)		*/\
-    0x46, 0xff, 0x7f,	/*  PHYSICAL MAXIMUM (32767)		*/\
-    0x95, 0x04,		/*  REPORT COUNT (4)			*/\
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/\
-    0x09, 0x30,		/*  USAGE (X)				*/\
-    0x09, 0x31,		/*  USAGE (Y)				*/\
-    0x09, 0x33,		/*  USAGE (Rx)				*/\
-    0x09, 0x34,		/*  USAGE (Ry)				*/\
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/\
-    /* Unused */\
-    0x75, 0x30,		/*  REPORT SIZE (48)			*/\
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/\
-    0x81, 0x01,		/*  INPUT (Constant)			*/\
-    0xc0		/* END COLLECTION			*/\
+#include <dev/hid/hidrdesc.h>
 
-/* Fixed report descriptor for Super Nintendo gamepads */
-#define	UHID_SNES_REPORT_DESCR(...) \
-    0x05, 0x01,         /*  Usage Page (Desktop),           */\
-    0x09, 0x04,         /*  Usage (Joystik),                */\
-    0xA1, 0x01,         /*  Collection (Application),       */\
-    0xA1, 0x02,         /*      Collection (Logical),       */\
-    0x14,               /*          Logical Minimum (0),    */\
-    0x75, 0x08,         /*          Report Size (8),        */\
-    0x95, 0x03,         /*          Report Count (3),       */\
-    0x81, 0x01,         /*          Input (Constant),       */\
-    0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */\
-    0x95, 0x02,         /*          Report Count (2),       */\
-    0x09, 0x30,         /*          Usage (X),              */\
-    0x09, 0x31,         /*          Usage (Y),              */\
-    0x81, 0x02,         /*          Input (Variable),       */\
-    0x75, 0x01,         /*          Report Size (1),        */\
-    0x95, 0x04,         /*          Report Count (4),       */\
-    0x81, 0x01,         /*          Input (Constant),       */\
-    0x25, 0x01,         /*          Logical Maximum (1),    */\
-    0x95, 0x0A,         /*          Report Count (10),      */\
-    0x05, 0x09,         /*          Usage Page (Button),    */\
-    0x19, 0x01,         /*          Usage Minimum (01h),    */\
-    0x29, 0x0A,         /*          Usage Maximum (0Ah),    */\
-    0x81, 0x02,         /*          Input (Variable),       */\
-    0x95, 0x0A,         /*          Report Count (10),      */\
-    0x81, 0x01,         /*          Input (Constant),       */\
-    0xC0,               /*      End Collection,             */\
-    0xC0                /*  End Collection                  */
+#define	UHID_GRAPHIRE_REPORT_DESCR	HID_GRAPHIRE_REPORT_DESCR
+#define	UHID_GRAPHIRE3_4X5_REPORT_DESCR	HID_GRAPHIRE3_4X5_REPORT_DESCR
+#define	UHID_XB360GP_REPORT_DESCR	HID_XB360GP_REPORT_DESCR
+#define	UHID_SNES_REPORT_DESCR		HID_SNES_REPORT_DESCR
+#define	UHID_MOUSE_BOOTPROTO_DESCR	HID_MOUSE_BOOTPROTO_DESCR
+#define	UHID_KBD_BOOTPROTO_DESCR	HID_KBD_BOOTPROTO_DESCR
diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c
index d65318fee326..056c2c3cb0cc 100644
--- a/sys/dev/usb/input/wmt.c
+++ b/sys/dev/usb/input/wmt.c
@@ -1072,6 +1072,7 @@ static driver_t wmt_driver = {
 
 DRIVER_MODULE(wmt, uhub, wmt_driver, wmt_devclass, NULL, 0);
 MODULE_DEPEND(wmt, usb, 1, 1, 1);
+MODULE_DEPEND(wmt, hid, 1, 1, 1);
 MODULE_DEPEND(wmt, evdev, 1, 1, 1);
 MODULE_VERSION(wmt, 1);
 USB_PNP_HOST_INFO(wmt_devs);
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index 3b1cdf9ec811..29eaa34cdfdc 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -1403,5 +1403,6 @@ static devclass_t wsp_devclass;
 
 DRIVER_MODULE(wsp, uhub, wsp_driver, wsp_devclass, NULL, 0);
 MODULE_DEPEND(wsp, usb, 1, 1, 1);
+MODULE_DEPEND(wsp, hid, 1, 1, 1);
 MODULE_VERSION(wsp, 1);
 USB_PNP_HOST_INFO(wsp_devs);