Module Name: src
Committed By: snj
Date: Fri Jun 30 06:27:38 UTC 2017
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-8]: XEN3_DOM0
src/sys/arch/xen/conf [netbsd-8]: files.xen
Log Message:
Pull up following revision(s) (requested by khorben in ticket #62):
sys/arch/amd64/conf/XEN3_DOM0: revision 1.136
sys/arch/i386/conf/XEN3_DOM0: revision 1.113
sys/arch/xen/conf/files.xen: revision 1.148
Register support for SD card readers with Xen DOM0 kernels
Tested on a Lenovo ThinkPad T440s (amd64)
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.135.4.1 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.112 -r1.112.4.1 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.147 -r1.147.2.1 src/sys/arch/xen/conf/files.xen
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/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.135 src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.1
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.135 Thu Apr 20 09:56:27 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Jun 30 06:27:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.135 2017/04/20 09:56:27 msaitoh Exp $
+# $NetBSD: XEN3_DOM0,v 1.135.4.1 2017/06/30 06:27:38 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -797,6 +797,19 @@ wsmouse* at btmagic? mux 0
# Bluetooth Audio support
btsco* at bthub?
+
+# SD/MMC/SDIO Controller and Device support
+
+# SD/MMC controller
+sdhc* at pci? # SD Host Controller
+rtsx* at pci? # Realtek RTS5209/RTS5229 Card Reader
+#sdhc* at cardbus? # SD Host Controller
+sdmmc* at sdhc? # SD/MMC bus
+sdmmc* at rtsx? # SD/MMC bus
+
+ld* at sdmmc?
+
+
# Cryptographic Devices
# PCI cryptographic devices
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.112 src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.1
--- src/sys/arch/i386/conf/XEN3_DOM0:1.112 Mon Apr 17 09:54:59 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Jun 30 06:27:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.112 2017/04/17 09:54:59 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.112.4.1 2017/06/30 06:27:38 snj Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -689,6 +689,23 @@ ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
sbp* at ieee1394if? euihi ? euilo ? # SCSI over IEEE1394
+
+# SD/MMC/SDIO Controller and Device support
+
+# PCI SD/MMC controller
+sdhc* at pci? # SD Host Controller
+rtsx* at pci? # Realtek RTS5209/RTS5229 Card Reader
+
+# CardBus SD/MMC controller
+#sdhc* at cardbus? function ? # SD Host Controller
+
+sdmmc* at sdhc? # SD/MMC bus
+sdmmc* at rtsx? # SD/MMC bus
+ld* at sdmmc?
+
+
+# Audio Devices
+
# PCI audio devices
auacer* at pci? dev ? function ? # ALi M5455 integrated AC'97 Audio
auich* at pci? dev ? function ? # Intel ICH integrated AC'97 Audio
@@ -768,6 +785,7 @@ wsmouse* at btmagic? mux 0
# Bluetooth Audio support
btsco* at bthub?
+
# Cryptographic Devices
# PCI cryptographic devices
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.147 src/sys/arch/xen/conf/files.xen:1.147.2.1
--- src/sys/arch/xen/conf/files.xen:1.147 Tue May 23 08:48:35 2017
+++ src/sys/arch/xen/conf/files.xen Fri Jun 30 06:27:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.147 2017/05/23 08:48:35 nonaka Exp $
+# $NetBSD: files.xen,v 1.147.2.1 2017/06/30 06:27:38 snj Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -375,6 +375,8 @@ include "compat/ossaudio/files.ossaudio"
# Bluetooth
include "dev/bluetooth/files.bluetooth"
+include "dev/sdmmc/files.sdmmc"
+
#
# CARDBUS
#
