Module Name: src
Committed By: dsl
Date: Mon Jun 16 19:08:18 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0
src/sys/arch/i386/conf: GENERIC XEN3_DOM0
Log Message:
Comment out the xhci entries.
The driver really doesn't work well enough to be generally useful.
To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.1105 -r1.1106 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.83 -r1.84 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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.390 src/sys/arch/amd64/conf/GENERIC:1.391
--- src/sys/arch/amd64/conf/GENERIC:1.390 Thu Jun 12 20:22:04 2014
+++ src/sys/arch/amd64/conf/GENERIC Mon Jun 16 19:08:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.390 2014/06/12 20:22:04 alnsn Exp $
+# $NetBSD: GENERIC,v 1.391 2014/06/16 19:08:17 dsl 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.390 $"
+#ident "GENERIC-$Revision: 1.391 $"
maxusers 64 # estimated number of users
@@ -818,7 +818,8 @@ urlphy* at mii? phy ? # Realtek RTL815
# USB Controller and Devices
# PCI USB controllers
-xhci* at pci? dev ? function ? # eXtensible Host Controller
+# xhci* at pci? dev ? function ? # eXtensible Host Controller
+ # xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
@@ -835,7 +836,7 @@ uhci* at cardbus? function ? # Universa
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
-usb* at xhci?
+# usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.101 src/sys/arch/amd64/conf/XEN3_DOM0:1.102
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.101 Mon Mar 24 14:15:37 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Jun 16 19:08:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.101 2014/03/24 14:15:37 szptvlfn Exp $
+# $NetBSD: XEN3_DOM0,v 1.102 2014/06/16 19:08:17 dsl Exp $
include "arch/amd64/conf/std.xen"
@@ -544,13 +544,14 @@ wsmouse* at pms? mux 0
# USB Controller and Devices
# PCI USB controllers
-xhci* at pci? dev ? function ? # eXtensible Host Controller
+# xhci* at pci? dev ? function ? # eXtensible Host Controller
+ # xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
-usb* at xhci?
+# usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1105 src/sys/arch/i386/conf/GENERIC:1.1106
--- src/sys/arch/i386/conf/GENERIC:1.1105 Tue Jun 10 01:42:39 2014
+++ src/sys/arch/i386/conf/GENERIC Mon Jun 16 19:08:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1105 2014/06/10 01:42:39 hikaru Exp $
+# $NetBSD: GENERIC,v 1.1106 2014/06/16 19:08:17 dsl 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.1105 $"
+#ident "GENERIC-$Revision: 1.1106 $"
maxusers 64 # estimated number of users
@@ -1123,7 +1123,8 @@ urlphy* at mii? phy ? # Realtek RTL815
# USB Controller and Devices
# PCI USB controllers
-xhci* at pci? dev ? function ? # eXtensible Host Controller
+# xhci* at pci? dev ? function ? # eXtensible Host Controller
+ # xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC)
ohci* at pci? dev ? function ? # Open Host Controller
@@ -1141,7 +1142,7 @@ uhci* at cardbus? function ? # Universa
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
-usb* at xhci?
+# usb* at xhci?
usb* at ehci?
usb* at gcscehci?
usb* at ohci?
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.83 src/sys/arch/i386/conf/XEN3_DOM0:1.84
--- src/sys/arch/i386/conf/XEN3_DOM0:1.83 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Jun 16 19:08:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.83 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: XEN3_DOM0,v 1.84 2014/06/16 19:08:17 dsl Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -521,13 +521,14 @@ wsmouse* at pms? mux 0
# USB Controller and Devices
# PCI USB controllers
-xhci* at pci? dev ? function ? # eXtensible Host Controller
+# xhci* at pci? dev ? function ? # eXtensible Host Controller
+ # xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
-usb* at xhci?
+# usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
