Module Name: src Committed By: snj Date: Sat Jul 8 17:04:22 UTC 2017
Modified Files: src/sys/arch/amd64/conf [netbsd-7]: XEN3_DOM0 src/sys/arch/i386/conf [netbsd-7]: XEN3_DOM0 src/sys/arch/xen/conf [netbsd-7]: files.xen Log Message: Pull up following revision(s) (requested by khorben in ticket #1445): 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.103.2.8 -r1.103.2.9 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.85.2.8 -r1.85.2.9 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.133.4.2 -r1.133.4.3 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.103.2.8 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.9 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.8 Sat May 13 06:28:59 2017 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jul 8 17:04:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.103.2.8 2017/05/13 06:28:59 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.103.2.9 2017/07/08 17:04:21 snj Exp $ include "arch/amd64/conf/std.xen" @@ -786,6 +786,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.85.2.8 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.9 --- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.8 Tue Apr 18 19:53:50 2017 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Jul 8 17:04:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.85.2.8 2017/04/18 19:53:50 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.85.2.9 2017/07/08 17:04:21 snj Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -684,6 +684,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 @@ -761,6 +778,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.133.4.2 src/sys/arch/xen/conf/files.xen:1.133.4.3 --- src/sys/arch/xen/conf/files.xen:1.133.4.2 Sun Dec 18 07:50:37 2016 +++ src/sys/arch/xen/conf/files.xen Sat Jul 8 17:04:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.133.4.2 2016/12/18 07:50:37 snj Exp $ +# $NetBSD: files.xen,v 1.133.4.3 2017/07/08 17:04:22 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 @@ -368,6 +368,8 @@ include "compat/ossaudio/files.ossaudio" # Bluetooth include "dev/bluetooth/files.bluetooth" +include "dev/sdmmc/files.sdmmc" + # # CARDBUS #