Wed Jun 6 18:10:36 2018 UTC ()
shuffle mechanics of files.virtio config(5) include location,
without actually moving the contents thereof from dev/pci yet


(jakllsch)
diff -r1.1199 -r1.1200 src/sys/conf/files
diff -r1.396 -r1.397 src/sys/dev/pci/files.pci
diff -r0 -r1.1 src/sys/dev/virtio/files.virtio
cvs diff -r1.1199 -r1.1200 src/sys/conf/files (expand / switch to unified diff)

--- src/sys/conf/files 2018/05/06 10:32:33 1.1199
+++ src/sys/conf/files 2018/06/06 18:10:36 1.1200
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files,v 1.1199 2018/05/06 10:32:33 jmcneill Exp $ 1# $NetBSD: files,v 1.1200 2018/06/06 18:10:36 jakllsch Exp $
2# @(#)files.newconf 7.5 (Berkeley) 5/10/93 2# @(#)files.newconf 7.5 (Berkeley) 5/10/93
3 3
4version 20171118 4version 20171118
5 5
6# 6#
7# device classes 7# device classes
8# 8#
9devclass disk 9devclass disk
10devclass tape 10devclass tape
11devclass ifnet 11devclass ifnet
12devclass tty 12devclass tty
13devclass audiodev 13devclass audiodev
14devclass displaydev 14devclass displaydev
@@ -990,26 +990,30 @@ file dev/ic/cd18xx.c cd18xx @@ -990,26 +990,30 @@ file dev/ic/cd18xx.c cd18xx
990define rtl80x9 990define rtl80x9
991file dev/ic/rtl80x9.c rtl80x9 needs-flag 991file dev/ic/rtl80x9.c rtl80x9 needs-flag
992 992
993# Realtek 8129/8139 Ethernet controllers 993# Realtek 8129/8139 Ethernet controllers
994# 994#
995device rtk: ether, ifnet, arp, mii 995device rtk: ether, ifnet, arp, mii
996file dev/ic/rtl81x9.c rtk | re 996file dev/ic/rtl81x9.c rtk | re
997 997
998# Realtek 8169 Ethernet controllers 998# Realtek 8169 Ethernet controllers
999# 999#
1000device re: ether, ifnet, arp, mii 1000device re: ether, ifnet, arp, mii
1001file dev/ic/rtl8169.c re 1001file dev/ic/rtl8169.c re
1002 1002
 1003# Virtual I/O Device (VIRTIO) bus controller and devices
 1004#
 1005include "dev/virtio/files.virtio"
 1006
1003# Common code for ESDI/IDE/etc. controllers 1007# Common code for ESDI/IDE/etc. controllers
1004# 1008#
1005define wdc_common 1009define wdc_common
1006define ata_dma 1010define ata_dma
1007define ata_udma 1011define ata_udma
1008define ata_piobm 1012define ata_piobm
1009device wdc: ata, wdc_common 1013device wdc: ata, wdc_common
1010 1014
1011defflag opt_ata.h ATADEBUG 1015defflag opt_ata.h ATADEBUG
1012defparam opt_ata.h ATADEBUG_MASK 1016defparam opt_ata.h ATADEBUG_MASK
1013defflag opt_wdc.h WDC_NO_IDS 1017defflag opt_wdc.h WDC_NO_IDS
1014 1018
1015device atabus: atapi,ata_hl 1019device atabus: atapi,ata_hl
cvs diff -r1.396 -r1.397 src/sys/dev/pci/files.pci (expand / switch to unified diff)

--- src/sys/dev/pci/files.pci 2018/05/19 09:27:09 1.396
+++ src/sys/dev/pci/files.pci 2018/06/06 18:10:35 1.397
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.pci,v 1.396 2018/05/19 09:27:09 jdolecek Exp $ 1# $NetBSD: files.pci,v 1.397 2018/06/06 18:10:35 jakllsch Exp $
2# 2#
3# Config file and device description for machine-independent PCI code. 3# Config file and device description for machine-independent PCI code.
4# Included by ports that need it. Requires that the SCSI files be 4# Included by ports that need it. Requires that the SCSI files be
5# defined first. 5# defined first.
6 6
7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE 7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE
8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE 8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE
9 9
10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET 10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL 11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL
12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX 12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX
13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT 13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT
14 14
@@ -1139,29 +1139,26 @@ device pwdog: sysmon_envsys @@ -1139,29 +1139,26 @@ device pwdog: sysmon_envsys
1139attach pwdog at pci 1139attach pwdog at pci
1140file dev/pci/pwdog.c pwdog 1140file dev/pci/pwdog.c pwdog
1141 1141
1142# IBM 4810 BSP cash drawer port 1142# IBM 4810 BSP cash drawer port
1143device ibmcd: gpiobus 1143device ibmcd: gpiobus
1144attach ibmcd at pci 1144attach ibmcd at pci
1145file dev/pci/ibmcd.c ibmcd 1145file dev/pci/ibmcd.c ibmcd
1146 1146
1147# SIS 315 Pro frame buffer 1147# SIS 315 Pro frame buffer
1148device sisfb: wsemuldisplaydev, rasops8, rasops15, rasops16, rasops32, vcons 1148device sisfb: wsemuldisplaydev, rasops8, rasops15, rasops16, rasops32, vcons
1149attach sisfb at pci 1149attach sisfb at pci
1150file dev/pci/sisfb.c sisfb needs-flag 1150file dev/pci/sisfb.c sisfb needs-flag
1151 1151
1152# VirtIO: XXX: move to dev/vmm/virtio 
1153include "dev/pci/files.virtio" 
1154 
1155attach virtio at pci with virtio_pci 1152attach virtio at pci with virtio_pci
1156file dev/pci/virtio_pci.c virtio_pci 1153file dev/pci/virtio_pci.c virtio_pci
1157 1154
1158# Silicon Motion SM712(LynxEM+) frame buffer 1155# Silicon Motion SM712(LynxEM+) frame buffer
1159device lynxfb: wsemuldisplaydev, rasops16 1156device lynxfb: wsemuldisplaydev, rasops16
1160attach lynxfb at pci 1157attach lynxfb at pci
1161file dev/pci/lynxfb.c lynxfb needs-flag 1158file dev/pci/lynxfb.c lynxfb needs-flag
1162 1159
1163include "dev/pci/igma/files.igma" 1160include "dev/pci/igma/files.igma"
1164# Intel GMA 1161# Intel GMA
1165device igma: igmabus, i2cbus, i2c_bitbang, ddc_read_edid, edid 1162device igma: igmabus, i2cbus, i2c_bitbang, ddc_read_edid, edid
1166attach igma at pci 1163attach igma at pci
1167file dev/pci/igma.c igma 1164file dev/pci/igma.c igma
File Added: src/sys/dev/virtio/files.virtio
#	$NetBSD: files.virtio,v 1.1 2018/06/06 18:10:35 jakllsch Exp $

# XXX the contents of the following included file should be moved here
include "dev/pci/files.virtio"