Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/files.pci,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/files.pci,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.235.2.8 retrieving revision 1.236 diff -u -p -r1.235.2.8 -r1.236 --- src/sys/dev/pci/files.pci 2008/02/11 14:59:38 1.235.2.8 +++ src/sys/dev/pci/files.pci 2005/07/11 15:37:04 1.236 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.235.2.8 2008/02/11 14:59:38 yamt Exp $ +# $NetBSD: files.pci,v 1.236 2005/07/11 15:37:04 kiyohara Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -15,6 +15,8 @@ defparam opt_bktr.h BKTR_OVERRIDE_CARD B defflag opt_pciide.h PCIIDE_CMD064x_DISABLE PCIIDE_AMD756_ENABLEDMA PCIIDE_CMD0646U_ENABLEUDMA PCIIDE_I31244_DISABLEDMA +defflag opt_pcn.h PCN_NO_PROM + device pci {[dev = -1], [function = -1]} attach pci at pcibus file dev/pci/pci.c pci needs-flag @@ -57,13 +59,6 @@ file dev/pci/twe.c twe attach ld at twe with ld_twe file dev/pci/ld_twe.c ld_twe -device twa {unit = -1} -attach twa at pci -file dev/pci/twa.c twa - -attach ld at twa with ld_twa -file dev/pci/ld_twa.c ld_twa - # AMI RAID controllers device amr {unit = -1} attach amr at pci @@ -72,11 +67,6 @@ file dev/pci/amr.c amr attach ld at amr with ld_amr file dev/pci/ld_amr.c ld_amr -# Areca SATA RAID Controllers -device arcmsr: scsi -attach arcmsr at pci -file dev/pci/arcmsr.c arcmsr - # Compaq RAID controllers attach cac at pci with cac_pci file dev/pci/cac_pci.c cac_pci @@ -123,10 +113,6 @@ device pcscp: scsi, ncr53c9x attach pcscp at pci file dev/pci/pcscp.c pcscp -# HP/Compaq Command Interface to Scsi-3 -attach ciss at pci with ciss_pci -file dev/pci/ciss_pci.c ciss_pci - # BusLogic BT-9xx PCI family # device declaration in sys/conf/files attach bha at pci with bha_pci @@ -137,11 +123,6 @@ file dev/pci/bha_pci.c bha_pci attach isp at pci with isp_pci file dev/pci/isp_pci.c isp_pci -# LSILogic MegaRAID SAS -# device declaration in sys/conf/files -attach mfi at pci with mfi_pci -file dev/pci/mfi_pci.c mfi_pci - # LSILogic Fusion-MPT I/O Processor family # device declaration in sys/conf/files attach mpt at pci with mpt_pci @@ -217,123 +198,107 @@ file dev/pci/gtp.c gtp define pciide_common file dev/pci/pciide_common.c pciide_common -device pciide: ata, pciide_common, wdc_common +device pciide {[channel = -1]}: ata, pciide_common, wdc_common attach pciide at pci file dev/pci/pciide.c pciide -# AHCI SATA controllers -attach ahcisata at pci with ahcisata_pci -file dev/pci/ahcisata_pci.c ahcisata_pci - # Acard IDE controllers -device acardide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device acardide {[channel = -1]}: ata, pciide_common, wdc_common attach acardide at pci file dev/pci/acardide.c acardide # Acer Lab IDE controllers -device aceride: ata, ata_dma, ata_udma, pciide_common, wdc_common +device aceride {[channel = -1]}: ata, pciide_common, wdc_common attach aceride at pci file dev/pci/aceride.c aceride # Intel i31244 SATA controller -device artsata: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata +device artsata {[channel = -1]}: ata, pciide_common, wdc_common, sata attach artsata at pci file dev/pci/artsata.c artsata # CMD tech IDE controllers -device cmdide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device cmdide {[channel = -1]}: ata, pciide_common, wdc_common attach cmdide at pci file dev/pci/cmdide.c cmdide # Cypress IDE controllers -device cypide: ata, ata_dma, pciide_common, wdc_common, cy82c693 +device cypide {[channel = -1]}: ata, pciide_common, wdc_common, cy82c693 attach cypide at pci file dev/pci/cypide.c cypide # AMD Geode IDE controllers -device geodeide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device geodeide {[channel = -1]}: ata, pciide_common, wdc_common attach geodeide at pci file dev/pci/geodeide.c geodeide # Triones/HighPoint IDE controllers -device hptide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device hptide {[channel = -1]}: ata, pciide_common, wdc_common attach hptide at pci file dev/pci/hptide.c hptide # Integrated Technology Express IDE controllers -device iteide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device iteide {[channel = -1]}: ata, pciide_common, wdc_common attach iteide at pci file dev/pci/iteide.c iteide -# Jmicron hybrid IDE/AHCI controllers -define jmide_hl { } -device jmide: ata, ata_dma, ata_udma, pciide_common, wdc_common, jmide_hl -attach jmide at pci -attach ahcisata at jmide_hl with jmahci -file dev/pci/jmide.c jmide | jmahci needs-flag - # Opti IDE controllers -device optiide: ata, ata_dma, pciide_common, wdc_common +device optiide {[channel = -1]}: ata, pciide_common, wdc_common attach optiide at pci file dev/pci/optiide.c optiide # Intel IDE controllers -device piixide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device piixide {[channel = -1]}: ata, pciide_common, wdc_common attach piixide at pci file dev/pci/piixide.c piixide # Promise Serial ATA controllers -device pdcsata: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata +device pdcsata {[channel = -1]}: ata, pciide_common, wdc_common attach pdcsata at pci file dev/pci/pdcsata.c pdcsata # Promise IDE controllers -device pdcide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device pdcide {[channel = -1]}: ata, pciide_common, wdc_common attach pdcide at pci file dev/pci/pdcide.c pdcide # ServerWorks IDE controllers -device rccide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device rccide {[channel = -1]}: ata, pciide_common, wdc_common attach rccide at pci file dev/pci/rccide.c rccide -# ServerWorks SATA controllers -device svwsata: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata -attach svwsata at pci -file dev/pci/svwsata.c svwsata - # Silicon Image SATALink controllers -device satalink: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata +device satalink {[channel = -1]}: ata, pciide_common, wdc_common, sata attach satalink at pci file dev/pci/satalink.c satalink # SiS IDE controllers -device siside: ata, ata_dma, ata_udma, pciide_common, wdc_common +device siside {[channel = -1]}: ata, pciide_common, wdc_common attach siside at pci file dev/pci/siside.c siside # Symphony Labs IDE controllers -device slide: ata, ata_dma, pciide_common, wdc_common +device slide {[channel = -1]}: ata, pciide_common, wdc_common attach slide at pci file dev/pci/slide.c slide # ServerWorks IDE controllers -#device swide: ata, ata_dma, ata_udma, pciide_common, wdc_common +#device swide {[channel = -1]}: ata, pciide_common, wdc_common #attach swide at pci #file dev/pci/swide.c swide # VIA/AMD/Nvidia IDE controllers -device viaide: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata +device viaide {[channel = -1]}: ata, pciide_common, wdc_common attach viaide at pci file dev/pci/viaide.c viaide # STMicroelectronics STPC IDE controllers -device stpcide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device stpcide {[channel = -1 ]}: ata, pciide_common, wdc_common attach stpcide at pci file dev/pci/stpcide.c stpcide # ATI IXP IDE controllers -device ixpide: ata, ata_dma, ata_udma, pciide_common, wdc_common +device ixpide {[channel = -1]}: ata, pciide_common, wdc_common attach ixpide at pci file dev/pci/ixpide.c ixpide @@ -384,6 +349,9 @@ file dev/pci/if_ntwoc_pci.c ntwoc_pci device lmc: ifnet, sppp attach lmc at pci file dev/pci/if_lmc.c lmc +file dev/pci/if_lmc_common.c lmc +file dev/pci/if_lmc_media.c lmc +file dev/pci/if_lmc_nbsd.c lmc # Essential Communications HIPPI interface # device declaration in sys/conf/files @@ -391,7 +359,6 @@ attach esh at pci with esh_pci file dev/pci/if_esh_pci.c esh_pci # generic PCI VGA -defflag opt_vga.h VGA_POST attach vga at pci with vga_pci file dev/pci/vga_pci.c vga_pci needs-flag @@ -474,7 +441,6 @@ file dev/pci/auixp.c auixp device azalia: audiobus, auconv, mulaw, ac97, aurateconv attach azalia at pci file dev/pci/azalia.c azalia -file dev/pci/azalia_codec.c azalia # NeoMagic 256 AC'97 Audio device neo: audiobus, auconv, mulaw, ac97 @@ -596,16 +562,17 @@ file dev/pci/if_vr.c vr # SiS 900 Fast Ethernet controllers device sip: ether, ifnet, arp, mii, mii_bitbang attach sip at pci -file dev/pci/if_sip.c sip | gsip +file dev/pci/if_sip.c sip # National Semiconductor DP83820 Gigabit Ethernet device gsip: ether, ifnet, arp, mii, mii_bitbang attach gsip at pci +file dev/pci/if_gsip.c gsip # Level One LXT-1001 Gigabit Ethernet -#device glxt: ether, ifnet, arp, mii -#attach glxt at pci -#file dev/pci/if_glxt.c glxt +device glxt: ether, ifnet, arp, mii +attach glxt at pci +file dev/pci/if_glxt.c glxt # Sundance Tech./Tamarack TC9021 Gigabit Ethernet device stge: ether, ifnet, arp, mii, mii_bitbang @@ -622,11 +589,6 @@ device bge: ether, ifnet, arp, mii, mii_ attach bge at pci file dev/pci/if_bge.c bge -# Broadcom NetXtreme II -device bnx: ether, ifnet, arp, mii -attach bnx at pci -file dev/pci/if_bnx.c bnx - # Realtek 8129/8139 Ethernet controllers attach rtk at pci with rtk_pci file dev/pci/if_rtk_pci.c rtk_pci @@ -671,22 +633,21 @@ device btvmeii: vmebus, univ_pci attach btvmeii at pci file dev/pci/btvmeii.c btvmeii -# VIA VT82C686A/VT8231 PM Timer and Hardware Monitor -device viaenv: acpipmtimer, sysmon_envsys -attach viaenv at pci -file dev/pci/viaenv.c viaenv - -# Intel PIIX4 power management controller -device piixpm: i2cbus, acpipmtimer -attach piixpm at pci -file dev/pci/piixpm.c piixpm +# VT86C686A power management +device viapm {} +attach viapm at pci +file dev/pci/viapm.c viapm + +# hardware monitoring part of viapm +device viaenv: sysmon_envsys +attach viaenv at viapm +file dev/pci/viaenv.c viaenv needs-flag # AMD 768MPX power management controller defflag opt_amdpm.h AMDPM_RND_COUNTERS -device amdpm: i2cbus, acpipmtimer +device amdpm {} attach amdpm at pci file dev/pci/amdpm.c amdpm -file dev/pci/amdpm_smbus.c amdpm # Hi/fn 7751 device hifn: opencrypto @@ -710,8 +671,8 @@ file dev/pci/if_atw_pci.c atw_pci attach rtw at pci with rtw_pci file dev/pci/if_rtw_pci.c rtw_pci -# Ralink RT2500/RT2600 PCI/Mini-PCI -attach ral at pci with ral_pci +# Ralink RT2500 PCI/Mini-PCI +attach ral at pci with ral_pci: ralcommon file dev/pci/if_ral_pci.c ral_pci # Intersil Prism2.5 Mini-PCI @@ -761,56 +722,10 @@ attach joy at pci with joy_pci file dev/pci/joy_pci.c joy_pci # ATI Mach64 framebuffer console driver -defflag opt_machfb.h MACHFB_DEBUG -device machfb: wsemuldisplaydev, rasops8, fb, vcons, videomode, edid, drm +device machfb: wsemuldisplaydev, rasops8 attach machfb at pci file dev/pci/machfb.c machfb -# 3Dfx Voodoo3 framebuffer console driver -device voodoofb: wsemuldisplaydev, rasops8, vcons, videomode -attach voodoofb at pci -file dev/pci/voodoofb.c voodoofb - -# VIA UniChrome framebuffer console driver -device unichromefb: wsemuldisplaydev, rasops16, rasops32, vcons, drm -attach unichromefb at pci -file dev/pci/unichromefb.c unichromefb needs-flag - -# ATI Radeon framebuffer console driver -# (Note: to enable the BIOS parser, add options RADEON_BIOS_INIT to the config) -device radeonfb: wsemuldisplaydev, videomode, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm -attach radeonfb at pci -file dev/pci/radeonfb.c radeonfb -file dev/pci/radeonfb_i2c.c radeonfb -file dev/pci/radeonfb_bios.c radeonfb -defflag opt_radeonfb.h RADEONFB_DEBUG - -# Chelsio Terminator 3 (T3) 10 gigabit ethernet -device cxgbc { } -attach cxgbc at pci -device cxgb: ether, ifnet, arp -attach cxgb at cxgbc -file dev/pci/cxgb_main.c cxgbc | cxgb -file dev/pci/cxgb_mc5.c cxgbc | cxgb -file dev/pci/cxgb_vsc8211.c cxgbc | cxgb -file dev/pci/cxgb_ael1002.c cxgbc | cxgb -file dev/pci/cxgb_mv88e1xxx.c cxgbc | cxgb -file dev/pci/cxgb_vsc7323.c cxgbc | cxgb -file dev/pci/cxgb_xgmac.c cxgbc | cxgb -file dev/pci/cxgb_t3_hw.c cxgbc | cxgb -file dev/pci/cxgb_sge.c cxgbc | cxgb -file dev/pci/cxgb_lro.c cxgbc | cxgb -# file dev/pci/cxgb_offload.c cxgbc | cxgb -file dev/pci/cxgb_l2t.c cxgbc | cxgb -file dev/pci/cxgb_osdep.c cxgbc | cxgb - -# Chips & Technologies 65550 framebuffer console driver -device chipsfb: wsemuldisplaydev, rasops8, vcons, videomode -attach chipsfb at pci -file dev/pci/chipsfb.c chipsfb -defflag opt_chipsfb.h CHIPSFB_DEBUG -defflag opt_chipsfb.h CHIPSFB_WAIT - # 3Com 3c990 device txp: ether, ifnet, arp attach txp at pci @@ -837,41 +752,20 @@ file dev/pci/if_dge.c dge attach re at pci with re_pci file dev/pci/if_re_pci.c re_pci -# Windows NDIS drivers (Experimental) -device ndis -attach ndis at pci -file dev/if_ndis/if_ndis.c ndis -file dev/if_ndis/if_ndis_pci.c ndis - # Intel PRO/Wireless 2100 -device ipw: ifnet, arp, wlan, firmload +device ipw: ifnet, wlan attach ipw at pci file dev/pci/if_ipw.c ipw -# Intel PRO/Wireless 2200BG/2915ABG -device iwi: ifnet, arp, wlan, firmload -attach iwi at pci -file dev/pci/if_iwi.c iwi - -# Intel PRO/Wireless 3945ABG -device wpi: ifnet, arp, wlan, firmload -attach wpi at pci -file dev/pci/if_wpi.c wpi - -# Intel PRO/Wireless 4965AGN Mini-PCI Adapter -device iwn: ifnet, arp, wlan, firmload -attach iwn at pci -file dev/pci/if_iwn.c iwn - # Workbit NinjaSCSI-32 controllers # device declaration in sys/conf/files attach njs at pci with njs_pci file dev/pci/njs_pci.c njs_pci -# S2io Xframe 10 Gigabit ethernet (Xframe driver) -device xge: ether, ifnet, arp -attach xge at pci -file dev/pci/if_xge.c xge +# Intel PRO/Wireless 2200BG/2915ABG +device iwi: ifnet, wlan +attach iwi at pci +file dev/pci/if_iwi.c iwi # Via Velocity 612x 10/100/1000 Ethernet device vge: ether, ifnet, arp, mii @@ -881,48 +775,3 @@ file dev/pci/if_vge.c vge # Atheros 5210/5211/5212 PCI/Mini-PCI attach ath at pci with ath_pci file dev/pci/if_ath_pci.c ath_pci - -# NVIDIA nForce Ethernet -device nfe: ether, ifnet, arp, mii, mii_phy -attach nfe at pci -file dev/pci/if_nfe.c nfe - -# MICREL Etherent -device kse: ether, ifnet, arp -attach kse at pci -file dev/pci/if_kse.c kse - -# Yukon 2 -device mskc { } -attach mskc at pci -device msk: ether, ifnet, arp, mii -attach msk at mskc -file dev/pci/if_msk.c mskc | msk - -# -# Direct Rendering Manager -# -include "dev/pci/drm/files.pcidrm" - -# generic framebuffer console driver, PCI frontend -attach genfb at pci with genfb_pci -file dev/pci/genfb_pci.c genfb_pci - -# NVIDIA nForce2/3/4 SMBus controller -device nfsmbc { } -attach nfsmbc at pci -device nfsmb: i2cbus -attach nfsmb at nfsmbc -file dev/pci/nfsmb.c nfsmbc | nfsmb - -# Intel ICH SMBus controller -device ichsmb: i2cbus -attach ichsmb at pci -file dev/pci/ichsmb.c ichsmb - -# ATI Rage 128 framebuffer console driver -device r128fb: wsemuldisplaydev, rasops8, vcons, videomode, iic, i2c_bitbang -attach r128fb at pci -file dev/pci/r128fb.c r128fb -defflag opt_r128fb.h R128FB_DEBUG -defflag opt_r128fb.h R128FB_WAIT