The branch main has been updated by wulf:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=0f0379fa5581c6b89d22bd041f7443581bac616c

commit 0f0379fa5581c6b89d22bd041f7443581bac616c
Author:     Vladimir Kondratyev <w...@freebsd.org>
AuthorDate: 2021-01-09 12:07:19 +0000
Commit:     Vladimir Kondratyev <w...@freebsd.org>
CommitDate: 2021-01-10 19:17:20 +0000

    hid: Add recently imported drivers to NOTES
    
    Reviewed by:    hselasky
    Differential revision:  https://reviews.freebsd.org/D28060
---
 sys/amd64/conf/NOTES |  8 +++++++-
 sys/arm64/conf/NOTES |  7 +++++++
 sys/conf/NOTES       | 25 +++++++++++++++++++++++--
 sys/i386/conf/NOTES  |  8 +++++++-
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8504bfa68c36..1b949fc24c8e 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -607,7 +607,13 @@ options    NKPT=31
 # EFI Runtime Services support
 options        EFIRT
 
-
+#
+# HID-over-I2C support
+#
+device         iichid          # HID-over-I2C support
+options        IICHID_DEBUG    # Enable HID-over-I2C debug messages
+options        IICHID_SAMPLING # Workaround missing GPIO INTR support
+
 #####################################################################
 # ABI Emulation
 
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index c966ab436221..97ea00d181bd 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -239,3 +239,10 @@ options    COMPAT_FREEBSD32        # Compatible with 
FreeBSD/arm
 # ZFS support
 
 options                ZFS
+
+#
+# HID-over-I2C support
+#
+device         iichid          # HID-over-I2C support
+options        IICHID_DEBUG    # Enable HID-over-I2C debug messages
+options        IICHID_SAMPLING # Workaround missing GPIO INTR support
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5033cc63524f..b377f845e793 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2413,8 +2413,23 @@ options  NSFBUFS=1024
 options        DEBUG_LOCKS
 
 #####################################################################
-# Generic HID support
-device hid
+# HID support
+device         hid             # Generic HID support
+options        HID_DEBUG       # enable debug msgs
+device         hidbus          # HID bus
+device         hidmap          # HID to evdev mapping
+device         hidraw          # Raw access driver
+options        HIDRAW_MAKE_UHID_ALIAS  # install /dev/uhid alias
+device         hconf           # Multitouch configuration TLC
+device         hcons           # Consumer controls
+device         hgame           # Generic game controllers
+device         hkbd            # HID keyboard
+device         hms             # HID mouse
+device         hmt             # HID multitouch (MS-compatible)
+device         hpen            # Generic pen driver
+device         hsctrl          # System controls
+device         ps4dshock       # Sony PS4 DualShock 4 gamepad driver
+device         xb360gp         # XBox 360 gamepad driver
 
 #####################################################################
 # USB support
@@ -2460,6 +2475,9 @@ device            wsp
 device         uep
 # Diamond Rio 500 MP3 player
 device         urio
+# HID-over-USB driver
+device         usbhid
+
 #
 # USB serial support
 device         ucom
@@ -2576,6 +2594,9 @@ options   UVSCOM_DEFAULT_OPKTSIZE=8       # default 
output packet size
 options        UVSCOM_INTR_INTERVAL=100        # interrupt pipe interval
                                                # in milliseconds
 
+# options for usbhid:
+options        USBHID_ENABLED          # Prefer usbhid to other USBHID drivers
+
 #####################################################################
 # FireWire support
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f39f8ab6b302..47626787cab9 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -860,7 +860,13 @@ options    PMAP_SHPGPERPROC=201
 #
 options        NKPT=31
 
-
+#
+# HID-over-I2C support
+#
+device         iichid          # HID-over-I2C support
+options        IICHID_DEBUG    # Enable HID-over-I2C debug messages
+options        IICHID_SAMPLING # Workaround missing GPIO INTR support
+
 #####################################################################
 # ABI Emulation
 
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"

Reply via email to