Module Name: src
Committed By: riastradh
Date: Sun Dec 15 17:17:16 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
Log Message:
Add vhci to x86/ALL.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.475 -r1.476 src/sys/arch/i386/conf/ALL
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.131 src/sys/arch/amd64/conf/ALL:1.132
--- src/sys/arch/amd64/conf/ALL:1.131 Tue Dec 10 12:08:52 2019
+++ src/sys/arch/amd64/conf/ALL Sun Dec 15 17:17:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.131 2019/12/10 12:08:52 yamaguchi Exp $
+# $NetBSD: ALL,v 1.132 2019/12/15 17:17:16 riastradh 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.131 $"
+#ident "ALL-$Revision: 1.132 $"
maxusers 64 # estimated number of users
@@ -1128,6 +1128,9 @@ urlphy* at mii? phy ? # Realtek RTL815
# USB Controller and Devices
+# Virtual USB controller
+pseudo-device vhci
+
# PCI USB controllers
xhci* at pci? dev ? function ? # eXtensible Host Controller
ehci* at pci? dev ? function ? # Enhanced Host Controller
@@ -1152,6 +1155,7 @@ usb* at ehci?
usb* at ohci?
usb* at slhci?
usb* at uhci?
+usb* at vhci?
usb* at xhci?
# USB Hubs
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.475 src/sys/arch/i386/conf/ALL:1.476
--- src/sys/arch/i386/conf/ALL:1.475 Tue Dec 10 12:08:52 2019
+++ src/sys/arch/i386/conf/ALL Sun Dec 15 17:17:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.475 2019/12/10 12:08:52 yamaguchi Exp $
+# $NetBSD: ALL,v 1.476 2019/12/15 17:17:16 riastradh 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.475 $"
+#ident "ALL-$Revision: 1.476 $"
maxusers 64 # estimated number of users
@@ -1231,6 +1231,9 @@ urlphy* at mii? phy ? # Realtek RTL815
# USB Controller and Devices
+# Virtual USB controller
+pseudo-device vhci
+
# PCI USB controllers
ehci* at pci? dev ? function ? # Enhanced Host Controller
gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC)
@@ -1255,6 +1258,7 @@ usb* at gcscehci?
usb* at ohci?
usb* at slhci?
usb* at uhci?
+usb* at vhci?
usb* at xhci?
# USB Hubs