Module Name: src
Committed By: matt
Date: Wed Oct 23 17:26:08 UTC 2013
Modified Files:
src/sys/arch/i386/conf: GENERIC XEN3_DOM0
Log Message:
Add xhci device
To generate a diff of this commit:
cvs rdiff -u -r1.1096 -r1.1097 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.79 -r1.80 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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1096 src/sys/arch/i386/conf/GENERIC:1.1097
--- src/sys/arch/i386/conf/GENERIC:1.1096 Sun Jun 30 21:38:57 2013
+++ src/sys/arch/i386/conf/GENERIC Wed Oct 23 17:26:08 2013
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ urlphy* at mii? phy ? # Realtek RTL815
# 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 @@ uhci* at cardbus? function ? # Universa
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
+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.79 src/sys/arch/i386/conf/XEN3_DOM0:1.80
--- src/sys/arch/i386/conf/XEN3_DOM0:1.79 Sun Jun 30 21:38:57 2013
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Oct 23 17:26:08 2013
@@ -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 @@ wsmouse* at pms? mux 0
# 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?
