Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Comment out the xhci entries.



details:   https://anonhg.NetBSD.org/src/rev/4c79bd9e7a46
branches:  trunk
changeset: 329995:4c79bd9e7a46
user:      dsl <dsl%NetBSD.org@localhost>
date:      Mon Jun 16 19:08:17 2014 +0000

description:
Comment out the xhci entries.
The driver really doesn't work well enough to be generally useful.

diffstat:

 sys/arch/amd64/conf/GENERIC   |  9 +++++----
 sys/arch/amd64/conf/XEN3_DOM0 |  7 ++++---
 sys/arch/i386/conf/GENERIC    |  9 +++++----
 sys/arch/i386/conf/XEN3_DOM0  |  7 ++++---
 4 files changed, 18 insertions(+), 14 deletions(-)

diffs (126 lines):

diff -r 1772b55ecb79 -r 4c79bd9e7a46 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Jun 16 16:48:16 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Jun 16 19:08:17 2014 +0000
@@ -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 @@
 
 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 @@
 # 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 @@
 slhci* at pcmcia? function ?           # ScanLogic SL811HS
 
 # USB bus support
-usb*   at xhci?
+# usb* at xhci?
 usb*   at ehci?
 usb*   at ohci?
 usb*   at uhci?
diff -r 1772b55ecb79 -r 4c79bd9e7a46 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Mon Jun 16 16:48:16 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Mon Jun 16 19:08:17 2014 +0000
@@ -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 @@
 # 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?
diff -r 1772b55ecb79 -r 4c79bd9e7a46 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Jun 16 16:48:16 2014 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Jun 16 19:08:17 2014 +0000
@@ -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 @@
 
 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 @@
 # 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 @@
 slhci* at pcmcia? function ?           # ScanLogic SL811HS
 
 # USB bus support
-usb*   at xhci?
+# usb* at xhci?
 usb*   at ehci?
 usb*   at gcscehci?
 usb*   at ohci?
diff -r 1772b55ecb79 -r 4c79bd9e7a46 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Mon Jun 16 16:48:16 2014 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Mon Jun 16 19:08:17 2014 +0000
@@ -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 @@
 # 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?



Home | Main Index | Thread Index | Old Index