Module Name: src
Committed By: bouyer
Date: Sun Dec 10 17:19:48 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
Log Message:
Add dwiic, ihidev and ims
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.474 -r1.475 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.431 -r1.432 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1173 -r1.1174 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.74 src/sys/arch/amd64/conf/ALL:1.75
--- src/sys/arch/amd64/conf/ALL:1.74 Sat Dec 2 12:40:03 2017
+++ src/sys/arch/amd64/conf/ALL Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.74 2017/12/02 12:40:03 maxv Exp $
+# $NetBSD: ALL,v 1.75 2017/12/10 17:19:48 bouyer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.74 $"
+#ident "ALL-$Revision: 1.75 $"
maxusers 64 # estimated number of users
@@ -628,6 +628,10 @@ iic* at nfsmb?
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# dbCool Thermal monitor and fan controller
dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
dbcool* at iic? addr 0x2D # Tyan S2881
@@ -692,6 +696,13 @@ sdtemp* at iic? addr 0x1d
sdtemp* at iic? addr 0x1e
sdtemp* at iic? addr 0x1f
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.474 src/sys/arch/amd64/conf/GENERIC:1.475
--- src/sys/arch/amd64/conf/GENERIC:1.474 Sat Dec 9 00:29:32 2017
+++ src/sys/arch/amd64/conf/GENERIC Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.474 2017/12/09 00:29:32 riastradh Exp $
+# $NetBSD: GENERIC,v 1.475 2017/12/10 17:19:48 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.474 $"
+#ident "GENERIC-$Revision: 1.475 $"
maxusers 64 # estimated number of users
@@ -510,6 +510,10 @@ iic* at ichsmb?
ismt* at pci? dev ? function ?
iic* at ismt?
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D # Tyan S2881
@@ -545,6 +549,13 @@ iic* at ismt?
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.141 src/sys/arch/amd64/conf/XEN3_DOM0:1.142
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.141 Mon Nov 6 02:57:18 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.141 2017/11/06 02:57:18 rin Exp $
+# $NetBSD: XEN3_DOM0,v 1.142 2017/12/10 17:19:48 bouyer Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.141 $"
+#ident "XEN3_DOM0-$Revision: 1.142 $"
maxusers 32 # estimated number of users
@@ -303,6 +303,10 @@ amdpm* at pci? dev ? function ? # RNG an
ichsmb* at pci? dev ? function ?
iic* at ichsmb?
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D # Tyan S2881
@@ -428,6 +432,13 @@ tqphy* at mii? phy ? # TDK Semiconduct
ukphy* at mii? phy ? # generic unknown PHYs
urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.431 src/sys/arch/i386/conf/ALL:1.432
--- src/sys/arch/i386/conf/ALL:1.431 Thu Nov 30 11:56:45 2017
+++ src/sys/arch/i386/conf/ALL Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.431 2017/11/30 11:56:45 jmcneill Exp $
+# $NetBSD: ALL,v 1.432 2017/12/10 17:19:48 bouyer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.431 $"
+#ident "ALL-$Revision: 1.432 $"
maxusers 64 # estimated number of users
@@ -702,6 +702,10 @@ iic* at nfsmb?
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# dbCool Thermal monitor and fan controller
dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
dbcool* at iic? addr 0x2D # Tyan S2881
@@ -766,6 +770,13 @@ sdtemp* at iic? addr 0x1d
sdtemp* at iic? addr 0x1e
sdtemp* at iic? addr 0x1f
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1173 src/sys/arch/i386/conf/GENERIC:1.1174
--- src/sys/arch/i386/conf/GENERIC:1.1173 Sat Dec 9 00:29:33 2017
+++ src/sys/arch/i386/conf/GENERIC Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1173 2017/12/09 00:29:33 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1174 2017/12/10 17:19:48 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1173 $"
+#ident "GENERIC-$Revision: 1.1174 $"
maxusers 64 # estimated number of users
@@ -653,6 +653,10 @@ iic* at nfsmb?
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D # Tyan S2881
@@ -713,6 +717,13 @@ nsclpcsio* at isa?
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.123 src/sys/arch/i386/conf/XEN3_DOM0:1.124
--- src/sys/arch/i386/conf/XEN3_DOM0:1.123 Mon Nov 6 02:57:18 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Dec 10 17:19:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.123 2017/11/06 02:57:18 rin Exp $
+# $NetBSD: XEN3_DOM0,v 1.124 2017/12/10 17:19:48 bouyer Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -267,6 +267,10 @@ amdpm* at pci? dev ? function ? # RNG an
ichsmb* at pci? dev ? function ?
iic* at ichsmb?
+# I2C controller as found in some Intel PCH devices.
+dwiic* at pci? # I2C controller
+iic* at dwiic?
+
# dbCool thermal monitor and fan controller
#iic* at amdpm? # sensors below are on this bus
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
@@ -392,6 +396,13 @@ tqphy* at mii? phy ? # TDK Semiconduct
ukphy* at mii? phy ? # generic unknown PHYs
urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims* at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
