[src/trunk]: src/sys/arch Add xhci device

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d732e450cac
branches:  trunk
changeset: 790824:6d732e450cac
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Oct 23 17:22:49 2013 +0000

description:
Add xhci device

diffstat:

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

diffs (114 lines):

diff -r f3d76f980f03 -r 6d732e450cac sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Wed Oct 23 13:15:47 2013 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Wed Oct 23 17:22:49 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.379 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: GENERIC,v 1.380 2013/10/23 17:22:49 matt Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.379 $"
+#ident                 "GENERIC-$Revision: 1.380 $"
 
 maxusers       64              # estimated number of users
 
@@ -815,6 +815,7 @@
 # USB Controller and Devices
 
 # PCI USB controllers
+xhci*  at pci? dev ? function ?        # eXtensible Host Controller
 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)
@@ -831,6 +832,7 @@
 slhci* at pcmcia? function ?           # ScanLogic SL811HS
 
 # USB bus support
+usb*   at xhci?
 usb*   at ehci?
 usb*   at ohci?
 usb*   at uhci?
diff -r f3d76f980f03 -r 6d732e450cac sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Wed Oct 23 13:15:47 2013 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Wed Oct 23 17:22:49 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.98 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: XEN3_DOM0,v 1.99 2013/10/23 17:22:49 matt Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -544,11 +544,13 @@
 # USB Controller and Devices
 
 # PCI USB controllers
+xhci*  at pci? dev ? function ?        # eXtensible Host Controller
 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 ehci?
 usb*   at ohci?
 usb*   at uhci?
diff -r f3d76f980f03 -r 6d732e450cac sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Oct 23 13:15:47 2013 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Oct 23 17:22:49 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1096 2013/06/30 21:38:57 rmind Exp $
+# $NetBSD: GENERIC,v 1.1097 2013/10/23 17:26:08 matt Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1096 $"
+#ident                 "GENERIC-$Revision: 1.1097 $"
 
 maxusers       64              # estimated number of users
 
@@ -1128,6 +1128,7 @@
 # USB Controller and Devices
 
 # PCI USB controllers
+xhci*  at pci? dev ? function ?        # eXtensible Host Controller
 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
@@ -1145,6 +1146,7 @@
 slhci* at pcmcia? function ?           # ScanLogic SL811HS
 
 # USB bus support
+usb*   at xhci?
 usb*   at ehci?
 usb*   at gcscehci?
 usb*   at ohci?
diff -r f3d76f980f03 -r 6d732e450cac sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Wed Oct 23 13:15:47 2013 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Wed Oct 23 17:22:49 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3_DOM0,v 1.79 2013/06/30 21:38:57 rmind Exp $
+#      $NetBSD: XEN3_DOM0,v 1.80 2013/10/23 17:26:08 matt Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -522,11 +522,13 @@
 # USB Controller and Devices
 
 # PCI USB controllers
+xhci*  at pci? dev ? function ?        # eXtensible Host Controller
 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 ehci?
 usb*   at ohci?
 usb*   at uhci?