diff --git a/sys/arch/i386/conf/XEN0 b/sys/arch/i386/conf/XEN0 index 46916d10c9cd..fee12c9d33c0 100644 --- a/sys/arch/i386/conf/XEN0 +++ b/sys/arch/i386/conf/XEN0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN0,v 1.17 2005/10/03 20:50:25 bouyer Exp $ +# $NetBSD: XEN0,v 1.18 2005/11/21 22:15:13 bouyer Exp $ include "arch/xen/conf/std.xen" @@ -206,9 +206,49 @@ xencons* at hypervisor? # Xen virtual console pci* at hypervisor? bus ? pci* at pchb? bus ? -# Xen will hide ppb devices from the guests kernels, and instead present all -# PCI busses from the hypervisor. So ppb devices should never probe. -#pci* at ppb? bus ? +pcib* at pci? dev ? function ? # PCI-ISA bridges +pchb* at pci? dev ? function ? # PCI-Host bridges +ppb* at pci? dev ? function ? # PCI-PCI bridges + +agp* at pchb? + +# XXX 'puc's aren't really bridges, but there's no better place for them here +puc* at pci? dev ? function ? # PCI "universal" comm. cards + +# Serial Devices + +# PCI serial interfaces +com* at puc? port ? # 16x50s on "universal" comm boards +cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards +cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards + +# ISA serial interfaces +#options COM_HAYESP # adds Hayes ESP serial board support +# If a com port is used as Xen console it can't be used by the domain0 kernel +# and there's no easy way to detect this yet. Leave com0 out as it's the +# port usually used for serial console +#com0 at isa? port 0x3f8 irq 4 # Standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +#com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 + +# Parallel Printer Interfaces + +# PCI parallel printer interfaces +lpt* at puc? port ? # || ports on "universal" comm boards + +# ISA parallel printer interfaces +lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports + +# Hardware monitors + +# LM7[89] and compatible hardware monitors +#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 + +# VIA VT82C686A hardware monitor +#viapm* at pci? dev ? function ? +#viaenv* at viapm? + # PCI network interfaces an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) @@ -216,6 +256,7 @@ ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet +dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet @@ -223,10 +264,10 @@ esh* at pci? dev ? function ? # Essential HIPPI card ex* at pci? dev ? function ? # 3Com 90x[BC] fpa* at pci? dev ? function ? # DEC DEFPA FDDI fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B -ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 -iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ +ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 +iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG le* at pci? dev ? function ? # PCnet-PCI Ethernet lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet @@ -249,6 +290,7 @@ vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) wm* at pci? dev ? function ? # Intel 8254x gigabit +xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE # MII/PHY support acphy* at mii? phy ? # Altima AC101 and AMD Am79c874 PHYs @@ -276,6 +318,11 @@ tqphy* at mii? phy ? # TDK Semiconductor PHYs ukphy* at mii? phy ? # generic unknown PHYs urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs +# I2O devices +iop* at pci? dev ? function ? # I/O processor +iopsp* at iop? tid ? # SCSI/FC-AL ports +ld* at iop? tid ? # block devices +dpti* at iop? tid 0 # DPT/Adaptec control interface # IDE and related devices # PCI IDE controllers - see pciide(4) for supported hardware. @@ -333,9 +380,25 @@ sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives st* at atapibus? drive ? flags 0x0000 # ATAPI tape drives uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown +# SCSI Controllers and Devices + +# PCI SCSI controllers +adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI +adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI +ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI +bha* at pci? dev ? function ? # BusLogic 9xx SCSI +dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID +iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID +mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC +njs* at pci? dev ? function ? # Workbit NinjaSCSI-32 +pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI siop* at pci? dev ? function ? # Symbios 53c8xx SCSI esiop* at pci? dev ? function ? # Symbios 53c875 SCSI and newer -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI +#options SIOP_SYMLED # drive the act. LED in software +trm* at pci? dev ? function ? # Tekram DC-395U/UW/F, DC-315/U SCSI # SCSI bus support scsibus* at scsi? @@ -348,11 +411,22 @@ ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown -pcib* at pci? dev ? function ? # PCI-ISA bridges -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges +# RAID controllers and devices +aac* at pci? dev ? function ? # Adaptec AAC family +amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID +cac* at pci? dev ? function ? # Compaq PCI array controllers +icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID +mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family +twe* at pci? dev ? function ? # 3ware Escalade RAID controllers -agp* at pchb? +ld* at aac? unit ? # logical disk devices +ld* at amr? unit ? +ld* at cac? unit ? +ld* at icp? unit ? +ld* at twe? unit ? +ld* at mlx? unit ? + +icpsp* at icp? unit ? # SCSI pass-through # ISA bus support isa0 at pcib? @@ -384,7 +458,6 @@ uhci* at pci? dev ? function ? # Universal Host Controller (Intel) usb* at ehci? usb* at ohci? usb* at uhci? -#usb* at slhci? # USB Hubs uhub* at usb? @@ -495,6 +568,16 @@ radio* at udsbr? # USB Generic driver ugen* at uhub? port ? +# PCI IEEE1394 controllers +fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller + +# CardBus IEEE1394 controllers +#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller + +ieee1394if* at fwohci? +fwip* at ieee1394if? # IP over IEEE1394 +sbp* at ieee1394if? euihi ? euilo ? # SCSI over IEEE1394 + # 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 @@ -536,6 +619,12 @@ mpu* at yds? # MIDI support midi* at midibus? +# Cryptographic Devices + +# PCI cryptographic devices +hifn* at pci? dev ? function ? # Hifn 7755/7811/795x +ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x + include "arch/i386/conf/GENERIC.local" # Pseudo-Devices diff --git a/sys/arch/xen/conf/files.xen b/sys/arch/xen/conf/files.xen index 9491699a4e7f..ab524ec86c6e 100644 --- a/sys/arch/xen/conf/files.xen +++ b/sys/arch/xen/conf/files.xen @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.30 2005/11/07 11:42:34 yamt Exp $ +# $NetBSD: files.xen,v 1.31 2005/11/21 22:15:13 bouyer 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 @@ -170,12 +170,10 @@ object /athhal-i386-elf.hal.o ath # include "dev/isa/files.isa" -# -# Machine-independent USB drivers -# - include "dev/usb/files.usb" +include "dev/ieee1394/files.ieee1394" + # PCI-Host bridge chipsets device pchb: pcibus, agpbus, agp_ali, agp_amd, agp_i810, agp_intel, agp_sis, agp_via