diff options
Diffstat (limited to 'sys')
68 files changed, 3299 insertions, 3313 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 222272eb9d7..d85fe95422b 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.124 2004/08/05 05:20:16 dlg Exp $ +# $OpenBSD: GENERIC,v 1.125 2004/09/16 09:14:02 mickey Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ machine alpha @@ -59,50 +59,50 @@ usb* at ohci? # USB devices uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +ugen* at uhub? # USB Generic driver # EV6 Tsunami Core Logic tsc* at mainbus0 @@ -114,19 +114,19 @@ tcasic* at mainbus0 tc* at tcasic? # TURBOchannel devices -ioasic* at tc? slot ? offset ? -mcclock* at ioasic? offset ? -le* at ioasic? offset ? -scc0 at ioasic? offset ? -scc1 at ioasic? offset ? -tcds* at tc? slot ? offset ? -asc* at tcds? chip ? +ioasic* at tc? +mcclock* at ioasic? +le* at ioasic? +scc0 at ioasic? +scc1 at ioasic? +tcds* at tc? +asc* at tcds? scsibus* at asc? -asc* at tc? slot ? offset ? -#cfb* at tc? slot ? offset ? -#sfb* at tc? slot ? offset ? -le* at tc? slot ? offset ? -fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards +asc* at tc? +#cfb* at tc? +#sfb* at tc? +le* at tc? +fta* at tc? # DEC DEFTA FDDI cards # PCI host bus adapter support apecs* at mainbus? @@ -144,92 +144,92 @@ pci* at ppb? pci* at tsp? # PCI devices -ppb* at pci? dev ? function ? # PCI-PCI bridges -sio* at pci? dev ? function ? # Intel PCI-ISA bridge -pceb* at pci? dev ? function ? # Intel PCI-EISA bridge +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +pceb* at pci? # Intel PCI-EISA bridge cy* at pci? # PCI cyclom card # PCI SCSI devices -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel scsibus* at isp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI +siop* at pci? # NCR 53c8xx SCSI scsibus* at siop? #UNTESTED: the following three drivers are untested. -adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI scsibus* at adw? -dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI +dpt* at pci? # DPT SmartCache/SmartRAID PCI scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? -twe* at pci? dev ? function ? # 3ware Escalade RAID controllers -scsibus* at twe? +twe* at pci? # 3ware Escalade RAID controllers +scsibus* at twe? #BROKEN: adv and twe have 64-bit problems -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#ami* at pci? dev ? function ? # AMI MegaRAID controllers +#ami* at pci? # AMI MegaRAID controllers #scsibus* at ami? # PCI Network devices -de* at pci? dev ? function ? # 21x4[012]-based Ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet cards -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -ep* at pci? dev ? function ? # 3COM 3c59x -xl* at pci? dev ? function ? # 3COM 3c9xx -txp* at pci? dev ? function ? # 3COM 3CR990 -fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -stge* at pci? dev ? function ? # Sundance TC9021 GigE -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet +de* at pci? # 21x4[012]-based Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +ne* at pci? # NE2000-compat ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet +ep* at pci? # 3COM 3c59x +xl* at pci? # 3COM 3c9xx +txp* at pci? # 3COM 3CR990 +fpa* at pci? # DEC DEFPA FDDI cards +bge* at pci? # Broadcom BCM570x (aka Tigon3) +stge* at pci? # Sundance TC9021 GigE +rl* at pci? # RealTek 81[23]9 ethernet +vr* at pci? # VIA Rhine ethernet +em* at pci? # Intel Pro/1000 ethernet +sis* at pci? # SiS 900/7016 ethernet #UNTESTED: the following section of drivers is untested on alpha. -en* at pci? dev ? function ? # ENI PCI ATM (untested) -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -ste* at pci? dev ? function ? # Sundance ST201 ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x +en* at pci? # ENI PCI ATM (untested) +tl* at pci? # Compaq Thunderlan ethernet +le* at pci? # PCI LANCE Ethernet (untested) +lmc* at pci? # Lan Media Corp SSI/T3/HSSI +wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +ste* at pci? # Sundance ST201 ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x sk* at skc? # each port of above -an* at pci? dev ? function ? # Cisco/Aironet 802.11DS +an* at pci? # Cisco/Aironet 802.11DS #BROKEN: The following driver has 64-bit issues -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet +#tx* at pci? # SMC 83C170 EPIC ethernet -vga* at pci? dev ? function ? # PCI VGA graphics -tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics +vga* at pci? # PCI VGA graphics +tga* at pci? # DEC ZLXp-E[123] graphics # Media Independent Interface (mii) drivers # UNTESTED: some of the following PHY's are untested. -eephy* at mii? phy ? # Marvell PHYs for Intel GigE -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -ukphy* at mii? phy ? # "unknown" PHYs +eephy* at mii? # Marvell PHYs for Intel GigE +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +ukphy* at mii? # "unknown" PHYs # ISA/EISA bus support isa* at pceb? @@ -239,82 +239,82 @@ isadma0 at isa? isapnp0 at isa? # ISA devices -mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -spkr0 at pcppi? # IBM BASIC emulation -isabeep0 at pcppi? # "keyboard" beep -midi* at pcppi? -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -pms* at pckbc? # PS/2-style mouse (aux port) -pmsi* at pckbc? # PS/2 "Intelli"mouse -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -lpt* at isa? port 0x3bc irq 7 # standard parallel port -vga* at isa? # ISA (EISA: XXX) VGA -we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet -we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -ep* at isa? port ? irq ? # 3C509 ethernet cards -ep* at isapnp? # 3C509 ethernet cards -#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System -lc0 at isa? port 0x200 irq ? # DEC EtherWorks -lc1 at isa? port 0x280 irq ? # DEC EtherWorks - -cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card -fdc0 at isa? port 0x3f0 irq 6 drq 2 # floppy controller -fd* at fdc? drive ? - -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +spkr0 at pcppi? # IBM BASIC emulation +isabeep0 at pcppi? # "keyboard" beep +midi* at pcppi? +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) +pmsi* at pckbc? # PS/2 "Intelli"mouse +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +lpt* at isa? port 0x3bc irq 7 # standard parallel port +vga* at isa? # ISA (EISA: XXX) VGA +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards +ep* at isa? # 3C509 ethernet cards +ep* at isapnp? # 3C509 ethernet cards +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System +lc0 at isa? port 0x200 # DEC EtherWorks +lc1 at isa? port 0x280 # DEC EtherWorks + +cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card +fdc0 at isa? port 0x3f0 irq 6 drq 2 # floppy controller +fd* at fdc? + +#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI #scsibus* at aic? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines # options CY_HW_RTS -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers # EISA devices -fea* at eisa? slot ? # DEC DEFEA FDDI cards -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI +fea* at eisa? # DEC DEFEA FDDI cards +ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices -cd* at scsibus? target ? lun ? -sd* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +cd* at scsibus? +sd* at scsibus? +ss* at scsibus? +st* at scsibus? +ch* at scsibus? +uk* at scsibus? # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? # Audio devices -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 +eap* at pci? # Ensoniq AudioPCI S5016 # UNTESTED. The following drivers are untested -eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive -sv* at pci? dev ? function ? # S3 SonicVibes (S3 617) -cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 -fms* at pci? dev ? function ? # Forte Media FM801 -auvia* at pci? dev ? function ? # VIA VT82C686A +eso* at pci? # ESS Solo-1 PCI AudioDrive +sv* at pci? # S3 SonicVibes (S3 617) +cmpci* at pci? # C-Media CMI8338/8738 +fms* at pci? # Forte Media FM801 +auvia* at pci? # VIA VT82C686A # OPL[23] FM syntheziers opl* at eso? # MIDI support -midi* at opl? # OPL FM synth +midi* at opl? # OPL FM synth #Audio Support audio* at eap? @@ -335,9 +335,9 @@ wsmouse* at pms? wsmouse* at pmsi? # crypto support -hifn* at pci? dev ? function ? # Hi/fn 7751 crypto card -#ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card -#ises* at pci? dev ? function ? # Pijnenburg PCC-ISES +hifn* at pci? # Hi/fn 7751 crypto card +#ubsec* at pci? # Bluesteel Networks 5xxx crypto card +#ises* at pci? # Pijnenburg PCC-ISES #pseudo-device raid 4 # RAIDframe disk driver pseudo-device crypto 1 diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index adcb0d7e68e..23f3d291445 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.60 2004/07/07 01:29:14 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.61 2004/09/16 09:14:02 mickey Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -44,90 +44,90 @@ option SCSITERSE # less verbose scsi error messages option BOOT_CONFIG -config bsd swap generic +config bsd swap generic -mainbus0 at root -cpu* at mainbus0 +mainbus0 at root +cpu* at mainbus0 # PCI host bus adapter support -apecs* at mainbus? -cia* at mainbus? -lca* at mainbus? -#irongate* at mainbus? -#tsc* at mainbus0 -#tsp* at tsc? +apecs* at mainbus? +cia* at mainbus? +lca* at mainbus? +#irongate* at mainbus? +#tsc* at mainbus0 +#tsp* at tsc? # PCI bus support -pci* at apecs? -pci* at cia? -pci* at lca? -pci* at ppb? -#pci* at irongate? -#pci* at tsp? +pci* at apecs? +pci* at cia? +pci* at lca? +pci* at ppb? +#pci* at irongate? +#pci* at tsp? # PCI devices -#ahc* at pci? dev ? function ? # AHA-28xx SCSI (NOT 64-BIT) -de* at pci? dev ? function ? # 21x4[012]-based Ethernet -#dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -#ne* at pci? dev ? function ? # NE2000-compat ethernet cards -#en* at pci? dev ? function ? # ENI PCI ATM (untested) -#ep* at pci? dev ? function ? # 3COM 3c59x (untested) -#xl* at pci? dev ? function ? # 3COM 3c9xx (untested) -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -#le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -siop* at pci? dev ? function ? # NCR 53c8xx SCSI -pceb* at pci? dev ? function ? # Intel PCI-EISA bridge -vga* at pci? dev ? function ? # PCI VGA graphics -ppb* at pci? dev ? function ? # PCI-PCI bridges -sio* at pci? dev ? function ? # Intel PCI-ISA bridge -tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics - -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) +de* at pci? # 21x4[012]-based Ethernet +#dc* at pci? # 21143, "tulip" clone ethernet +fxp* at pci? # EtherExpress 10/100B ethernet cards +#ne* at pci? # NE2000-compat ethernet cards +#en* at pci? # ENI PCI ATM (untested) +#ep* at pci? # 3COM 3c59x (untested) +#xl* at pci? # 3COM 3c9xx (untested) +#fpa* at pci? # DEC DEFPA FDDI cards +#le* at pci? # PCI LANCE Ethernet (untested) +siop* at pci? # NCR 53c8xx SCSI +pceb* at pci? # Intel PCI-EISA bridge +vga* at pci? # PCI VGA graphics +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +tga* at pci? # DEC ZLXp-E[123] graphics + +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #option ISP_COMPILE_FW=1 #option ISP_COMPILE_1040_FW=1 #option ISP_COMPILE_1080_FW=1 #option ISP_COMPILE_12160_FW=1 # Media Independent Interface (mii) drivers -#exphy* at mii? phy ? # 3Com internal PHYs -#inphy* at mii? phy ? # Intel 82555 PHYs -#icsphy* at mii? phy ? # ICS 1890 PHYs -#lxtphy* at mii? phy ? # Level1 LXT970 PHYs -#nsphy* at mii? phy ? # NS and compatible PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -#ukphy* at mii? phy ? # "unknown" PHYs +#exphy* at mii? # 3Com internal PHYs +#inphy* at mii? # Intel 82555 PHYs +#icsphy* at mii? # ICS 1890 PHYs +#lxtphy* at mii? # Level1 LXT970 PHYs +#nsphy* at mii? # NS and compatible PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +#ukphy* at mii? # "unknown" PHYs # ISA/EISA bus support -isa* at pceb? -isa* at sio? +isa* at pceb? +isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -com* at isa? port 0x3f8 irq 4 # standard serial ports +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 -vga* at isa? # ISA (EISA: XXX) VGA +vga* at isa? # ISA (EISA: XXX) VGA #we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series #we1 at isa? port 0x300 iomem 0xcc000 irq 10 # #ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card +#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards +#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards +#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card # IDE -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 flags 0x00 #wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 -#atapiscsi* at wdc? channel ? -#atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +#atapiscsi* at pciide? #scsibus* at atapiscsi? # SCSI bus support @@ -136,14 +136,14 @@ scsibus* at siop? scsibus* at isp? # SCSI devices -#cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -sd* at scsibus? target ? lun ? # SCSI disk drives -#st* at scsibus? target ? lun ? # SCSI tape drives +#cd* at scsibus? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives +#st* at scsibus? # SCSI tape drives # Workstation Console attachments -wsdisplay* at vga? -wsdisplay* at tga? -wskbd* at pckbd? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? #pseudo-device bpfilter 1 pseudo-device loop diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 630da287f87..65e5ad6f1e5 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.23 2004/01/16 09:27:40 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.24 2004/09/16 09:14:02 mickey Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -44,108 +44,108 @@ option SCSITERSE # less verbose scsi error messages option BOOT_CONFIG -config bsd swap generic +config bsd swap generic -mainbus0 at root -cpu* at mainbus0 +mainbus0 at root +cpu* at mainbus0 # PCI host bus adapter support -#apecs* at mainbus? -#cia* at mainbus? -#lca* at mainbus? -irongate* at mainbus? -tsc* at mainbus0 -tsp* at tsc? +#apecs* at mainbus? +#cia* at mainbus? +#lca* at mainbus? +irongate* at mainbus? +tsc* at mainbus0 +tsp* at tsc? # PCI bus support -#pci* at apecs? -#pci* at cia? -#pci* at lca? -pci* at irongate? -pci* at tsp? -pci* at ppb? +#pci* at apecs? +#pci* at cia? +#pci* at lca? +pci* at irongate? +pci* at tsp? +pci* at ppb? # PCI devices -ahc* at pci? dev ? function ? # AHA-28xx SCSI (NOT 64-BIT) -de* at pci? dev ? function ? # 21x4[012]-based Ethernet -#dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -#ne* at pci? dev ? function ? # NE2000-compat ethernet cards -#en* at pci? dev ? function ? # ENI PCI ATM (untested) -#ep* at pci? dev ? function ? # 3COM 3c59x (untested) -#xl* at pci? dev ? function ? # 3COM 3c9xx (untested) -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -#le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -siop* at pci? dev ? function ? # NCR 53c8xx SCSI -pceb* at pci? dev ? function ? # Intel PCI-EISA bridge -vga* at pci? dev ? function ? # PCI VGA graphics -ppb* at pci? dev ? function ? # PCI-PCI bridges -sio* at pci? dev ? function ? # Intel PCI-ISA bridge -tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) +de* at pci? # 21x4[012]-based Ethernet +#dc* at pci? # 21143, "tulip" clone ethernet +fxp* at pci? # EtherExpress 10/100B ethernet cards +#ne* at pci? # NE2000-compat ethernet cards +#en* at pci? # ENI PCI ATM (untested) +#ep* at pci? # 3COM 3c59x (untested) +#xl* at pci? # 3COM 3c9xx (untested) +#fpa* at pci? # DEC DEFPA FDDI cards +#le* at pci? # PCI LANCE Ethernet (untested) +siop* at pci? # NCR 53c8xx SCSI +pceb* at pci? # Intel PCI-EISA bridge +vga* at pci? # PCI VGA graphics +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +tga* at pci? # DEC ZLXp-E[123] graphics +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #option ISP_COMPILE_FW=1 #option ISP_COMPILE_1040_FW=1 #option ISP_COMPILE_1080_FW=1 #option ISP_COMPILE_12160_FW=1 # Media Independent Interface (mii) drivers -#exphy* at mii? phy ? # 3Com internal PHYs -#inphy* at mii? phy ? # Intel 82555 PHYs -#icsphy* at mii? phy ? # ICS 1890 PHYs -#lxtphy* at mii? phy ? # Level1 LXT970 PHYs -#nsphy* at mii? phy ? # NS and compatible PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -#ukphy* at mii? phy ? # "unknown" PHYs +#exphy* at mii? # 3Com internal PHYs +#inphy* at mii? # Intel 82555 PHYs +#icsphy* at mii? # ICS 1890 PHYs +#lxtphy* at mii? # Level1 LXT970 PHYs +#nsphy* at mii? # NS and compatible PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +#ukphy* at mii? # "unknown" PHYs # ISA/EISA bus support isa* at pceb? isa* at sio? # ISA devices -mcclock* at isa? port 0x70 -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -#pms* at pckbc? # PS/2-style mouse (aux port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port -#vga* at isa? # ISA (EISA: XXX) VGA -#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card +mcclock* at isa? port 0x70 +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +#pms* at pckbc? # PS/2-style mouse (aux port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +#lpt* at isa? port 0x3bc irq 7 # standard parallel port +#vga* at isa? # ISA (EISA: XXX) VGA +#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series +#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards +#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards +#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards +#cy0 atisa? iomem 0xd4000 irq 12 # ISA cyclom card # IDE -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 flags 0x00 #wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 -#atapiscsi* at wdc? channel ? -#atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +#atapiscsi* at pciide? #scsibus* at atapiscsi? # SCSI bus support -#scsibus* at asc? -scsibus* at ahc? -scsibus* at siop? -scsibus* at isp? +#scsibus* at asc? +scsibus* at ahc? +scsibus* at siop? +scsibus* at isp? # SCSI devices -#cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -sd* at scsibus? target ? lun ? # SCSI disk drives -#st* at scsibus? target ? lun ? # SCSI tape drives +#cd* at scsibus? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives +#st* at scsibus? # SCSI tape drives # Workstation Console attachments -wsdisplay* at vga? -wsdisplay* at tga? -wskbd* at pckbd? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? #pseudo-device bpfilter 1 pseudo-device loop diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 95fb1cea389..fe66420759b 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.39 2004/08/03 00:50:30 deraadt Exp $ +# $OpenBSD: RAMDISKBIG,v 1.40 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -45,10 +45,10 @@ option TCVERBOSE # recognize "unknown" TC devices option BOOT_CONFIG -config bsd swap generic +config bsd swap generic -mainbus0 at root -cpu* at mainbus0 +mainbus0 at root +cpu* at mainbus0 # PCI USB Controllers uhci* at pci? disable # Universal Host Controller (Intel) @@ -60,236 +60,236 @@ usb* at ohci? # USB Hubs uhub* at usb? -uhub* at uhub? port ? configuration ? interface ? +uhub* at uhub? # USB Generic HID devices -uhidev* at uhub? port ? configuration ? interface ? -uhid* at uhidev? reportid ? # USB Generic HID devices +uhidev* at uhub? +uhid* at uhidev? # USB Generic HID devices # USB Printers -#ulpt* at uhub? port ? configuration ? interface ? +#ulpt* at uhub? # USB Mass Storage devices -umass* at uhub? port ? configuration ? interface ? +umass* at uhub? scsibus* at umass? # USB Modems -#umodem* at uhub? port ? configuration ? +#umodem* at uhub? #ucom* at umodem? # USB Audio -#uaudio* at uhub? port ? configuration ? +#uaudio* at uhub? # USB Ethernet adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS # Diamond Multimedia Rio 500 -#urio* at uhub? port ? +#urio* at uhub? # Handspring Visor -#uvisor* at uhub? port ? configuration ? +#uvisor* at uhub? #ucom* at uvisor? # USB Generic driver -ugen* at uhub? port ? configuration ? interface ? +ugen* at uhub? # TurboChannel host bus adapter support -tcasic* at mainbus0 +tcasic* at mainbus0 # TurboChannel bus support -tc* at tcasic? +tc* at tcasic? # TurboChannel devices -ioasic* at tc? slot ? offset ? -mcclock* at ioasic? offset ? -le* at ioasic? offset ? -scc0 at ioasic? offset ? -scc1 at ioasic? offset ? -tcds* at tc? slot ? offset ? -asc* at tcds? chip ? -asc* at tc? slot ? offset ? +ioasic* at tc? +mcclock* at ioasic? +le* at ioasic? +scc0 at ioasic? +scc1 at ioasic? +tcds* at tc? +asc* at tcds? +asc* at tc? scsibus* at asc? -#cfb* at tc? slot ? offset ? -#sfb* at tc? slot ? offset ? -le* at tc? slot ? offset ? -fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards +#cfb* at tc? +#sfb* at tc? +le* at tc? +fta* at tc? # DEC DEFTA FDDI cards # PCI host bus adapter support -apecs* at mainbus? -cia* at mainbus? -irongate* at mainbus? -lca* at mainbus? -tsc* at mainbus0 -tsp* at tsc? +apecs* at mainbus? +cia* at mainbus? +irongate* at mainbus? +lca* at mainbus? +tsc* at mainbus0 +tsp* at tsc? # PCI bus support -pci* at apecs? -pci* at cia? -pci* at irongate? -pci* at lca? -pci* at ppb? -pci* at tsp? +pci* at apecs? +pci* at cia? +pci* at irongate? +pci* at lca? +pci* at ppb? +pci* at tsp? # PCI devices -ppb* at pci? dev ? function ? # PCI-PCI bridges -sio* at pci? dev ? function ? # Intel PCI-ISA bridge -pceb* at pci? dev ? function ? # Intel PCI-EISA bridge +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +pceb* at pci? # Intel PCI-EISA bridge cy* at pci? # PCI cyclom card # PCI SCSI devices -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel scsibus* at isp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI +siop* at pci? # NCR 53c8xx SCSI scsibus* at siop? #UNTESTED: the following three drivers are untested. -adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI scsibus* at adw? -dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI +dpt* at pci? # DPT SmartCache/SmartRAID PCI scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? #BROKEN: adv and twe have 64-bit problems -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers -#scsibus* at twe? +#twe* at pci? # 3ware Escalade RAID controllers +#scsibus* at twe? # PCI Network devices -de* at pci? dev ? function ? # 21x4[012]-based Ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet cards -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -ep* at pci? dev ? function ? # 3COM 3c59x -xl* at pci? dev ? function ? # 3COM 3c9xx -txp* at pci? dev ? function ? # 3COM 3CR990 -fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -stge* at pci? dev ? function ? # Sundance TC9021 GigE -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet +de* at pci? # 21x4[012]-based Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +ne* at pci? # NE2000-compat ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet +ep* at pci? # 3COM 3c59x +xl* at pci? # 3COM 3c9xx +txp* at pci? # 3COM 3CR990 +fpa* at pci? # DEC DEFPA FDDI cards +bge* at pci? # Broadcom BCM570x (aka Tigon3) +stge* at pci? # Sundance TC9021 GigE +rl* at pci? # RealTek 81[23]9 ethernet +vr* at pci? # VIA Rhine ethernet +em* at pci? # Intel Pro/1000 ethernet +sis* at pci? # SiS 900/7016 ethernet #UNTESTED: the following section of drivers is untested on alpha. -en* at pci? dev ? function ? # ENI PCI ATM (untested) -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -ste* at pci? dev ? function ? # Sundance ST201 ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x +en* at pci? # ENI PCI ATM (untested) +tl* at pci? # Compaq Thunderlan ethernet +le* at pci? # PCI LANCE Ethernet (untested) +lmc* at pci? # Lan Media Corp SSI/T3/HSSI +wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +ste* at pci? # Sundance ST201 ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x sk* at skc? # each port of above -an* at pci? dev ? function ? # Cisco/Aironet 802.11DS +an* at pci? # Cisco/Aironet 802.11DS #BROKEN: The following driver has 64-bit issues -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet +#tx* at pci? # SMC 83C170 EPIC ethernet -vga* at pci? dev ? function ? # PCI VGA graphics -tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics +vga* at pci? # PCI VGA graphics +tga* at pci? # DEC ZLXp-E[123] graphics # Media Independent Interface (mii) drivers # UNTESTED: some of the following PHY's are untested. -eephy* at mii? phy ? # Marvell PHYs for Intel GigE -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -ukphy* at mii? phy ? # "unknown" PHYs +eephy* at mii? # Marvell PHYs for Intel GigE +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +ukphy* at mii? # "unknown" PHYs # ISA/EISA bus support -isa* at pceb? -eisa* at pceb? -isa* at sio? -isadma0 at isa? -isapnp0 at isa? +isa* at pceb? +eisa* at pceb? +isa* at sio? +isadma0 at isa? +isapnp0 at isa? # ISA devices -mcclock* at isa? port 0x70 -#pcppi* at isa? # PC prog. periph. interface -#spkr0 at pcppi? -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -pms* at pckbc? # PS/2-style mouse (aux port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port -vga* at isa? # ISA (EISA: XXX) VGA -we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet -we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -ep* at isa? port ? irq ? # 3C509 ethernet cards -ep* at isapnp? -#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System -lc0 at isa? port 0x200 irq ? # DEC EtherWorks -lc1 at isa? port 0x280 irq ? # DEC EtherWorks - -cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card - -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI +mcclock* at isa? port 0x70 +#pcppi* at isa? # PC prog. periph. interface +#spkr0 at pcppi? +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +#lpt* at isa? port 0x3bc irq 7 # standard parallel port +vga* at isa? # ISA (EISA: XXX) VGA +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards +ep* at isa? # 3C509 ethernet cards +ep* at isapnp? +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System +lc0 at isa? port 0x200 # DEC EtherWorks +lc1 at isa? port 0x280 # DEC EtherWorks + +cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card + +#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI #scsibus* at aic? -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers # EISA devices -fea* at eisa? slot ? # DEC DEFEA FDDI cards -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI +fea* at eisa? # DEC DEFEA FDDI cards +ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices -cd* at scsibus? target ? lun ? -sd* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +cd* at scsibus? +sd* at scsibus? +ss* at scsibus? +st* at scsibus? +ch* at scsibus? +uk* at scsibus? # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 flags 0x00 #wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -#atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? # Workstation Console attachments -#wsdisplay* at cfb? -#wsdisplay* at sfb? -wsdisplay* at vga? -wsdisplay* at tga? -wskbd* at pckbd? -wsmouse* at pms? +#wsdisplay* at cfb? +#wsdisplay* at sfb? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at pms? pseudo-device bpfilter 1 pseudo-device loop diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 7ec453e4fad..32bc8b978fa 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.60 2004/07/03 19:18:47 millert Exp $ +# $OpenBSD: files.alpha,v 1.61 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -138,8 +138,8 @@ attach isabeep at pcppi include "dev/pckbc/files.pckbc" # Floppy disk controller -#device fdc {drive = -1}: isa_dma -device fdc {drive = -1} +#device fdc {[drive = -1]}: isa_dma +device fdc {[drive = -1]} attach fdc at isa file dev/isa/fdc.c fdc needs-flag diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 682734087e0..40ba27adfe0 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.28 2004/09/14 23:17:54 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.29 2004/09/16 09:14:03 mickey Exp $ # # GENERIC -- everything that's currently supported # @@ -32,31 +32,31 @@ config bsd swap generic mainbus0 at root -cpu0 at mainbus? apid ? +cpu0 at mainbus? isa0 at mainbus0 #isa0 at pcib? -pci* at mainbus0 bus ? +pci* at mainbus0 option PCIVERBOSE option USBVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -#pcib* at pci? dev ? function ? # PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +#pcib* at pci? # PCI-ISA bridge # power management and other environmental stuff -#amdpm* at pci? dev ? function ? # AMD768MPX +#amdpm* at pci? # AMD768MPX # National Semiconductor LM7[89] and compatible hardware monitors lm0 at isa? port 0x290 #lm1 at isa? port 0x280 #lm2 at isa? port 0x310 -it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware - # monitors -viaenv* at pci? dev ? function ? # VIA VT82C686A hardware monitor +it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware + # monitors +viaenv* at pci? # VIA VT82C686A hardware monitor # ISA PCMCIA controllers #option PCMCIAVERBOSE @@ -66,22 +66,22 @@ viaenv* at pci? dev ? function ? # VIA VT82C686A hardware monitor #tcic0 at isa? disable port 0x240 iomem 0xd0000 iosiz 0x10000 # PCI PCMCIA controllers -#pcic* at pci? dev? function ? +#pcic* at pci? # PCMCIA bus support -#pcmcia* at pcic? controller ? socket ? -#pcmcia* at tcic? controller ? socket ? +#pcmcia* at pcic? +#pcmcia* at tcic? # CardBus bus support #cardbus* at cardslot? #pcmcia* at cardslot? -#cbb* at pci? dev ? function ? +#cbb* at pci? #cardslot* at cbb? # PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller +ehci* at pci? # Enhanced Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at ehci? @@ -89,57 +89,57 @@ usb* at uhci? usb* at ohci? # USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +ugen* at uhub? # USB Generic driver # FireWire Controllers -#fwohci* at pci? dev ? function ? # PCI FireWire adapter -#fwohci* at cardbus? dev ? function ? # CardBus FireWire adapter +#fwohci* at pci? # PCI FireWire adapter +#fwohci* at cardbus? # CardBus FireWire adapter -#fwnode* at fwbus? idhi ? idlo ? +#fwnode* at fwbus? #fwscsi* at fwnode? # SCSI over FireWire #scsibus* at fwscsi? @@ -164,11 +164,11 @@ pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? -vga* at pci? dev ? function ? +vga* at pci? #pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -#wsdisplay* at pcdisplay? console ? -wskbd* at pckbd? console ? +wsdisplay* at vga? +#wsdisplay* at pcdisplay? +wskbd* at pckbd? wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 @@ -189,102 +189,102 @@ com1 at isa? port 0x2f8 irq 3 #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards #pccom* at rtfps? slave ? #hsq0 at isa? port 0x140 irq 10 # Hostess 4-port serial card -#com* at hsq? slave ? -#com* at pcmcia? function ? # PCMCIA modems/serial ports -com* at puc? port ? +#com* at hsq? +#com* at pcmcia? # PCMCIA modems/serial ports +com* at puc? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines # options CY_HW_RTS #cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom serial card #cy* at pci? # PCI cyclom serial card -#cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards +#cz* at pci? # Cyclades-Z multi-port serial boards #lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#lpt* at puc? port ? +#lpt* at puc? -#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable port ? irq ? -#bha* at pci? dev ? function ? +#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable +#bha* at pci? #scsibus* at bha? -#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers #scsibus* at aha? -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI +#dpt* at pci? # DPT SmartCache/SmartRAID PCI #scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +#twe* at pci? # 3ware Escalade RAID controllers #scsibus* at twe? -#aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +#aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? -#ami* at pci? dev ? function ? # AMI MegaRAID controllers +#ami* at pci? # AMI MegaRAID controllers #scsibus* at ami? -#cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers +#cac* at pci? # Compaq Smart ARRAY RAID controllers #scsibus* at cac? -#iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +#iha* at pci? # Initio Ultra/UltraWide SCSI controllers #scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -#aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +#aic* at pcmcia? # PCMCIA based aic SCSI controllers #scsibus* at aic? -#esp* at pcmcia? function ? # PCMCIA based NCR 53C9X SCSI +#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI #scsibus* at esp? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? #sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers #scsibus* at sea? -#trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +#trm* at pci? # Tekram DC-3x5U SCSI Controllers #scsibus* at trm? -#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha1 at isa? disable port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers +#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +#uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers #scsibus* at uha? #wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 #scsibus* at wds? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -ch* at scsibus? target ? lun ? # SCSI autochangers -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +ch* at scsibus? # SCSI autochangers +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI #fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? flags 0x00 +#fdc1 at isa? port 0x370 +#fd* at fdc? flags 0x00 # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 flags 0x00 #wdc1 at isa? port 0x170 irq 15 flags 0x00 #wdc* at pcmcia? function ? # IDE hard drives -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -#atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? # Networking devices @@ -292,118 +292,118 @@ scsibus* at atapiscsi? #we1 at isa? port 0x300 iomem 0xcc000 irq 10 # #we2 at isa? port 0x280 iomem 0xd0000 irq 3 # WD/SMC 80x3 ethernet #ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -#eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet -#el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -#ep0 at isa? port ? irq ? # 3C509 ethernet -#ep* at isa? port ? irq ? # 3C509 ethernet +#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet +#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet +#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +#eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet +#el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet +#ep0 at isa? # 3C509 ethernet +#ep* at isa? # 3C509 ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -#lc0 at isa? port 0x200 irq ? # DEC EtherWorks -#lc1 at isa? port 0x280 irq ? # DEC EtherWorks -#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring -#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring -#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring -#lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI -#le* at pci? dev ? function ? # PCnet-PCI based ethernet -#de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -#fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -#ne* at pci? dev ? function ? # NE2000-compat ethernet -#ep0 at pci? dev ? function ? # 3C59x ethernet -#ep* at pci? dev ? function ? # 3C59x ethernet -#ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -#ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#sm* at pcmcia? function ? # PCMCIA based sm ethernet -#xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -xl* at pci? dev ? function ? # 3C9xx ethernet -#xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -#rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -#mtd* at pci? dev ? function ? # Myson MTD800/803/891 -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -#tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -#wb* at pci? dev ? function ? # Winbond W89C840F ethernet -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -#ste* at pci? dev ? function ? # Sundance ST201 ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -#dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -stge* at pci? dev ? function ? # Sundance TC9021 GigE -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#hme* at pci? dev ? function ? # Sun Happy Meal +#ie1 at isa? port 0x300 irq 10 # EtherExpress +#lc0 at isa? port 0x200 # DEC EtherWorks +#lc1 at isa? port 0x280 # DEC EtherWorks +#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +#tr0 at isa? port 0xa20 iomem 0xd8000 # IBM TROPIC based Token-Ring +#tr1 at isa? port 0xa24 iomem 0xd0000 # IBM TROPIC based Token-Ring +#tr* at isa? # 3COM TROPIC based Token-Ring +#lmc* at pci? # Lan Media Corp SSI/T3/HSSI +#le* at pci? # PCnet-PCI based ethernet +#de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +#fxp* at cardbus? # Intel PRO/100 ethernet +#ne* at pci? # NE2000-compat ethernet +#ep0 at pci? # 3C59x ethernet +#ep* at pci? # 3C59x ethernet +#ne* at pcmcia? # PCMCIA based NE2000 ethernet +#ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#sm* at pcmcia? # PCMCIA based sm ethernet +#xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI +xl* at pci? # 3C9xx ethernet +#xl* at cardbus? # 3C575/3C656 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +#rl* at cardbus? # RealTek 81[23]9 ethernet +#mtd* at pci? # Myson MTD800/803/891 +#tx* at pci? # SMC 83C170 EPIC ethernet +#tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +#wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +sis* at pci? # SiS 900/7016 ethernet +#ste* at pci? # Sundance ST201 ethernet +dc* at pci? # 21143, "tulip" clone ethernet +#dc* at cardbus? # 21143, "tulip" clone ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +bge* at pci? # Broadcom BCM570x (aka Tigon3) +re* at pci? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +#lge* at pci? # Level1 LXT1001 GigE +#hme* at pci? # Sun Happy Meal # Wireless network cards -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pci? dev ? function ? # Aironet IEEE 802.11DS -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pci? # WaveLAN IEEE 802.11DS +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pci? # Aironet IEEE 802.11DS +#an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -nsgphy* at mii? phy ? # NS gigabit PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -urlphy* at mii? phy ? # Realtek RTL8150L internal PHY -ukphy* at mii? phy ? # "unknown" PHYs - -#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System -#sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver - -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 -#eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive -#sv* at pci? dev ? function ? # S3 SonicVibes (S3 617) -#neo* at pci? dev ? function ? # NeoMagic 256AV/ZX -#cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 -auich* at pci? dev ? function ? flags 0x0000 # i82801 ICH AC'97 audio -#autri* at pci? dev ? function ? flags 0x0000 # Trident 4D WAVE -auvia* at pci? dev ? function ? # VIA VT82C686A -#clcs* at pci? dev ? function ? # CS4280 CrystalClear audio -#clct* at pci? dev ? function ? # CS4281 CrystalClear audio -#fms* at pci? dev ? function ? # Forte Media FM801 -#maestro* at pci? dev ? function ? # ESS Maestro PCI -#esa* at pci? dev ? function ? # ESS Maestro3 PCI -#yds* at pci? dev ? function ? flags 0x0000 # Yamaha YMF Audio -#emu* at pci? dev ? function ? # SB Live! -#sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster -#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System -#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +urlphy* at mii? # Realtek RTL8150L internal PHY +ukphy* at mii? # "unknown" PHYs + +#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System +#sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver + +eap* at pci? # Ensoniq AudioPCI S5016 +#eso* at pci? # ESS Solo-1 PCI AudioDrive +#sv* at pci? # S3 SonicVibes (S3 617) +#neo* at pci? # NeoMagic 256AV/ZX +#cmpci* at pci? # C-Media CMI8338/8738 +auich* at pci? flags 0x0000 # i82801 ICH AC'97 audio +#autri* at pci? flags 0x0000 # Trident 4D WAVE +auvia* at pci? # VIA VT82C686A +#clcs* at pci? # CS4280 CrystalClear audio +#clct* at pci? # CS4281 CrystalClear audio +#fms* at pci? # Forte Media FM801 +#maestro* at pci? # ESS Maestro PCI +#esa* at pci? # ESS Maestro3 PCI +#yds* at pci? flags 0x0000 # Yamaha YMF Audio +#emu* at pci? # SB Live! +#sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster +#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System +#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum #gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis (drq2 is record drq) -#mpu* at isa? port 0x300 # generic MPU, Yamaha SW60XG +#mpu* at isa? port 0x300 # generic MPU, Yamaha SW60XG #aria0 at isa? port 0x280 irq 10 drq 0 flags 0x1 # Prometheus Aria 16 # OPL[23] FM synthesizers @@ -452,7 +452,7 @@ audio* at uaudio? #bktr0 at pci? dev ? function ? # FM-Radio devices -#gtp* at pci? dev ? function ? # Gemtek/Guillemot Radio PCI Radio Card +#gtp* at pci? # Gemtek/Guillemot Radio PCI Radio Card #sfr0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR FM Radio Card #sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card #az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card @@ -472,19 +472,19 @@ audio* at uaudio? # Joystick driver. Probe is a little strange; add only if you have one. #joy0 at isa? port 0x201 -#wdt0 at pci? dev ? function ? # Ind Computer Source PCI-WDT50x driver +#wdt0 at pci? # Ind Computer Source PCI-WDT50x driver # crypto support -hifn* at pci? dev ? function ? # Hi/fn 7751 crypto card -lofn* at pci? dev ? function ? # Hi/fn 6500 crypto card -nofn* at pci? dev ? function ? # Hi/fn 7814/7851/7854 crypto card -ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card -safe* at pci? dev ? function ? # SafeNet SafeXcel 1141/1741 -ises* at pci? dev ? function ? # Pijnenburg PCC-ISES +hifn* at pci? # Hi/fn 7751 crypto card +lofn* at pci? # Hi/fn 6500 crypto card +nofn* at pci? # Hi/fn 7814/7851/7854 crypto card +ubsec* at pci? # Bluesteel Networks 5xxx crypto card +safe* at pci? # SafeNet SafeXcel 1141/1741 +ises* at pci? # Pijnenburg PCC-ISES # I2O -#iop* at pci? dev ? function ? # I2O -#ioprbs* at iop? tid ? # Random block storage +#iop* at pci? # I2O +#ioprbs* at iop? # Random block storage #scsibus* at ioprbs? #pseudo-device sequencer 1 diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP index af4666420ca..5615a67b666 100644 --- a/sys/arch/amd64/conf/GENERIC.MP +++ b/sys/arch/amd64/conf/GENERIC.MP @@ -4,6 +4,6 @@ option MULTIPROCESSOR option MPBIOS option CPU -cpu* at mainbus? apid ? -ioapic* at mainbus? apid ? -#aapic* at pci? dev ? function ? +cpu* at mainbus? +ioapic* at mainbus? +#aapic* at pci? diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index ff670e43c89..90457359342 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.14 2004/09/06 10:49:42 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.15 2004/09/16 09:14:03 mickey Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -33,86 +33,86 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu* at mainbus0 apid ? +cpu* at mainbus0 isa0 at mainbus0 #isa0 at pcib? pci* at mainbus0 option PCIVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -#pcib* at pci? dev ? function ? # PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +#pcib* at pci? # PCI-ISA bridge # CardBus bus support #cardbus* at cardslot? #pcmcia* at cardslot? -#cbb* at pci? dev ? function ? +#cbb* at pci? #cardslot* at cbb? # PCI PCMCIA controllers -#pcic* at pci? dev? function ? +#pcic* at pci? # PCMCIA bus support -#pcmcia* at pcic? controller ? socket ? +#pcmcia* at pcic? # PCI USB Controllers -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at uhci? usb* at ohci? -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -#uhid* at uhub? port ? configuration ? # USB Generic HID devices -#umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +#uhid* at uhub? # USB Generic HID devices +#umodem* at uhub? # USB Modems/Serial #ucom* at umodem? -#uvisor* at uhub? port ? configuration ? # Handspring Visor +#uvisor* at uhub? # Handspring Visor #ucom* at uvisor? -#uftdi* at uhub? port ? -#ucom* at uftdi? portno ? -#uaudio* at uhub? port ? configuration ?# USB Audio -#ulpt* at uhub? port ? configuration ? # USB Printers -uhidev* at uhub? port ? configuration ? interface ? -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 -#umass* at uhub? port ? configuration ? # USB Mass Storage devices +#uftdi* at uhub? +#ucom* at uftdi? +#uaudio* at uhub? # USB Audio +#ulpt* at uhub? # USB Printers +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +#umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#ums* at uhidev? reportid ? +#ums* at uhidev? #wsmouse* at ums? mux 0 -#aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -#cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -#kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -#upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -#urio* at uhub? port ? # Diamond Multimedia Rio 500 -#uscanner* at uhub? port ? # USB Scanners -#usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +#aue* at uhub? # ADMtek AN986 Pegasus Ethernet +#cue* at uhub? # CATC USB-EL1201A based Ethernet +#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +#urio* at uhub? # Diamond Multimedia Rio 500 +#uscanner* at uhub? # USB Scanners +#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +#ugen* at uhub? # USB Generic driver -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +wskbd* at pckbd? vga0 at isa? -vga* at pci? dev ? function ? -wsdisplay* at vga? console ? +vga* at pci? +wsdisplay* at vga? 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 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -#pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +#pccom* at pcmcia? # PCMCIA modem cards # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -123,139 +123,139 @@ com2 at isa? port 0x3e8 irq 5 #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bha* at pci? dev ? function ? +#bha* at pci? #scsibus* at bha? -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI +#dpt* at pci? # DPT SmartCache/SmartRAID PCI #scsibus* at dpt? -#gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +#gdt* at pci? # ICP Vortex GDT RAID controllers #scsibus* at gdt? -#aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +#aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? -#ami* at pci? dev ? function ? # AMI MegaRAID controllers +#ami* at pci? # AMI MegaRAID controllers #scsibus* at ami? -#cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers +#cac* at pci? # Compaq Smart ARRAY RAID controllers #scsibus* at cac? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +#twe* at pci? # 3ware Escalade RAID controllers #scsibus* at twe? -#iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +#iha* at pci? # Initio Ultra/UltraWide SCSI controllers #scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? -#aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +#aic* at pcmcia? # PCMCIA based aic SCSI controllers #scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? -#trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +#trm* at pci? # Tekram DC-3x5U SCSI Controllers #scsibus* at trm? # I2O -#iop* at pci? dev ? function ? # I2O -#ioprbs* at iop? tid ? # Random block storage +#iop* at pci? # I2O +#ioprbs* at iop? # Random block storage #scsibus* at ioprbs? -sd* at scsibus? target ? lun ? # SCSI disk drives -#st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +#st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices #fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +#fd* at fdc? # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 -#wdc* at pcmcia? function ? +#wdc* at pcmcia? # IDE hard drives -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -#atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#le* at pci? dev ? function ? # PCnet-PCI based ethernet -#de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -#fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -#ep0 at pci? dev ? function ? # 3C59x ethernet -#ep* at pci? dev ? function ? # 3C59x ethernet -#ne* at pci? dev ? function ? # NE2000-compat ethernet -#ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -#ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#sm* at pcmcia? function ? # PCMCIA based sm ethernet -#xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -#xl* at pci? dev ? function ? # 3C9xx ethernet -#xl* at cardbus? dev ? function ? # 3C575 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -#tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -#wb* at pci? dev ? function ? # Winbond W89C840F ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#mtd* at pci? dev ? function ? # Myson MTD803 +#le* at pci? # PCnet-PCI based ethernet +#de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +#fxp* at cardbus? # Intel PRO/100 ethernet +#ep0 at pci? # 3C59x ethernet +#ep* at pci? # 3C59x ethernet +#ne* at pci? # NE2000-compat ethernet +#ne* at pcmcia? # PCMCIA based NE2000 ethernet +#ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#sm* at pcmcia? # PCMCIA based sm ethernet +#xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI +#xl* at pci? # 3C9xx ethernet +#xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +re* at pci? # Realtek 8169/8169S/8110S +#tx* at pci? # SMC 83C170 EPIC ethernet +#tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +#wb* at pci? # Winbond W89C840F ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +#txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +bge* at pci? # Broadcom BCM570x (aka Tigon3) +#lge* at pci? # Level1 LXT1001 GigE +#mtd* at pci? # Myson MTD803 # Wireless network cards -#wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +#wi* at pci? # WaveLAN IEEE 802.11DS +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -#exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -#icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -#rlphy* at mii? phy ? # RealTek 8139 internal PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -#acphy* at mii? phy ? # Altima AC101 PHYs -#amphy* at mii? phy ? # AMD 79C873 PHYs -#tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -#eephy* at mii? phy ? # Marvell 88E1000 series PHY -#xmphy* at mii? phy ? # XaQti XMAC-II PHYs -#bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -#pseudo-device sl 1 # CSLIP -#pseudo-device ppp 1 # PPP -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -#pseudo-device ccd 4 # concatenated disk devices +#exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +#icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +#rlphy* at mii? # RealTek 8139 internal PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +#acphy* at mii? # Altima AC101 PHYs +#amphy* at mii? # AMD 79C873 PHYs +#tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +#eephy* at mii? # Marvell 88E1000 series PHY +#xmphy* at mii? # XaQti XMAC-II PHYs +#bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 # network loopback +#pseudo-device sl 1 # CSLIP +#pseudo-device ppp 1 # PPP +pseudo-device bpfilter 1 # packet filter +pseudo-device rd 1 # ramdisk +#pseudo-device ccd 4 # concatenated disk devices pseudo-device wsmux 2 diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 2eaccc59d6e..32e73acd8a2 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.16 2004/09/06 10:49:42 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.17 2004/09/16 09:14:03 mickey Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -33,92 +33,92 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu* at mainbus0 apid ? +cpu* at mainbus0 isa0 at mainbus0 #isa0 at pcib? pci* at mainbus0 option PCIVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -#pcib* at pci? dev ? function ? # PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +#pcib* at pci? # PCI-ISA bridge # CardBus bus support #cardbus* at cardslot? #pcmcia* at cardslot? -#cbb* at pci? dev ? function ? +#cbb* at pci? #cardslot* at cbb? # PCI PCMCIA controllers -#pcic* at pci? dev? function ? +#pcic* at pci? # PCMCIA bus support -#pcmcia* at pcic? controller ? socket ? +#pcmcia* at pcic? # PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller +ehci* at pci? # Enhanced Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at ehci? usb* at uhci? usb* at ohci? -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -#uhid* at uhub? port ? configuration ? # USB Generic HID devices -#umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +#uhid* at uhub? # USB Generic HID devices +#umodem* at uhub? # USB Modems/Serial #ucom* at umodem? -#uvisor* at uhub? port ? configuration ? # Handspring Visor +#uvisor* at uhub? # Handspring Visor #ucom* at uvisor? -#uftdi* at uhub? port ? -#ucom* at uftdi? portno ? -#uaudio* at uhub? port ? configuration ?# USB Audio -#ulpt* at uhub? port ? configuration ? # USB Printers -uhidev* at uhub? port ? configuration ? interface ? -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 -umass* at uhub? port ? configuration ? # USB Mass Storage devices +#uftdi* at uhub? +#ucom* at uftdi? +#uaudio* at uhub? # USB Audio +#ulpt* at uhub? # USB Printers +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -#ums* at uhidev? reportid ? +#ums* at uhidev? #wsmouse* at ums? mux 0 -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -#urio* at uhub? port ? # Diamond Multimedia Rio 500 -#uscanner* at uhub? port ? # USB Scanners -#usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +#urio* at uhub? # Diamond Multimedia Rio 500 +#uscanner* at uhub? # USB Scanners +#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +#ugen* at uhub? # USB Generic driver -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? -vga0 at isa? -vga* at pci? dev ? function ? -wsdisplay* at vga? console ? +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +wskbd* at pckbd? +vga0 at isa? +vga* at pci? +wsdisplay* at vga? 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 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -#pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +#pccom* at pcmcia? # PCMCIA modem cards # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -129,140 +129,140 @@ com2 at isa? port 0x3e8 irq 5 #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bha* at pci? dev ? function ? +#bha* at pci? #scsibus* at bha? -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI +#dpt* at pci? # DPT SmartCache/SmartRAID PCI #scsibus* at dpt? -#gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +#gdt* at pci? # ICP Vortex GDT RAID controllers #scsibus* at gdt? -#aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +#aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? -#ami* at pci? dev ? function ? # AMI MegaRAID controllers +#ami* at pci? # AMI MegaRAID controllers #scsibus* at ami? -#cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers +#cac* at pci? # Compaq Smart ARRAY RAID controllers #scsibus* at cac? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +#twe* at pci? # 3ware Escalade RAID controllers #scsibus* at twe? -#iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +#iha* at pci? # Initio Ultra/UltraWide SCSI controllers #scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? -#aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +#aic* at pcmcia? # PCMCIA based aic SCSI controllers #scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? -#trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +#trm* at pci? # Tekram DC-3x5U SCSI Controllers #scsibus* at trm? # I2O -#iop* at pci? dev ? function ? # I2O -#ioprbs* at iop? tid ? # Random block storage +#iop* at pci? # I2O +#ioprbs* at iop? # Random block storage #scsibus* at ioprbs? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices #fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +#fd* at fdc? # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 -#wdc* at pcmcia? function ? +#wdc* at pcmcia? # IDE hard drives -#wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -#atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +#atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#le* at pci? dev ? function ? # PCnet-PCI based ethernet -#de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -#fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -#ep0 at pci? dev ? function ? # 3C59x ethernet -#ep* at pci? dev ? function ? # 3C59x ethernet -#ne* at pci? dev ? function ? # NE2000-compat ethernet -#ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -#ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#sm* at pcmcia? function ? # PCMCIA based sm ethernet -#xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -#xl* at pci? dev ? function ? # 3C9xx ethernet -#xl* at cardbus? dev ? function ? # 3C575 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -#tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -#wb* at pci? dev ? function ? # Winbond W89C840F ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#mtd* at pci? dev ? function ? # Myson MTD803 +#le* at pci? # PCnet-PCI based ethernet +#de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +#fxp* at cardbus? # Intel PRO/100 ethernet +#ep0 at pci? # 3C59x ethernet +#ep* at pci? # 3C59x ethernet +#ne* at pci? # NE2000-compat ethernet +#ne* at pcmcia? # PCMCIA based NE2000 ethernet +#ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#sm* at pcmcia? # PCMCIA based sm ethernet +#xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI +#xl* at pci? # 3C9xx ethernet +#xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +#tx* at pci? # SMC 83C170 EPIC ethernet +#tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +#wb* at pci? # Winbond W89C840F ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +#txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +sf* at pci? # Adaptec AIC-6915 ethernet +bge* at pci? # Broadcom BCM570x (aka Tigon3) +re* at pci? # Realtek 8169/8169S/8110S +#lge* at pci? # Level1 LXT1001 GigE +#mtd* at pci? # Myson MTD803 # Wireless network cards -#wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +#wi* at pci? # WaveLAN IEEE 802.11DS +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -#pseudo-device sl 1 # CSLIP -#pseudo-device ppp 1 # PPP -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device ccd 4 # concatenated disk devices +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 # network loopback +#pseudo-device sl 1 # CSLIP +#pseudo-device ppp 1 # PPP +pseudo-device bpfilter 1 # packet filter +pseudo-device rd 1 # ramdisk +pseudo-device ccd 4 # concatenated disk devices pseudo-device wsmux 2 diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 1e77b8f1479..5b5cb589516 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.5 2004/08/20 15:19:28 millert Exp $ +# $OpenBSD: files.amd64,v 1.6 2004/09/16 09:14:03 mickey Exp $ maxpartitions 16 maxusers 2 16 128 @@ -64,12 +64,12 @@ include "dev/i2o/files.i2o" include "dev/atapiscsi/files.atapiscsi" include "dev/ata/files.ata" -define mainbus { apid = -1 } +define mainbus {[apid = -1]} device mainbus: isabus, pcibus, mainbus attach mainbus at root file arch/amd64/amd64/mainbus.c mainbus -define cpu { apid = -1 } +define cpu {[apid = -1]} device cpu attach cpu at mainbus file arch/amd64/amd64/cpu.c cpu @@ -127,7 +127,7 @@ device sysbeep attach sysbeep at pcppi # Floppy disk controller -device fdc { drive = - 1 } +device fdc {[drive = -1]} attach fdc at isa file dev/isa/fdc.c fdc needs-flag diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 9bcecdb6a4d..3e96a64d5e6 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2004/08/05 05:21:27 dlg Exp $ +# $OpenBSD: GENERIC,v 1.11 2004/09/16 09:14:03 mickey Exp $ # # GENERIC machine description file # @@ -61,60 +61,60 @@ mainbus0 at root cpu0 at mainbus? footbridge0 at mainbus? -fcom0 at footbridge? # footbridge uart -#clock* at footbridge? # system clock via footbridge -todclock0 at todservice? # time-of-day device +fcom0 at footbridge? # footbridge uart +#clock* at footbridge? # system clock via footbridge +todclock0 at todservice? # time-of-day device -pci0 at footbridge? # PCI bus -pci* at ppb? bus ? +pci0 at footbridge? # PCI bus +pci* at ppb? option PCIVERBOSE option USBVERBOSE # PCI bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges +ppb* at pci? # PCI-PCI bridges # 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 +#puc* at pci? # PCI "universal" comm. cards # PCI serial interfaces -#com* at puc? port ? # 16x50s on "universal" comm boards -#cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards +#com* at puc? # 16x50s on "universal" comm boards +#cy* at pci? # Cyclades Cyclom-Y serial boards # PCI parallel printer interfaces -#lpt* at puc? port ? # || ports on "universal" comm boards +#lpt* at puc? # || ports on "universal" comm boards # PCI SCSI Controllers and Buses -adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI +adv* at pci? # AdvanSys 1200[A,B], ULTRA SCSI scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI +#adw* at pci? # AdvanSys 9xxUW SCSI #scsibus* at adw? -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers +ahc* at pci? # Adaptec [23]94x, aic78x0 SCSI controllers scsibus* at ahc? -#bha* at pci? dev ? function ? # BusLogic 9xx SCSI +#bha* at pci? # BusLogic 9xx SCSI #scsibus* at bha? -iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +iha* at pci? # Initio INIC-940/950 SCSI scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers +#isp* at pci? # Qlogic ISP 10x0 SCSI controllers #scsibus* at isp? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI scsibus* at pcscp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI +siop* at pci? # NCR 53c8xx SCSI scsibus* at siop? # SCSI devices -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI auto-changers -#uk* at scsibus? target ? lun ? # SCSI unknown device -#ss* at scsibus? target ? lun ? # SCSI scanner +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI auto-changers +#uk* at scsibus? # SCSI unknown device +#ss* at scsibus? # SCSI scanner # PCI IDE Controllers and Devices # PCI IDE controllers - see pciide(4) for supported hardware. # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -pciide* at pci? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 # IDE drives # Flags are used only with controllers that support DMA operations @@ -127,111 +127,111 @@ pciide* at pci? dev ? function ? flags 0x0000 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -wd* at pciide? channel ? drive ? flags 0x0000 # the drives themselves +wd* at pciide? flags 0x0000 # the drives themselves # ATAPI bus support -atapiscsi* at pciide? channel ? +atapiscsi* at pciide? scsibus* at atapiscsi? # PCI network interfaces -#en* at pci? dev ? function ? # ENI/Adaptec ATM -#ep* at pci? dev ? function ? # 3C590 ethernet cards -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B -ne* at pci? dev ? function ? # NE2000 compat ethernet -#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial -dc* at pci? dev ? function ? # DECchip 21x4x and clones -de* at pci? dev ? function ? # DECchip 21x4x and clones -vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet -#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 +#en* at pci? # ENI/Adaptec ATM +#ep* at pci? # 3C590 ethernet cards +em* at pci? # Intel Pro/1000 ethernet +fxp* at pci? # Intel EtherExpress PRO 10+/100B +ne* at pci? # NE2000 compat ethernet +#ntwoc* at pci? # Riscom/N2 PCI Sync Serial +dc* at pci? # DECchip 21x4x and clones +de* at pci? # DECchip 21x4x and clones +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet +#lmc* at pci? # Lan Media Corp SSI/HSSI/DS3 # MII/PHY support -exphy* at mii? phy ? # 3Com internal PHYs -icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -nsphyter* at mii? phy ? # NS83843 PHYs -qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs -sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs -tlphy* at mii? phy ? # ThunderLAN PHYs -tqphy* at mii? phy ? # TDK Semiconductor PHYs -ukphy* at mii? phy ? # generic unknown PHYs +exphy* at mii? # 3Com internal PHYs +icsphy* at mii? # Integrated Circuit Systems ICS189x +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +nsphyter* at mii? # NS83843 PHYs +qsphy* at mii? # Quality Semiconductor QS6612 PHYs +sqphy* at mii? # Seeq 80220/80221/80223 PHYs +tlphy* at mii? # ThunderLAN PHYs +tqphy* at mii? # TDK Semiconductor PHYs +ukphy* at mii? # generic unknown PHYs # USB Controller and Devices # PCI USB controllers -ohci* at pci? # Open Host Controller +ohci* at pci? # Open Host Controller # USB bus support usb* at ohci? # USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -cdce* at uhub? port ? # CDC Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +cdce* at uhub? # CDC Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +ugen* at uhub? # USB Generic driver # Audio Devices # PCI audio devices -#eap* at pci? dev ? function ? # Ensoniq AudioPCI -#sv* at pci? dev ? function ? # S3 SonicVibes +#eap* at pci? # Ensoniq AudioPCI +#sv* at pci? # S3 SonicVibes # Audio support #audio* at eap? #audio* at sv? vga* at pci? -wsdisplay* at vga? console ? +wsdisplay* at vga? # ISA bus bridging -pcib* at pci? dev ? function ? # PCI-ISA bridge -isa* at pcib? # ISA bus +pcib* at pci? # PCI-ISA bridge +isa* at pcib? # ISA bus # ISA Plug-and-Play bus support #isapnp0 at isa? @@ -240,7 +240,7 @@ isa* at pcib? # ISA bus pckbc0 at isa? # pc keyboard controller pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse -wskbd* at pckbd? console ? +wskbd* at pckbd? wsmouse* at pms? pcppi0 at isa? @@ -265,13 +265,13 @@ lpt1 at isa? port 0x278 irq 5 # ISA floppy #fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? # the drives themselves +#fdc1 at isa? port 0x370 +#fd* at fdc? # the drives themselves # ISA network interface #ne0 at isa? port 0x280 irq 9 #ne1 at isa? port 0x300 irq 10 -ep* at isa? port ? irq ? +ep* at isa? # The spkr driver provides a simple tone interface to the built in speaker. spkr0 at pcppi? # PC speaker @@ -293,12 +293,12 @@ midi* at pcppi? # MIDI interface to the PC speaker # Joysticks # ISA Plug-and-Play joysticks -#joy* at isapnp? # Game ports (usually on audio cards) +#joy* at isapnp? # Game ports (usually on audio cards) # ISA joysticks. Probe is a little strange; add only if you have one. #joy0 at isa? port 0x201 -hifn* at pci? dev ? function ? # Hi/fn 7751 crypto card +hifn* at pci? # Hi/fn 7751 crypto card # Pseudo-Devices pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK index 500aafc2b64..1de80ff6d11 100644 --- a/sys/arch/cats/conf/RAMDISK +++ b/sys/arch/cats/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2004/02/13 21:58:48 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.4 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.27.4.1 2002/08/01 04:18:06 lukem Exp $ # # GENERIC machine description file @@ -94,57 +94,57 @@ todclock0 at todservice? # PCI bus support # PCI bus via footbridge -pci0 at footbridge? # PCI bus +pci0 at footbridge? # PCI bus -pci* at ppb? bus ? +pci* at ppb? option PCIVERBOSE option USBVERBOSE # PCI bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges +ppb* at pci? # PCI-PCI bridges # 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 +#puc* at pci? # PCI "universal" comm. cards # PCI serial interfaces -#com* at puc? port ? # 16x50s on "universal" comm boards -#cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards +#com* at puc? # 16x50s on "universal" comm boards +#cy* at pci? # Cyclades Cyclom-Y serial boards # PCI parallel printer interfaces -#lpt* at puc? port ? # || ports on "universal" comm boards +#lpt* at puc? # || ports on "universal" comm boards # PCI SCSI Controllers and Buses -adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI +adv* at pci? # AdvanSys 1200[A,B], ULTRA SCSI scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI +#adw* at pci? # AdvanSys 9xxUW SCSI #scsibus* at adw? -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers +ahc* at pci? # Adaptec [23]94x, aic78x0 SCSI controllers scsibus* at ahc? -#bha* at pci? dev ? function ? # BusLogic 9xx SCSI +#bha* at pci? # BusLogic 9xx SCSI #scsibus* at bha? -iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +iha* at pci? # Initio INIC-940/950 SCSI scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers +#isp* at pci? # Qlogic ISP 10x0 SCSI controllers #scsibus* at isp? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI scsibus* at pcscp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI +siop* at pci? # NCR 53c8xx SCSI scsibus* at siop? # SCSI devices -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI auto-changers -#uk* at scsibus? target ? lun ? # SCSI unknown device -#ss* at scsibus? target ? lun ? # SCSI scanner +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI auto-changers +#uk* at scsibus? # SCSI unknown device +#ss* at scsibus? # SCSI scanner # PCI IDE Controllers and Devices # PCI IDE controllers - see pciide(4) for supported hardware. # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -pciide* at pci? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 # IDE drives # Flags are used only with controllers that support DMA operations @@ -157,38 +157,38 @@ pciide* at pci? dev ? function ? flags 0x0000 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -wd* at pciide? channel ? drive ? flags 0x0000 # the drives themselves +wd* at pciide? flags 0x0000 # the drives themselves # ATAPI bus support -atapiscsi* at pciide? channel ? +atapiscsi* at pciide? scsibus* at atapiscsi? # PCI network interfaces -#en* at pci? dev ? function ? # ENI/Adaptec ATM -#ep* at pci? dev ? function ? # 3C590 ethernet cards -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B -ne* at pci? dev ? function ? # NE2000 compat ethernet -#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial -dc* at pci? dev ? function ? # DECchip 21x4x and clones -de* at pci? dev ? function ? # DECchip 21x4x and clones -vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet -#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 +#en* at pci? # ENI/Adaptec ATM +#ep* at pci? # 3C590 ethernet cards +em* at pci? # Intel Pro/1000 ethernet +fxp* at pci? # Intel EtherExpress PRO 10+/100B +ne* at pci? # NE2000 compat ethernet +#ntwoc* at pci? # Riscom/N2 PCI Sync Serial +dc* at pci? # DECchip 21x4x and clones +de* at pci? # DECchip 21x4x and clones +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet +#lmc* at pci? # Lan Media Corp SSI/HSSI/DS3 # MII/PHY support -exphy* at mii? phy ? # 3Com internal PHYs -#icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x -inphy* at mii? phy ? # Intel 82555 PHYs -#iophy* at mii? phy ? # Intel 82553 PHYs -#lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -#nsphyter* at mii? phy ? # NS83843 PHYs -qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs -#tlphy* at mii? phy ? # ThunderLAN PHYs -#tqphy* at mii? phy ? # TDK Semiconductor PHYs -ukphy* at mii? phy ? # generic unknown PHYs +exphy* at mii? # 3Com internal PHYs +#icsphy* at mii? # Integrated Circuit Systems ICS189x +inphy* at mii? # Intel 82555 PHYs +#iophy* at mii? # Intel 82553 PHYs +#lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +#nsphyter* at mii? # NS83843 PHYs +qsphy* at mii? # Quality Semiconductor QS6612 PHYs +#sqphy* at mii? # Seeq 80220/80221/80223 PHYs +#tlphy* at mii? # ThunderLAN PHYs +#tqphy* at mii? # TDK Semiconductor PHYs +ukphy* at mii? # generic unknown PHYs # USB Controller and Devices @@ -200,98 +200,98 @@ usb* at ohci? # USB Hubs uhub* at usb? -uhub* at uhub? port ? configuration ? interface ? +uhub* at uhub? # USB HID device -uhidev* at uhub? port ? configuration ? interface ? +uhidev* at uhub? # USB Mice -ums* at uhidev? reportid ? +ums* at uhidev? wsmouse* at ums? # USB Keyboards -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? +ukbd* at uhidev? +wskbd* at ukbd? # USB Generic HID devices -uhid* at uhidev? reportid ? +uhid* at uhidev? # USB Printer -ulpt* at uhub? port ? configuration ? interface ? +ulpt* at uhub? # USB Modem -umodem* at uhub? port ? configuration ? +umodem* at uhub? ucom* at umodem? # USB Mass Storage -umass* at uhub? port ? configuration ? interface ? +umass* at uhub? atapiscsi* at umass? scsibus* at umass? # USB audio -uaudio* at uhub? port ? configuration ? +uaudio* at uhub? audio* at uaudio? # USB MIDI -umidi* at uhub? port ? configuration ? +umidi* at uhub? midi* at umidi? # USB Ethernet adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters -cue* at uhub? port ? # CATC USB-EL1201A based adapters -kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters +aue* at uhub? # ADMtek AN986 Pegasus based adapters +cue* at uhub? # CATC USB-EL1201A based adapters +kue* at uhub? # Kawasaki LSI KL5KUSB101B based adapters # Prolofic PL2301/PL2302 host-to-host adapter -upl* at uhub? port ? +upl* at uhub? # Serial adapters # FTDI FT8U100AX serial adapter -uftdi* at uhub? port ? -ucom* at uftdi? portno ? +uftdi* at uhub? +ucom* at uftdi? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? # Diamond Multimedia Rio 500 -urio* at uhub? port ? +urio* at uhub? # USB Handspring Visor -uvisor* at uhub? port ? +uvisor* at uhub? ucom* at uvisor? # USB scanners -uscanner* at uhub? port ? +uscanner* at uhub? # USB scanners that use SCSI emulation, e.g., HP5300 -usscanner* at uhub? port ? +usscanner* at uhub? scsibus* at usscanner? # Y@P firmware loader -uyap* at uhub? port ? +uyap* at uhub? # USB Generic driver -ugen* at uhub? port ? +ugen* at uhub? # Audio Devices # PCI audio devices -#eap* at pci? dev ? function ? # Ensoniq AudioPCI -#sv* at pci? dev ? function ? # S3 SonicVibes +#eap* at pci? # Ensoniq AudioPCI +#sv* at pci? # S3 SonicVibes # Audio support #audio* at eap? #audio* at sv? vga* at pci? -wsdisplay* at vga? console ? +wsdisplay* at vga? # ISA bus bridging -pcib* at pci? dev ? function ? # PCI-ISA bridge -isa* at pcib? # ISA bus +pcib* at pci? # PCI-ISA bridge +isa* at pcib? # ISA bus # ISA Plug-and-Play bus support #isapnp0 at isa? @@ -299,8 +299,8 @@ isa* at pcib? # ISA bus # wscons pckbc0 at isa? # pc keyboard controller pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse -wskbd* at pckbd? console ? +pms* at pckbc? # PS/2 mouse for wsmouse +wskbd* at pckbd? wsmouse* at pms? pcppi0 at isa? @@ -325,13 +325,13 @@ lpt1 at isa? port 0x278 irq 5 # ISA floppy #fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? # the drives themselves +#fdc1 at isa? port 0x370 +#fd* at fdc? # the drives themselves # ISA network interface #ne0 at isa? port 0x280 irq 9 #ne1 at isa? port 0x300 irq 10 -#ep* at isa? port ? irq ? +#ep* at isa? # The spkr driver provides a simple tone interface to the built in speaker. spkr0 at pcppi? # PC speaker @@ -363,9 +363,9 @@ midi* at pcppi? # MIDI interface to the PC speaker # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux 2 pseudo-device crypto 1 -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk +pseudo-device loop 1 # network loopback +pseudo-device bpfilter 1 # packet filter +pseudo-device rd 1 # ram disk option BOOT_CONFIG # boot-time kernel config diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS index f0c3a5c8640..3265a9993df 100644 --- a/sys/arch/hp300/conf/DISKLESS +++ b/sys/arch/hp300/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.23 2004/08/04 20:14:39 miod Exp $ +# $OpenBSD: DISKLESS,v 1.24 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -58,26 +58,26 @@ frodo0 at intio? # 8250-like serial ports found on Frodo ASIC #dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor -apci* at frodo? offset ? # tty flavor +apci* at frodo? # tty flavor # Davinci framebuffer dvbox* at intio? -dvbox* at dio? scode ? +dvbox* at dio? # Gatorbox framebuffer gbox* at intio? -gbox* at dio? scode ? +gbox* at dio? # Hyperion framebuffer -hyper* at dio? scode ? +hyper* at dio? # Renaissance framebuffer rbox* at intio? -rbox* at dio? scode ? +rbox* at dio? # Topcat/catseye framebuffers topcat* at intio? -topcat* at dio? scode ? +topcat* at dio? # Framebuffer abstraction grf* at dvbox? @@ -90,8 +90,8 @@ grf* at topcat? ite* at grf? dca0 at dio? scode 9 flags 1 # DCA serial interfaces -dca* at dio? scode ? +dca* at dio? -dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces +dcm* at dio? flags 0xe # DCM 4- or 8-port serial interfaces -le* at dio? scode ? # LANCE ethernet interfaces +le* at dio? # LANCE ethernet interfaces diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index 1fffdc7814d..3612e23443f 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.32 2004/08/25 21:00:37 miod Exp $ +# $OpenBSD: GENERIC,v 1.33 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -58,26 +58,26 @@ frodo0 at intio? # 8250-like serial ports found on Frodo ASIC #dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor -apci* at frodo? offset ? # tty flavor +apci* at frodo? # tty flavor # Davinci framebuffer dvbox* at intio? -dvbox* at dio? scode ? +dvbox* at dio? # Gatorbox framebuffer gbox* at intio? -gbox* at dio? scode ? +gbox* at dio? # Hyperion framebuffer -hyper* at dio? scode ? +hyper* at dio? # Renaissance framebuffer rbox* at intio? -rbox* at dio? scode ? +rbox* at dio? # Topcat/catseye framebuffers topcat* at intio? -topcat* at dio? scode ? +topcat* at dio? # Framebuffer abstraction grf* at dvbox? @@ -89,33 +89,33 @@ grf* at topcat? # Internal Terminal Emulator ite* at grf? -dca0 at dio? scode 9 flags 1 # DCA serial interfaces -dca* at dio? scode ? +dca0 at dio? scode 9 flags 1 # DCA serial interfaces +dca* at dio? -dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces +dcm* at dio? flags 0xe # DCM 4- or 8-port serial interfaces -le* at dio? scode ? # LANCE ethernet interfaces +le* at dio? # LANCE ethernet interfaces nhpib0 at dio? scode 7 # slow internal HP-IB -nhpib* at dio? scode ? +nhpib* at dio? -fhpib* at dio? scode ? # `fast' HP-IB +fhpib* at dio? # `fast' HP-IB hpibbus0 at nhpib0 hpibbus* at nhpib? hpibbus* at fhpib? -hd* at hpibbus? slave ? punit ? # HP-IB disks -ct* at hpibbus? slave ? punit ? # HP-IB cartridge tapes -mt* at hpibbus? slave ? punit ? # HP-IB 9-track tape +hd* at hpibbus? # HP-IB disks +ct* at hpibbus? # HP-IB cartridge tapes +mt* at hpibbus? # HP-IB 9-track tape ppi0 at hpibbus0 slave 5 punit 0 # HP-IB plotter -spc* at dio? scode ? flags 0x00 # SCSI controller +spc* at dio? flags 0x00 # SCSI controller scsibus* at spc? -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK index 57f8beb4967..fe70f074e83 100644 --- a/sys/arch/hp300/conf/RAMDISK +++ b/sys/arch/hp300/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.19 2004/08/25 21:00:37 miod Exp $ +# $OpenBSD: RAMDISK,v 1.20 2004/09/16 09:14:03 mickey Exp $ # # Ram disk kernel. # @@ -66,26 +66,26 @@ frodo0 at intio? # 8250-like serial ports found on Frodo ASIC #dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor -apci* at frodo? offset ? # tty flavor +apci* at frodo? # tty flavor # Davinci framebuffer dvbox* at intio? -dvbox* at dio? scode ? +dvbox* at dio? # Gatorbox framebuffer gbox* at intio? -gbox* at dio? scode ? +gbox* at dio? # Hyperion framebuffer -hyper* at dio? scode ? +hyper* at dio? # Renaissance framebuffer rbox* at intio? -rbox* at dio? scode ? +rbox* at dio? # Topcat/catseye framebuffers topcat* at intio? -topcat* at dio? scode ? +topcat* at dio? # Framebuffer abstraction grf* at dvbox? @@ -97,32 +97,32 @@ grf* at topcat? # Internal Terminal Emulator ite* at grf? -dca0 at dio? scode 9 flags 1 # DCA serial interfaces -dca* at dio? scode ? +dca0 at dio? scode 9 flags 1 # DCA serial interfaces +dca* at dio? -dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces +dcm* at dio? flags 0xe # DCM 4- or 8-port serial interfaces -le* at dio? scode ? # LANCE ethernet interfaces +le* at dio? # LANCE ethernet interfaces nhpib0 at dio? scode 7 # slow internal HP-IB -nhpib* at dio? scode ? +nhpib* at dio? -fhpib* at dio? scode ? # `fast' HP-IB +fhpib* at dio? # `fast' HP-IB hpibbus0 at nhpib0 hpibbus* at nhpib? hpibbus* at fhpib? -hd* at hpibbus? slave ? punit ? # HP-IB disks -ct* at hpibbus? slave ? punit ? # HP-IB cartridge tapes -mt* at hpibbus? slave ? punit ? # HP-IB 9-track tape +hd* at hpibbus? # HP-IB disks +ct* at hpibbus? # HP-IB cartridge tapes +mt* at hpibbus? # HP-IB 9-track tape -spc* at dio? scode ? flags 0x00 # SCSI controller +spc* at dio? flags 0x00 # SCSI controller scsibus* at spc? -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs pseudo-device loop 1 # network loopback pseudo-device pty 16 # pseudo-terminals diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 index 025e4098110..5ca282e4abd 100644 --- a/sys/arch/hp300/conf/files.hp300 +++ b/sys/arch/hp300/conf/files.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: files.hp300,v 1.22 2004/08/03 21:46:54 miod Exp $ +# $OpenBSD: files.hp300,v 1.23 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $ # # hp300-specific configuration info @@ -27,7 +27,7 @@ file arch/hp300/dev/intio.c intio # DIO bus # -device dio { scode = -1 } +device dio {[scode = -1]} attach dio at mainbus file arch/hp300/dev/dio.c dio @@ -36,7 +36,7 @@ file arch/hp300/dev/dio.c dio # # Apollo Utilility Chip (a.k.a. "Frodo") found on 4xx workstations -device frodo { offset = -1 } +device frodo {[offset = -1]} attach frodo at intio file arch/hp300/dev/frodo.c frodo @@ -119,7 +119,7 @@ attach fhpib at dio file arch/hp300/dev/fhpib.c fhpib # HP-IB bus layer -device hpibbus { slave = -1, punit = -1 } +device hpibbus {[slave = -1], [punit = -1]} attach hpibbus at hpibdev file arch/hp300/dev/hpib.c hpibbus diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index a6c2d424576..78465e14ed6 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.57 2004/09/15 21:32:42 mickey Exp $ +# $OpenBSD: GENERIC,v 1.58 2004/09/16 09:14:03 mickey Exp $ # Machine architecture; required by config(8) machine hppa @@ -58,11 +58,11 @@ option PCIVERBOSE #pckbc0 at dino? irq 9 com1 at dino? irq 11 -ppb* at pci? dev ? function ? +ppb* at pci? pci* at ppb? # CardBus bus support -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? option CARDBUS_DEBUG,CARDSLOT_DEBUG,CARDBUS_MAP_DEBUG cardbus* at cardslot? @@ -80,51 +80,51 @@ pcmcia* at cardslot? #usb* at ohci? # USB devices -#uhub* at usb? # USB Hubs -#uhub* at uhub? port ? configuration ? # USB Hubs -#umodem* at uhub? port ? configuration ? # USB Modems/Serial +#uhub* at usb? # USB Hubs +#uhub* at uhub? # USB Hubs +#umodem* at uhub? # USB Modems/Serial #ucom* at umodem? -#uvisor* at uhub? port ? configuration ? # Handspring Visor +#uvisor* at uhub? # Handspring Visor #ucom* at uvisor? -#uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -#ucom* at uvscom? portno ? -#ubsa* at uhub? port ? # Belkin serial adapter -#ucom* at ubsa? portno ? -#uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -#ucom* at uftdi? portno ? -#uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -#ucom* at uplcom? portno ? -#umct* at uhub? port ? # MCT USB-RS232 serial adapter -#ucom* at umct? portno ? -#uaudio* at uhub? port ? configuration ? # USB Audio +#uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +#ucom* at uvscom? +#ubsa* at uhub? # Belkin serial adapter +#ucom* at ubsa? +#uftdi* at uhub? # FTDI FT8U100AX serial adapter +#ucom* at uftdi? +#uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +#ucom* at uplcom? +#umct* at uhub? # MCT USB-RS232 serial adapter +#ucom* at umct? +#uaudio* at uhub? # USB Audio #audio* at uaudio? -#umidi* at uhub? port ? configuration ? # USB MIDI +#umidi* at uhub? # USB MIDI #midi* at umidi? -#ulpt* at uhub? port ? configuration ? # USB Printers -#umass* at uhub? port ? configuration ? # USB Mass Storage devices +#ulpt* at uhub? # USB Printers +#umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -#ums* at uhidev? reportid ? # USB mouse +#uhidev* at uhub? # Human Interface Devices +#ums* at uhidev? # USB mouse #wsmouse* at ums? mux 0 -#ukbd* at uhidev? reportid ? # USB keyboard -#wskbd* at ukbd? console ? mux 1 -#uhid* at uhidev? reportid ? # USB generic HID support -#aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -#axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -#cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -#kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -#cdce* at uhub? port ? # CDC Ethernet -#upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -#url* at uhub? port ? # Realtek RTL8150L based adapters -#wi* at uhub? port ? # WaveLAN IEEE 802.11DS -#urio* at uhub? port ? # Diamond Multimedia Rio 500 -#uscanner* at uhub? port ? # USB Scanners -#usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +#ukbd* at uhidev? # USB keyboard +#wskbd* at ukbd? mux 1 +#uhid* at uhidev? # USB generic HID support +#aue* at uhub? # ADMtek AN986 Pegasus Ethernet +#axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +#cue* at uhub? # CATC USB-EL1201A based Ethernet +#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +#cdce* at uhub? # CDC Ethernet +#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +#url* at uhub? # Realtek RTL8150L based adapters +#wi* at uhub? # WaveLAN IEEE 802.11DS +#urio* at uhub? # Diamond Multimedia Rio 500 +#uscanner* at uhub? # USB Scanners +#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#udsbr* at uhub? port ? # D-Link DSB-R100 radio -#radio* at udsbr? # USB radio -#ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +#udsbr* at uhub? # D-Link DSB-R100 radio +#radio* at udsbr? # USB radio +#ugen* at uhub? # USB Generic driver sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* @@ -152,9 +152,9 @@ option EISAVERBOSE # GSC devices hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse -hilkbd* at hil? code ? # keyboard, knob and buttons -hilms* at hil? code ? # mouse and tablets -hilid* at hil? code ? # ID module +hilkbd* at hil? # keyboard, knob and buttons +hilms* at hil? # mouse and tablets +hilid* at hil? # ID module # RS/232 serial ports com0 at gsc0 offset 0x5000 irq 5 # on lasi @@ -165,84 +165,84 @@ com1 at gsc0 offset 0x22000 irq 6 com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems com3 at gsc0 offset 0x4060 irq 13 -#com* at pcmcia? function ? # PCMCIA modems +#com* at pcmcia? # PCMCIA modems -lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 -ie0 at gsc0 irq 8 # 82C596DX/CA ether +lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 +ie0 at gsc0 irq 8 # 82C596DX/CA ether #ie1 at gsc1 irq 8 #ie* at eisa? slot ? #ie* at isa? port 0x360 iomem 0xd0000 irq 7 #ie* at isa? port 0x300 irq 10 -#ie* at pci? dev ? function ? -#tms* at gsc? irq 10 # TMS380C26 Network Controller -osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) -#osiop* at eisa? slot ? +#ie* at pci? +#tms* at gsc? irq 10 # TMS380C26 Network Controller +osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) +#osiop* at eisa? scsibus* at osiop? -oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) +oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) scsibus* at oosiop? -harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) +harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) audio* at harmony? gsckbc* at gsc? irq 26 -gsckbd* at gsckbc? # PS/2 keyboard -pms* at gsckbc? # PS/2 mouse +gsckbd* at gsckbc? # PS/2 keyboard +pms* at gsckbc? # PS/2 mouse # EISA devices -#sh* at eisa? slot ? # Interphase Seahawk 4811 EISA/FDDI -#ep* at eisa? slot ? # 3C579 ethernet -#ep* at pci? dev ? function ? # 3c59x ethernets -#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI +#ep* at eisa? # 3C579 ethernet +#ep* at pci? # 3c59x ethernets +#ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at aha? -#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? #option BHADEBUG -#bha* at eisa? slot ? -#bha* at pci? dev ? function ? +#bha* at eisa? +#bha* at pci? #scsibus* at bha? -#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) +siop* at pci? # NCR 538XX SCSI controllers(new) scsibus* at siop? -#ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +#ahd* at pci? # Adaptec 79?? SCSI controllers #scsibus* at ahd? -#em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -#dc* at cardbus? dev ? function ? -#ep* at pci? dev ? function ? # 3c59x -#ep* at cardbus? dev ? function ? -#xl* at pci? dev ? function ? # 3C9xx ethernet -#xl* at cardbus? dev ? function ? -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -#fxp* at cardbus? dev ? function ? -#ne* at pci? dev ? function ? # NE2000-compatible Ethernet -ne* at pcmcia? function ? -#an* at pci? dev ? function ? # Cisco/Aironet 802.11DS -an* at pcmcia? function ? -#wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? - -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -#exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -#iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS1890 PHYs -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -nsphyter* at mii? phy ? # NS83843 PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8022[013] PHYs -#tlphy* at mii? phy ? # ThunderLAN PHYs -#tqphy* at mii? phy ? # TDK Semiconductor PHYs -#brgphy* at mii? phy ? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -#eephy* at mii? phy ? # Marvell 88E1000 Gigabit PHYs -ukphy* at mii? phy ? # generic unknown PHYs +#em* at pci? # Intel Pro/1000 ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +#txp* at pci? # 3com 3CR990 +#fpa* at pci? # DEC DEFPA FDDI +dc* at pci? # 21143, "tulip" clone ethernet +#dc* at cardbus? +#ep* at pci? # 3c59x +#ep* at cardbus? +#xl* at pci? # 3C9xx ethernet +#xl* at cardbus? +fxp* at pci? # EtherExpress 10/100B ethernet +#fxp* at cardbus? +#ne* at pci? # NE2000-compatible Ethernet +ne* at pcmcia? +#an* at pci? # Cisco/Aironet 802.11DS +an* at pcmcia? +#wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? + +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +#exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +#iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS1890 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +nsphyter* at mii? # NS83843 PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8022[013] PHYs +#tlphy* at mii? # ThunderLAN PHYs +#tqphy* at mii? # TDK Semiconductor PHYs +#brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +#eephy* at mii? # Marvell 88E1000 Gigabit PHYs +ukphy* at mii? # generic unknown PHYs # MI devices #wsdisplay* at vgafb? @@ -252,27 +252,27 @@ wskbd* at hilkbd? mux 1 wsmouse* at pms? mux 0 wsmouse* at hilms? mux 0 -#fdc* at gsc? # PC floppy controller (WD37C65C) +#fdc* at gsc? # PC floppy controller (WD37C65C) #fdc* at isa? port 0x3f0 irq 6 drq 2 #option FD_DEBUG -#fd* at fdc? drive ? # floppy drives +#fd* at fdc? # floppy drives -#pciide* at pci ? dev ? function ? flags 0x0000 +#pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 #wdc1 at isa? port 0x170 irq 15 -wdc* at pcmcia? function ? -wd* at wdc? channel ? drive ? flags 0x0000 -#wd* at pciide? channel ? drive ? flags 0x0000 -#atapiscsi* at pciide? channel ? +wdc* at pcmcia? +wd* at wdc? flags 0x0000 +#wd* at pciide? flags 0x0000 +#atapiscsi* at pciide? #scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? pseudo-device wsmux 2 # mouse and keyboard multiplexor diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 41079f82b41..4b22d32fe5b 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.37 2004/09/15 21:32:42 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.38 2004/09/16 09:14:03 mickey Exp $ # # Diskless kernel config # @@ -72,11 +72,11 @@ option PCIVERBOSE #pckbc0 at dino? irq 9 com1 at dino? irq 11 -ppb* at pci? dev ? function ? +ppb* at pci? pci* at ppb? # CardBus bus support -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? option CARDBUS_DEBUG,CARDSLOT_DEBUG,CARDBUS_MAP_DEBUG cardbus* at cardslot? @@ -84,9 +84,9 @@ option PCMCIADEBUG,PCMCIAVERBOSE pcmcia* at cardslot? # PCI USB Controllers -#ehci* at pci? # Enhanced Host Controller -#uhci* at pci? # Universal Host Controller (Intel) -#ohci* at pci? # Open Host Controller +#ehci* at pci? # Enhanced Host Controller +#uhci* at pci? # Universal Host Controller (Intel) +#ohci* at pci? # Open Host Controller # USB bus support #usb* at ehci? @@ -94,51 +94,51 @@ pcmcia* at cardslot? #usb* at ohci? # USB devices -#uhub* at usb? # USB Hubs -#uhub* at uhub? port ? configuration ? # USB Hubs -#umodem* at uhub? port ? configuration ? # USB Modems/Serial +#uhub* at usb? # USB Hubs +#uhub* at uhub? # USB Hubs +#umodem* at uhub? # USB Modems/Serial #ucom* at umodem? -#uvisor* at uhub? port ? configuration ? # Handspring Visor +#uvisor* at uhub? # Handspring Visor #ucom* at uvisor? -#uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -#ucom* at uvscom? portno ? -#ubsa* at uhub? port ? # Belkin serial adapter -#ucom* at ubsa? portno ? -#uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -#ucom* at uftdi? portno ? -#uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -#ucom* at uplcom? portno ? -#umct* at uhub? port ? # MCT USB-RS232 serial adapter -#ucom* at umct? portno ? -#uaudio* at uhub? port ? configuration ? # USB Audio +#uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +#ucom* at uvscom? +#ubsa* at uhub? # Belkin serial adapter +#ucom* at ubsa? +#uftdi* at uhub? # FTDI FT8U100AX serial adapter +#ucom* at uftdi? +#uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +#ucom* at uplcom? +#umct* at uhub? # MCT USB-RS232 serial adapter +#ucom* at umct? +#uaudio* at uhub? # USB Audio #audio* at uaudio? -#umidi* at uhub? port ? configuration ? # USB MIDI +#umidi* at uhub? # USB MIDI #midi* at umidi? -#ulpt* at uhub? port ? configuration ? # USB Printers -#umass* at uhub? port ? configuration ? # USB Mass Storage devices +#ulpt* at uhub? # USB Printers +#umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -#ums* at uhidev? reportid ? # USB mouse +#uhidev* at uhub? # Human Interface Devices +#ums* at uhidev? # USB mouse #wsmouse* at ums? mux 0 -#ukbd* at uhidev? reportid ? # USB keyboard -#wskbd* at ukbd? console ? mux 1 -#uhid* at uhidev? reportid ? # USB generic HID support -#aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -#axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -#cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -#kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -#cdce* at uhub? port ? # CDC Ethernet -#upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -#url* at uhub? port ? # Realtek RTL8150L based adapters -#wi* at uhub? port ? # WaveLAN IEEE 802.11DS -#urio* at uhub? port ? # Diamond Multimedia Rio 500 -#uscanner* at uhub? port ? # USB Scanners -#usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +#ukbd* at uhidev? # USB keyboard +#wskbd* at ukbd? mux 1 +#uhid* at uhidev? # USB generic HID support +#aue* at uhub? # ADMtek AN986 Pegasus Ethernet +#axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +#cue* at uhub? # CATC USB-EL1201A based Ethernet +#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +#cdce* at uhub? # CDC Ethernet +#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +#url* at uhub? # Realtek RTL8150L based adapters +#wi* at uhub? # WaveLAN IEEE 802.11DS +#urio* at uhub? # Diamond Multimedia Rio 500 +#uscanner* at uhub? # USB Scanners +#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#udsbr* at uhub? port ? # D-Link DSB-R100 radio -#radio* at udsbr? # USB radio -#ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +#udsbr* at uhub? # D-Link DSB-R100 radio +#radio* at udsbr? # USB radio +#ugen* at uhub? # USB Generic driver sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* @@ -166,9 +166,9 @@ option EISAVERBOSE # GSC devices hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse -hilkbd* at hil? code ? # keyboard, knob and buttons -#hilms* at hil? code ? # mouse and tablets -#hilid* at hil? code ? # ID module +hilkbd* at hil? # keyboard, knob and buttons +#hilms* at hil? # mouse and tablets +#hilid* at hil? # ID module # RS/232 serial ports com0 at gsc0 offset 0x5000 irq 5 # on lasi @@ -179,84 +179,84 @@ com1 at gsc0 offset 0x22000 irq 6 com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems com3 at gsc0 offset 0x4060 irq 13 -#com* at pcmcia? function ? # PCMCIA modems +#com* at pcmcia? # PCMCIA modems -lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 -ie0 at gsc0 irq 8 # 82C596DX/CA ether +lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 +ie0 at gsc0 irq 8 # 82C596DX/CA ether #ie1 at gsc1 irq 8 -#ie* at eisa? slot ? +#ie* at eisa? #ie* at isa? port 0x360 iomem 0xd0000 irq 7 #ie* at isa? port 0x300 irq 10 -#ie* at pci? dev ? function ? -#tms* at gsc? irq 10 # TMS380C26 Network Controller -osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) -#osiop* at eisa? slot ? +#ie* at pci? +#tms* at gsc? irq 10 # TMS380C26 Network Controller +osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) +#osiop* at eisa? scsibus* at osiop? -oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) +oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) scsibus* at oosiop? -#harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) +#harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) #audio* at harmony? gsckbc* at gsc? irq 26 -gsckbd* at gsckbc? # PS/2 keyboard -#pms* at gsckbc? # PS/2 mouse +gsckbd* at gsckbc? # PS/2 keyboard +#pms* at gsckbc? # PS/2 mouse # EISA devices -#sh* at eisa? slot ? # Interphase Seahawk 4811 EISA/FDDI -#ep* at eisa? slot ? # 3C579 ethernet -#ep* at pci? dev ? function ? # 3c59x ethernets -#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI +#ep* at eisa? # 3C579 ethernet +#ep* at pci? # 3c59x ethernets +#ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at aha? -#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? #option BHADEBUG -#bha* at eisa? slot ? -#bha* at pci? dev ? function ? +#bha* at eisa? +#bha* at pci? #scsibus* at bha? -#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) +siop* at pci? # NCR 538XX SCSI controllers(new) scsibus* at siop? -#ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +#ahd* at pci? # Adaptec 79?? SCSI controllers #scsibus* at ahd? -#em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -#dc* at cardbus? dev ? function ? -#ep* at pci? dev ? function ? # 3c59x -#ep* at cardbus? dev ? function ? -#xl* at pci? dev ? function ? # 3C9xx ethernet -#xl* at cardbus? dev ? function ? -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -#fxp* at cardbus? dev ? function ? -#ne* at pci? dev ? function ? # NE2000-compatible Ethernet -ne* at pcmcia? function ? -#an* at pci? dev ? function ? # Cisco/Aironet 802.11DS -an* at pcmcia? function ? -#wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? - -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -#exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -#iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS1890 PHYs -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -nsphyter* at mii? phy ? # NS83843 PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8022[013] PHYs -#tlphy* at mii? phy ? # ThunderLAN PHYs -#tqphy* at mii? phy ? # TDK Semiconductor PHYs -#brgphy* at mii? phy ? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -#eephy* at mii? phy ? # Marvell 88E1000 Gigabit PHYs -ukphy* at mii? phy ? # generic unknown PHYs +#em* at pci? # Intel Pro/1000 ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +#txp* at pci? # 3com 3CR990 +#fpa* at pci? # DEC DEFPA FDDI +dc* at pci? # 21143, "tulip" clone ethernet +#dc* at cardbus? +#ep* at pci? # 3c59x +#ep* at cardbus? +#xl* at pci? # 3C9xx ethernet +#xl* at cardbus? +fxp* at pci? # EtherExpress 10/100B ethernet +#fxp* at cardbus? +#ne* at pci? # NE2000-compatible Ethernet +ne* at pcmcia? +#an* at pci? # Cisco/Aironet 802.11DS +an* at pcmcia? +#wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? + +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +#exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +#iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS1890 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +nsphyter* at mii? # NS83843 PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8022[013] PHYs +#tlphy* at mii? # ThunderLAN PHYs +#tqphy* at mii? # TDK Semiconductor PHYs +#brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +#eephy* at mii? # Marvell 88E1000 Gigabit PHYs +ukphy* at mii? # generic unknown PHYs # MI devices #wsdisplay* at vgafb? @@ -266,28 +266,28 @@ wskbd* at hilkbd? # mux 1 #wsmouse* at pms? mux 0 #wsmouse* at hilms? mux 0 -#fdc* at gsc? # PC floppy controller (WD37C65C) +#fdc* at gsc? # PC floppy controller (WD37C65C) #fdc* at isa? port 0x3f0 irq 6 drq 2 #option FD_DEBUG -#fd* at fdc? drive ? # floppy drives +#fd* at fdc? # floppy drives -#pciide* at pci ? dev ? function ? flags 0x0000 +#pciide* at pci? flags 0x0000 #wdc0 at isa? port 0x1f0 irq 14 #wdc1 at isa? port 0x170 irq 15 -#wdc* at pcmcia? fucntion ? -#wd* at wdc? channel ? drive ? flags 0x0000 -#wd* at pciide? channel ? drive ? flags 0x0000 -#atapiscsi* at pciide? channel ? +#wdc* at pcmcia? +#wd* at wdc? flags 0x0000 +#wd* at pciide? flags 0x0000 +#atapiscsi* at pciide? #scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? pseudo-device rd 1 # ramdisk pseudo-device loop 1 # network loopback diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 17c337cd891..e6ea63037de 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.52 2004/06/26 21:01:09 miod Exp $ +# $OpenBSD: DISKLESS,v 1.53 2004/09/16 09:14:03 mickey Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -102,26 +102,26 @@ config bsd root on nfs swap on nfs mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose isa0 at mainbus0 isa0 at pcib? eisa0 at mainbus0 -pci* at mainbus0 bus ? +pci* at mainbus0 option PCIVERBOSE #option EISAVERBOSE #option PCMCIAVERBOSE option USBVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridges (do nothing) +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridges (do nothing) # ISA PCMCIA controllers pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 @@ -130,17 +130,17 @@ pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000 #tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000 # PCI PCMCIA controllers -pcic* at pci? dev? function ? +pcic* at pci? pcic* at isapnp? # PCMCIA bus support -pcmcia* at pcic? controller ? socket ? -#pcmcia* at tcic? controller ? socket ? +pcmcia* at pcic? +#pcmcia* at tcic? # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? # PCI USB Controllers @@ -151,36 +151,36 @@ ohci* at pci? # Open Host Controller usb* at uhci? usb* at ohci? -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uftdi* at uhub? port ? -ucom* at uftdi? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +uftdi* at uhub? +ucom* at uftdi? +uaudio* at uhub? # USB Audio +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? -ums* at uhidev? reportid ? +uhidev* at uhub? +ums* at uhidev? wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +uhid* at uhidev? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +ugen* at uhub? # USB Generic driver -puc* at pci? # PCI "universal" communication device +puc* at pci? # PCI "universal" communication device npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? @@ -191,16 +191,16 @@ option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes option WSDISPLAY_DEFAULTSCREENS=6 option WSDISPLAY_COMPAT_PCVT # emulate some ioctls -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse -pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +pms* at pckbc? # PS/2 mouse for wsmouse +pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? -vga* at pci? dev ? function ? -pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? -wskbd* at pckbd? console ? +vga* at pci? +pcdisplay0 at isa? # CGA, MDA, EGA, HGA +wsdisplay* at vga? +wsdisplay* at pcdisplay? +wskbd* at pckbd? wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 @@ -213,16 +213,16 @@ pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards) ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial card #ast1 at isa? port 0x2a0 irq 6 # 2nd AST 4-port serial card -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? +#pccom* at rtfps? #hsq0 at isa? port 0x140 irq 10 # Hostess 4-port serial card -#pccom* at hsq? slave ? -pccom* at pcmcia? function ? # PCMCIA modems/serial ports +#pccom* at hsq? +pccom* at pcmcia? # PCMCIA modems/serial ports pccom* at isapnp? -#pccom* at puc? port ? +#pccom* at puc? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -233,7 +233,7 @@ cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom serial card lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt1 at isa? port 0x278 lpt2 at isa? port 0x3bc -#lpt* at puc? port ? +#lpt* at puc? lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 @@ -243,93 +243,93 @@ mms1 at isa? port 0x238 irq 5 wsmouse* at lms? mux 0 wsmouse* at mms? mux 0 -#aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +#aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? -#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers #aha* at isapnp? #scsibus* at aha? -#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -#ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers +#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +#ahc* at pci? # Adaptec 2940 SCSI controllers #scsibus* at ahc? -#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI -#dpt* at eisa? slot ? # DPT SmartCache/SmartRAID EISA +#dpt* at pci? # DPT SmartCache/SmartRAID PCI +#dpt* at eisa? # DPT SmartCache/SmartRAID EISA #scsibus* at dpt? -#gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +#gdt* at pci? # ICP Vortex GDT RAID controllers #scsibus* at gdt? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +#twe* at pci? # 3ware Escalade RAID controllers #scsibus* at twe? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -#aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +#aic* at pcmcia? # PCMCIA based aic SCSI controllers #scsibus* at aic? -#esp* at pcmcia? function ? # PCMCIA based NCR 53C9X SCSI +#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI #scsibus* at esp? -#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable port ? irq ? -#bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable +#bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat #scsibus* at bha? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? #sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers #scsibus* at sea? -#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha* at eisa? slot ? # UltraStor 24f SCSI controllers +#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers +#uha* at eisa? # UltraStor 24f SCSI controllers #scsibus* at uha? #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 #scsibus* at wds? -#cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers -#cac* at eisa? slot ? +#cac* at pci? # Compaq Smart ARRAY RAID controllers +#cac* at eisa? #scsibus* at cac? -#iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +#iha* at pci? # Initio Ultra/UltraWide SCSI controllers #scsibus* at iha? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? -#ami* at pci? dev ? function ? # AMI MegaRAID controllers +#ami* at pci? # AMI MegaRAID controllers #scsibus* at ami? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -ch* at scsibus? target ? lun ? # SCSI autochangers -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +ch* at scsibus? # SCSI autochangers +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI fdc0 at isa? disable port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -fdc1 at isa? disable port 0x370 irq ? drq ? -fd* at fdc? drive ? +fdc1 at isa? disable port 0x370 +fd* at fdc? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? disable dev ? function ? flags 0x0000 +pciide* at pci? disable flags 0x0000 wdc0 at isa? disable port 0x1f0 irq 14 flags 0x00 wdc1 at isa? disable port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? disable function ? +wdc* at pcmcia? disable wdc* at isapnp? disable # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? #wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives @@ -340,106 +340,106 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10 # #we2 at isa? port 0x280 iomem 0xd0000 irq 3 # WD/SMC 80x3 ethernet we* at isapnp? ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet -eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet -el0 at isa? port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet -ep* at isapnp? # 3C509 PnP ethernet -ep* at isa? port ? irq ? # 3C509 ethernet -ef* at isapnp? # 3C515 PnP ethernet +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet +eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet +el0 at isa? port 0x300 irq 9 # 3C501 ethernet +ep0 at isa? # 3C509 ethernet +ep* at isapnp? # 3C509 PnP ethernet +ep* at isa? # 3C509 ethernet +ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring -#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring -#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring -ep0 at eisa? slot ? -ep* at eisa? slot ? # 3C579 ethernet -fea* at eisa? slot ? # DEC DEFEA FDDI -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI -le* at pci? dev ? function ? # PCnet-PCI based ethernet +#ie1 at isa? port 0x300 irq 10 # EtherExpress +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +#tr0 at isa? port 0xa20 iomem 0xd8000 # IBM TROPIC based Token-Ring +#tr1 at isa? port 0xa24 iomem 0xd0000 # IBM TROPIC based Token-Ring +#tr* at isa? # 3COM TROPIC based Token-Ring +ep0 at eisa? +ep* at eisa? # 3C579 ethernet +fea* at eisa? # DEC DEFEA FDDI +lmc* at pci? # Lan Media Corp SSI/T3/HSSI +le* at pci? # PCnet-PCI based ethernet le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet -ep0 at pci? dev ? function ? # 3C59x ethernet -ep* at pci? dev ? function ? # 3C59x ethernet -ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -sm* at pcmcia? function ? # PCMCIA based sm ethernet -xe* at pcmcia? function ? # Xircom ethernet -fpa* at pci? dev ? function ? # DEC DEFPA FDDI -xl* at pci? dev ? function ? # 3C9xx ethernet -xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -ste* at pci? dev ? function ? # Sundance ST201 ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +ne* at pci? # NE2000-compat ethernet +ep0 at pci? # 3C59x ethernet +ep* at pci? # 3C59x ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +sm* at pcmcia? # PCMCIA based sm ethernet +xe* at pcmcia? # Xircom ethernet +fpa* at pci? # DEC DEFPA FDDI +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575/3C656 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +tx* at pci? # SMC 83C170 EPIC ethernet +tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +sis* at pci? # SiS 900/7016 ethernet +ste* at pci? # Sundance ST201 ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above # Wireless network cards -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pci? dev ? function ? # Aironet IEEE 802.11DS -an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pci? # Aironet IEEE 802.11DS +an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -eephy* at mii? phy ? # Marvell PHYs for Intel GigE -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -#mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -ukphy* at mii? phy ? # "unknown" PHYs - -pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System -sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver - -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 -eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive -sv* at pci? dev ? function ? # S3 SonicVibes (S3 617) -neo* at pci? dev ? function ? # NeoMagic 256AV/ZX -cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 -auich* at pci? dev ? function ? # i82801 ICH AC'97 audio -clcs* at pci? dev ? function ? # CS4280 CrystalClear audio -clct* at pci? dev ? function ? # CS4281 CrystalClear audio -fms* at pci? dev ? function ? # Forte Media FM801 -auvia* at pci? dev ? function ? # VIA VT82C686A -yds* at pci? dev ? function ? # Yamaha YMF Audio -maestro* at pci? dev ? function ? # ESS Maestro PCI -sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell PHYs for Intel GigE +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +#mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +ukphy* at mii? # "unknown" PHYs + +pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System +sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver + +eap* at pci? # Ensoniq AudioPCI S5016 +eso* at pci? # ESS Solo-1 PCI AudioDrive +sv* at pci? # S3 SonicVibes (S3 617) +neo* at pci? # NeoMagic 256AV/ZX +cmpci* at pci? # C-Media CMI8338/8738 +auich* at pci? # i82801 ICH AC'97 audio +clcs* at pci? # CS4280 CrystalClear audio +clct* at pci? # CS4281 CrystalClear audio +fms* at pci? # Forte Media FM801 +auvia* at pci? # VIA VT82C686A +yds* at pci? # Yamaha YMF Audio +maestro* at pci? # ESS Maestro PCI +sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster sb* at isapnp? -ess* at isapnp? # ESS Tech ES188[78], ES888 -wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System +ess* at isapnp? # ESS Tech ES188[78], ES888 +wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System wss* at isapnp? -pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum +pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis UltraSound (drq2 is record drq) ym* at isapnp? mpu* at isapnp? @@ -483,18 +483,18 @@ audio* at uaudio? audio* at maestro? audio* at yds? -bktr0 at pci? dev ? function ? +bktr0 at pci? # Joystick driver. Probe is a little strange; add only if you have one. #joy0 at isa? port 0x201 joy* at isapnp? -#wdt0 at pci? dev ? function ? # Ind Computer Source PCI-WDT50x driver +#wdt0 at pci? # Ind Computer Source PCI-WDT50x driver # crypto support -hifn* at pci? dev ? function ? # Hi/fn 7751 crypto card -ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card -#ises* at pci? dev ? function ? # Pijnenburg PCC-ISES +hifn* at pci? # Hi/fn 7751 crypto card +ubsec* at pci? # Bluesteel Networks 5xxx crypto card +#ises* at pci? # Pijnenburg PCC-ISES pseudo-device loop 2 # network loopback pseudo-device bpfilter 8 # packet filter diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 82901fcdbd3..e6a768be32c 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.376 2004/07/20 20:30:09 dhartmei Exp $ +# $OpenBSD: GENERIC,v 1.377 2004/09/16 09:14:03 mickey Exp $ # # GENERIC -- everything that's currently supported # @@ -39,8 +39,8 @@ config bsd swap generic mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose @@ -49,26 +49,26 @@ isa0 at pcib? isa0 at ichpcib? isa0 at gscpcib? eisa0 at mainbus0 -pci* at mainbus0 bus ? +pci* at mainbus0 option PCIVERBOSE option EISAVERBOSE option USBVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridge -ichpcib* at pci? dev ? function ? # Intel ICHx/ICHx-M LPC bridges -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges +gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge gpio* at gscpcib? # power management and other environmental stuff -#amdpm* at pci? dev ? function ? # AMD768MPX -elansc* at pci? dev ? function ? # AMD Elan SC520 System Controller +#amdpm* at pci? # AMD768MPX +elansc* at pci? # AMD Elan SC520 System Controller gpio* at elansc? -geodesc* at pci? dev ? function ? # Geode SC1100/SCx200 IAOC +geodesc* at pci? # Geode SC1100/SCx200 IAOC # National Semiconductor LM7[89] and compatible hardware monitors lm0 at isa? port 0x290 @@ -83,7 +83,7 @@ lmtemp0 at iic1 addr 0x48 # NS LM75/LM77 temperature sensor it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware # monitors -viaenv* at pci? dev ? function ? # VIA VT82C686A hardware monitor +viaenv* at pci? # VIA VT82C686A hardware monitor # ISA PCMCIA controllers #option PCMCIAVERBOSE @@ -97,16 +97,16 @@ tcic0 at isa? disable port 0x240 iomem 0xd0000 iosiz 0x10000 pcic* at isapnp? # PCI PCMCIA controllers -pcic* at pci? dev? function ? +pcic* at pci? # PCMCIA bus support -pcmcia* at pcic? controller ? socket ? -pcmcia* at tcic? controller ? socket ? +pcmcia* at pcic? +pcmcia* at tcic? # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? # PCI USB Controllers @@ -120,59 +120,59 @@ usb* at uhci? usb* at ohci? # USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +ugen* at uhub? # USB Generic driver # FireWire Controllers -#fwohci* at pci? dev ? function ? # PCI FireWire adapter -#fwohci* at cardbus? dev ? function ? # CardBus FireWire adapter +#fwohci* at pci? # PCI FireWire adapter +#fwohci* at cardbus? # CardBus FireWire adapter -#fwnode* at fwbus? idhi ? idlo ? +#fwnode* at fwbus? -#fwscsi* at fwnode? # SCSI over FireWire +#fwscsi* at fwnode? # SCSI over FireWire #scsibus* at fwscsi? #option FWOHCI_DEBUG @@ -181,7 +181,7 @@ ugen* at uhub? port ? configuration ? # USB Generic driver #option SBP2_DEBUG #option FWSCSI_DEBUG -puc* at pci? # PCI "universal" communication device +puc* at pci? # PCI "universal" communication device npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? @@ -192,17 +192,17 @@ option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes option WSDISPLAY_DEFAULTSCREENS=6 option WSDISPLAY_COMPAT_PCVT # emulate some ioctls -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse -pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +pms* at pckbc? # PS/2 mouse for wsmouse +pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? option PCIAGP -vga* at pci? dev ? function ? -pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? -wskbd* at pckbd? console ? +vga* at pci? +pcdisplay0 at isa? # CGA, MDA, EGA, HGA +wsdisplay* at vga? +wsdisplay* at pcdisplay? +wskbd* at pckbd? wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 @@ -215,30 +215,30 @@ pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards) ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial card #ast1 at isa? port 0x2a0 irq 6 # 2nd AST 4-port serial card -pccom* at ast? slave ? +pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort -#pccom* at addcom? slave ? +#pccom* at addcom? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? +#pccom* at rtfps? #hsq0 at isa? port 0x140 irq 10 # Hostess 4-port serial card -#pccom* at hsq? slave ? -pccom* at pcmcia? function ? # PCMCIA modems/serial ports +#pccom* at hsq? +pccom* at pcmcia? # PCMCIA modems/serial ports pccom* at isapnp? -pccom* at puc? port ? +pccom* at puc? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines # options CY_HW_RTS cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom serial card cy* at pci? # PCI cyclom serial card -#cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards +#cz* at pci? # Cyclades-Z multi-port serial boards lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt1 at isa? port 0x278 lpt2 at isa? port 0x3bc -lpt* at puc? port ? +lpt* at puc? lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 @@ -248,100 +248,100 @@ mms1 at isa? port 0x238 irq 5 wsmouse* at lms? mux 0 wsmouse* at mms? mux 0 -bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha2 at isa? disable port ? irq ? -bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +bha2 at isa? disable +bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat scsibus* at bha? -aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers aha* at isapnp? scsibus* at aha? -ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940/3940/78?? SCSI controllers +ahc0 at isa? # Adaptec 284x SCSI controllers +ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers scsibus* at ahc? -ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI -dpt* at eisa? slot ? # DPT SmartCache/SmartRAID EISA +dpt* at pci? # DPT SmartCache/SmartRAID PCI +dpt* at eisa? # DPT SmartCache/SmartRAID EISA scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? -twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +twe* at pci? # 3ware Escalade RAID controllers scsibus* at twe? -aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +aac* at pci? # Adaptec FSA RAID controllers scsibus* at aac? -ami* at pci? dev ? function ? # AMI MegaRAID controllers +ami* at pci? # AMI MegaRAID controllers scsibus* at ami? -cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers -cac* at eisa? slot ? +cac* at pci? # Compaq Smart ARRAY RAID controllers +cac* at eisa? scsibus* at cac? -iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +iha* at pci? # Initio Ultra/UltraWide SCSI controllers scsibus* at iha? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel scsibus* at isp? -aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers -aic* at isapnp? # isapnp configured aic SCSI controllers +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers +aic* at pcmcia? # PCMCIA based aic SCSI controllers +aic* at isapnp? # isapnp configured aic SCSI controllers scsibus* at aic? -#esp* at pcmcia? function ? # PCMCIA based NCR 53C9X SCSI +#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI #scsibus* at esp? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +siop* at pci? # NCR 538XX SCSI controllers(new) scsibus* at siop? -adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI scsibus* at adv? -adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI scsibus* at adw? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI scsibus* at pcscp? -sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers +sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers scsibus* at sea? -trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +trm* at pci? # Tekram DC-3x5U SCSI Controllers scsibus* at trm? -uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha1 at isa? disable port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha* at eisa? slot ? # UltraStor 24f SCSI controllers +uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers +uha* at eisa? # UltraStor 24f SCSI controllers scsibus* at uha? wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 scsibus* at wds? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -ch* at scsibus? target ? lun ? # SCSI autochangers -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +ch* at scsibus? # SCSI autochangers +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -fd* at fdc? drive ? flags 0x00 +#fdc1 at isa? port 0x370 +fd* at fdc? flags 0x00 #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? function ? +wdc* at pcmcia? wdc* at isapnp? # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? #wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives @@ -358,129 +358,129 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet +ep0 at isa? # 3C509 ethernet ep* at isapnp? # 3C509 PnP ethernet -ep* at isa? port ? irq ? # 3C509 ethernet +ep* at isa? # 3C509 ethernet ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #ie1 at isa? port 0x300 irq 10 # EtherExpress -lc0 at isa? port 0x200 irq ? # DEC EtherWorks -lc1 at isa? port 0x280 irq ? # DEC EtherWorks +lc0 at isa? port 0x200 # DEC EtherWorks +lc1 at isa? port 0x280 # DEC EtherWorks le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring -#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring -#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring -ep0 at eisa? slot ? -ep* at eisa? slot ? # 3C579 ethernet -fea* at eisa? slot ? # DEC DEFEA FDDI -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI -san* at pci? dev ? function ? # Sangoma PCI AFT card -le* at pci? dev ? function ? # PCnet-PCI based ethernet +#tr0 at isa? port 0xa20 iomem 0xd8000 # IBM TROPIC based Token-Ring +#tr1 at isa? port 0xa24 iomem 0xd0000 # IBM TROPIC based Token-Ring +#tr* at isa? # 3COM TROPIC based Token-Ring +ep0 at eisa? +ep* at eisa? # 3C579 ethernet +fea* at eisa? # DEC DEFEA FDDI +lmc* at pci? # Lan Media Corp SSI/T3/HSSI +san* at pci? # Sangoma PCI AFT card +le* at pci? # PCnet-PCI based ethernet le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet -ep0 at pci? dev ? function ? # 3C59x ethernet -ep* at pci? dev ? function ? # 3C59x ethernet -ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -sm* at pcmcia? function ? # PCMCIA based sm ethernet -xe* at pcmcia? function ? # Xircom ethernet -fpa* at pci? dev ? function ? # DEC DEFPA FDDI -xl* at pci? dev ? function ? # 3C9xx ethernet -xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -mtd* at pci? dev ? function ? # Myson MTD800/803/891 -tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -ste* at pci? dev ? function ? # Sundance ST201 ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -txp* at pci? dev ? function ? # 3com 3CR990 -nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -stge* at pci? dev ? function ? # Sundance TC9021 GigE -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -hme* at pci? dev ? function ? # Sun Happy Meal -bce* at pci? dev ? function ? # Broadcom BCM4401 +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +ne* at pci? # NE2000-compat ethernet +ep0 at pci? # 3C59x ethernet +ep* at pci? # 3C59x ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +sm* at pcmcia? # PCMCIA based sm ethernet +xe* at pcmcia? # Xircom ethernet +fpa* at pci? # DEC DEFPA FDDI +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575/3C656 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +rl* at cardbus? # RealTek 81[23]9 ethernet +mtd* at pci? # Myson MTD800/803/891 +tx* at pci? # SMC 83C170 EPIC ethernet +tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +sis* at pci? # SiS 900/7016 ethernet +ste* at pci? # Sundance ST201 ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +txp* at pci? # 3com 3CR990 +nge* at pci? # NS DP83820/DP83821 GigE +bge* at pci? # Broadcom BCM570x (aka Tigon3) +re* at pci? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +#lge* at pci? # Level1 LXT1001 GigE +hme* at pci? # Sun Happy Meal +bce* at pci? # Broadcom BCM4401 # Wireless network cards -atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -atw* at cardbus? dev ? function ? # ADMtek ADM8211 (802.11) -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -an* at pci? dev ? function ? # Aironet IEEE 802.11DS -an* at isapnp? # Aironet IEEE 802.11DS -an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +atw* at pci? # ADMtek ADM8211 (802.11) +atw* at cardbus? # ADMtek ADM8211 (802.11) +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +an* at pci? # Aironet IEEE 802.11DS +an* at isapnp? # Aironet IEEE 802.11DS +an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -nsgphy* at mii? phy ? # NS gigabit PHYs -urlphy* at mii? phy ? # Realtek RTL8150L internal PHY -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs - -pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System -sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver - -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 -eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive -sv* at pci? dev ? function ? # S3 SonicVibes (S3 617) -neo* at pci? dev ? function ? # NeoMagic 256AV/ZX -cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 -auich* at pci? dev ? function ? flags 0x0000 # i82801 ICH AC'97 audio -autri* at pci? dev ? function ? flags 0x0000 # Trident 4D WAVE -auvia* at pci? dev ? function ? # VIA VT82C686A -clcs* at pci? dev ? function ? # CS4280 CrystalClear audio -clct* at pci? dev ? function ? # CS4281 CrystalClear audio -fms* at pci? dev ? function ? # Forte Media FM801 -maestro* at pci? dev ? function ? # ESS Maestro PCI -esa* at pci? dev ? function ? # ESS Maestro3 PCI -yds* at pci? dev ? function ? flags 0x0000 # Yamaha YMF Audio -emu* at pci? dev ? function ? # SB Live! -sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs + +pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System +sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver + +eap* at pci? # Ensoniq AudioPCI S5016 +eso* at pci? # ESS Solo-1 PCI AudioDrive +sv* at pci? # S3 SonicVibes (S3 617) +neo* at pci? # NeoMagic 256AV/ZX +cmpci* at pci? # C-Media CMI8338/8738 +auich* at pci? flags 0x0000 # i82801 ICH AC'97 audio +autri* at pci? flags 0x0000 # Trident 4D WAVE +auvia* at pci? # VIA VT82C686A +clcs* at pci? # CS4280 CrystalClear audio +clct* at pci? # CS4281 CrystalClear audio +fms* at pci? # Forte Media FM801 +maestro* at pci? # ESS Maestro PCI +esa* at pci? # ESS Maestro3 PCI +yds* at pci? flags 0x0000 # Yamaha YMF Audio +emu* at pci? # SB Live! +sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster sb* at isapnp? -ess* at isapnp? # ESS Tech ES188[78], ES888 -wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System +ess* at isapnp? # ESS Tech ES188[78], ES888 +wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System wss* at isapnp? -pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum +pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis (drq2 is record drq) ym* at isapnp? mpu* at isapnp? -mpu* at isa? port 0x300 # generic MPU, Yamaha SW60XG +mpu* at isa? port 0x300 # generic MPU, Yamaha SW60XG #aria0 at isa? port 0x280 irq 10 drq 0 flags 0x1 # Prometheus Aria 16 # OPL[23] FM synthesizers @@ -525,10 +525,10 @@ audio* at esa? audio* at yds? audio* at emu? -bktr0 at pci? dev ? function ? +bktr0 at pci? # FM-Radio devices -#gtp* at pci? dev ? function ? # Gemtek/Guillemot Radio PCI Radio Card +#gtp* at pci? # Gemtek/Guillemot Radio PCI Radio Card #sfr0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR FM Radio Card #sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card #az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card @@ -550,19 +550,19 @@ radio* at fms? #joy0 at isa? port 0x201 joy* at isapnp? -#wdt0 at pci? dev ? function ? # Ind Computer Source PCI-WDT50x driver +#wdt0 at pci? # Ind Computer Source PCI-WDT50x driver # crypto support -hifn* at pci? dev ? function ? # Hi/fn 7751 crypto card -lofn* at pci? dev ? function ? # Hi/fn 6500 crypto card -nofn* at pci? dev ? function ? # Hi/fn 7814/7851/7854 crypto card -ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card -safe* at pci? dev ? function ? # SafeNet SafeXcel 1141/1741 -#ises* at pci? dev ? function ? # Pijnenburg PCC-ISES +hifn* at pci? # Hi/fn 7751 crypto card +lofn* at pci? # Hi/fn 6500 crypto card +nofn* at pci? # Hi/fn 7814/7851/7854 crypto card +ubsec* at pci? # Bluesteel Networks 5xxx crypto card +safe* at pci? # SafeNet SafeXcel 1141/1741 +#ises* at pci? # Pijnenburg PCC-ISES # I2O -iop* at pci? dev ? function ? # I2O -ioprbs* at iop? tid ? # Random block storage +iop* at pci? # I2O +ioprbs* at iop? # Random block storage scsibus* at ioprbs? pseudo-device pctr 1 diff --git a/sys/arch/i386/conf/GENERIC.MP b/sys/arch/i386/conf/GENERIC.MP index 4bebe33f96d..f280a7512cd 100644 --- a/sys/arch/i386/conf/GENERIC.MP +++ b/sys/arch/i386/conf/GENERIC.MP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC.MP,v 1.2 2004/06/13 21:49:15 niklas Exp $ +# $OpenBSD: GENERIC.MP,v 1.3 2004/09/16 09:14:03 mickey Exp $ # # GENERIC.MP - sample multiprocessor kernel # @@ -8,5 +8,5 @@ include "arch/i386/conf/GENERIC" option MULTIPROCESSOR # Multiple processor support option CPU -cpu* at mainbus? apid ? -ioapic* at mainbus? apid ? +cpu* at mainbus? +ioapic* at mainbus? diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 69b7b4134fb..bf121190d2b 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.131 2004/06/23 01:36:58 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.132 2004/09/16 09:14:03 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -42,8 +42,8 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 @@ -58,13 +58,13 @@ pci* at mainbus0 option PCIVERBOSE #option EISAVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridge -ichpcib* at pci? dev ? function ? # Intel ICHx/ICHx-M LPC bridges -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges +gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge # ISA PCMCIA controllers pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 @@ -72,10 +72,10 @@ pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 # PCI PCMCIA controllers -pcic* at pci? dev? function ? +pcic* at pci? # PCMCIA bus support -pcmcia* at pcic? controller ? socket ? +pcmcia* at pcic? npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? @@ -83,24 +83,24 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? +wskbd* at pckbd? vga0 at isa? -vga* at pci? dev ? function ? +vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? +wsdisplay* at vga? +wsdisplay* at pcdisplay? pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports pccom1 at isa? port 0x2f8 irq 3 pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -#pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +#pccom* at pcmcia? # PCMCIA modem cards pccom* at isapnp? # option for using CD1400 handshaking for incoming data @@ -114,160 +114,160 @@ pccom* at isapnp? #lpt2 at isa? port 0x3bc -bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha2 at isa? disable port ? irq ? -bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +bha2 at isa? disable +bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat scsibus* at bha? -aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers aha* at isapnp? scsibus* at aha? -ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc0 at isa? # Adaptec 284x SCSI controllers +ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -#ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +#ahd* at pci? # Adaptec 79?? SCSI controllers #scsibus* at ahd? -#twe* at pcu? dev ? function ? # 3ware Escalade RAID controllers +#twe* at pcu? # 3ware Escalade RAID controllers #scsibus* at twe? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers +#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers #aic* at isapnp? -#aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +#aic* at pcmcia? # PCMCIA based aic SCSI controllers #scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +siop* at pci? # NCR 538XX SCSI controllers(new) scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers +#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers #scsibus* at sea? -#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha* at eisa? slot ? # UltraStor 24f SCSI controllers +#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers +#uha* at eisa? # UltraStor 24f SCSI controllers #scsibus* at uha? #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 #scsibus* at wds? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +fd* at fdc? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? function ? +wdc* at pcmcia? wdc* at isapnp? # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes +#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series we1 at isa? port 0x300 iomem 0xcc000 irq 10 # we* at isapnp? ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet card -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet cards -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards -ep0 at isa? port ? irq ? # 3C509 ethernet cards -ep* at isa? port ? irq ? # 3C509 ethernet cards -ef* at isapnp? # 3C515 PnP ethernet +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet cards +#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards +#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards +ep0 at isa? # 3C509 ethernet cards +ep* at isa? # 3C509 ethernet cards +ef* at isapnp? # 3C515 PnP ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -ep0 at eisa? slot ? -ep* at eisa? slot ? # 3C579 ethernet cards -#fea* at eisa? slot ? # DEC DEFEA FDDI cards -le* at pci? dev ? function ? # PCnet-PCI based ethernet cards -ep* at isapnp? # 3C509 PnP ethernet cards +#ie1 at isa? port 0x300 irq 10 # EtherExpress +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +ep0 at eisa? +ep* at eisa? # 3C579 ethernet cards +#fea* at eisa? # DEC DEFEA FDDI cards +le* at pci? # PCnet-PCI based ethernet cards +ep* at isapnp? # 3C509 PnP ethernet cards le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet cards -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -ep0 at pci? dev ? function ? # 3C59x ethernet cards -ep* at pci? dev ? function ? # 3C59x ethernet cards -ne* at pci? dev ? function ? # NE2000-compat ethernet cards -ne* at pcmcia? function ? # PCMCIA based NE2000 cards -ep* at pcmcia? function ? # PCMCIA based 3c5xx cards -#sm* at pcmcia? function ? # PCMCIA based sm cards -#xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -xl* at pci? dev ? function ? # 3C9xx ethernet cards -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet cards -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet cards -vr* at pci? dev ? function ? # VIA Rhine ethernet -#wb* at pci? dev ? function ? # Winbond W89C840F ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -#dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -#ste* at pci? dev ? function ? # Sundance ST201 ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -#skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -#sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -#bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -#stge* at pci? dev ? function ? # Sundance TC9021 GigE -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#hme* at pci? dev ? function ? # Sun Happy Meal +de* at pci? # DC21X4X-based ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet cards +ep0 at pci? # 3C59x ethernet cards +ep* at pci? # 3C59x ethernet cards +ne* at pci? # NE2000-compat ethernet cards +ne* at pcmcia? # PCMCIA based NE2000 cards +ep* at pcmcia? # PCMCIA based 3c5xx cards +#sm* at pcmcia? # PCMCIA based sm cards +#xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI cards +xl* at pci? # 3C9xx ethernet cards +rl* at pci? # RealTek 81[23]9 ethernet +tx* at pci? # SMC 83C170 EPIC ethernet cards +tl* at pci? # Compaq Thunderlan ethernet cards +vr* at pci? # VIA Rhine ethernet +#wb* at pci? # Winbond W89C840F ethernet +dc* at pci? # 21143, "tulip" clone ethernet +#dc* at cardbus? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +#ste* at pci? # Sundance ST201 ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +#skc* at pci? # SysKonnect GEnesis 984x +#sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +#txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +#bge* at pci? # Broadcom BCM570x (aka Tigon3) +#stge* at pci? # Sundance TC9021 GigE +#lge* at pci? # Level1 LXT1001 GigE +#hme* at pci? # Sun Happy Meal # Wireless network cards -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -#lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -ukphy* at mii? phy ? # "unknown" PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +#lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback #pseudo-device sl 1 # CSLIP diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 655db751992..2cfbb253011 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.74 2004/08/18 02:53:50 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.75 2004/09/16 09:14:03 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -42,8 +42,8 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 @@ -58,13 +58,13 @@ pci* at mainbus0 option PCIVERBOSE #option EISAVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridge -ichpcib* at pci? dev ? function ? # Intel ICHx/ICHx-M LPC bridges -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges +gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge # ISA PCMCIA controllers #pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 @@ -72,10 +72,10 @@ gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge #pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 # PCI PCMCIA controllers -#pcic* at pci? dev? function ? +#pcic* at pci? # PCMCIA bus support -#pcmcia* at pcic? controller ? socket ? +#pcmcia* at pcic? npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? @@ -83,24 +83,24 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? +wskbd* at pckbd? vga0 at isa? -vga* at pci? dev ? function ? +vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? +wsdisplay* at vga? +wsdisplay* at pcdisplay? pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports pccom1 at isa? port 0x2f8 irq 3 pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -#pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +#pccom* at pcmcia? # PCMCIA modem cards #pccom* at isapnp? # option for using CD1400 handshaking for incoming data @@ -113,182 +113,182 @@ pccom2 at isa? port 0x3e8 irq 5 #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable port ? irq ? -#bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable +#bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat #scsibus* at bha? -#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers #aha* at isapnp? #scsibus* at aha? -#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -#ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers +#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +#ahc* at pci? # Adaptec 2940 SCSI controllers #scsibus* at ahc? -ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI -dpt* at eisa? slot ? # DPT SmartCache/SmartRAID EISA +dpt* at pci? # DPT SmartCache/SmartRAID PCI +dpt* at eisa? # DPT SmartCache/SmartRAID EISA scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? -aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +aac* at pci? # Adaptec FSA RAID controllers scsibus* at aac? -ami* at pci? dev ? function ? # AMI MegaRAID controllers +ami* at pci? # AMI MegaRAID controllers scsibus* at ami? -cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers -cac* at eisa? slot ? +cac* at pci? # Compaq Smart ARRAY RAID controllers +cac* at eisa? scsibus* at cac? -twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +twe* at pci? # 3ware Escalade RAID controllers scsibus* at twe? -iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +iha* at pci? # Initio Ultra/UltraWide SCSI controllers scsibus* at iha? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel scsibus* at isp? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers #aic* at isapnp? #scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI scsibus* at adw? -#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers +#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers #scsibus* at sea? -#trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +#trm* at pci? # Tekram DC-3x5U SCSI Controllers #scsibus* at trm? -#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha* at eisa? slot ? # UltraStor 24f SCSI controllers +#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers +#uha* at eisa? # UltraStor 24f SCSI controllers #scsibus* at uha? #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 #scsibus* at wds? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +fd* at fdc? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wdc* at pcmcia? function ? +#wdc* at pcmcia? #wdc* at isapnp? # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # I2O -iop* at pci? dev ? function ? # I2O -ioprbs* at iop? tid ? # Random block storage +iop* at pci? # I2O +ioprbs* at iop? # Random block storage scsibus* at ioprbs? # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes +#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes #we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series #we1 at isa? port 0x300 iomem 0xcc000 irq 10 # #we* at isapnp? #ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet card -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -#ne* at isapnp? # NE[12]000 PnP ethernet cards -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards -#ep0 at isa? port ? irq ? # 3C509 ethernet cards -#ep* at isa? port ? irq ? # 3C509 ethernet cards -#ef* at isapnp? # 3C515 PnP ethernet +#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card +#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card +#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +#ne* at isapnp? # NE[12]000 PnP ethernet cards +#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards +#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards +#ep0 at isa? # 3C509 ethernet cards +#ep* at isa? # 3C509 ethernet cards +#ef* at isapnp? # 3C515 PnP ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#ep0 at eisa? slot ? -#ep* at eisa? slot ? # 3C579 ethernet cards -#fea* at eisa? slot ? # DEC DEFEA FDDI cards -#le* at pci? dev ? function ? # PCnet-PCI based ethernet cards -#ep* at isapnp? # 3C509 PnP ethernet cards +#ie1 at isa? port 0x300 irq 10 # EtherExpress +#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +#ep0 at eisa? +#ep* at eisa? # 3C579 ethernet cards +#fea* at eisa? # DEC DEFEA FDDI cards +#le* at pci? # PCnet-PCI based ethernet cards +#ep* at isapnp? # 3C509 PnP ethernet cards #le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet cards -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -ep0 at pci? dev ? function ? # 3C59x ethernet cards -ep* at pci? dev ? function ? # 3C59x ethernet cards -#ne* at pci? dev ? function ? # NE2000-compat ethernet cards -#ne* at pcmcia? function ? # PCMCIA based NE2000 cards -#ep* at pcmcia? function ? # PCMCIA based 3c5xx cards -#sm* at pcmcia? function ? # PCMCIA based sm cards -#xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards -xl* at pci? dev ? function ? # 3C9xx ethernet cards -#rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet cards -#tl* at pci? dev ? function ? # Compaq Thunderlan ethernet cards -vr* at pci? dev ? function ? # VIA Rhine ethernet -#wb* at pci? dev ? function ? # Winbond W89C840F ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -#skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -#sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -#stge* at pci? dev ? function ? # Sundance TC9021 GigE -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#hme* at pci? dev ? function ? # Sun Happy Meal +de* at pci? # DC21X4X-based ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet cards +ep0 at pci? # 3C59x ethernet cards +ep* at pci? # 3C59x ethernet cards +#ne* at pci? # NE2000-compat ethernet cards +#ne* at pcmcia? # PCMCIA based NE2000 cards +#ep* at pcmcia? # PCMCIA based 3c5xx cards +#sm* at pcmcia? # PCMCIA based sm cards +#xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI cards +xl* at pci? # 3C9xx ethernet cards +#rl* at pci? # RealTek 81[23]9 ethernet +#tx* at pci? # SMC 83C170 EPIC ethernet cards +#tl* at pci? # Compaq Thunderlan ethernet cards +vr* at pci? # VIA Rhine ethernet +#wb* at pci? # Winbond W89C840F ethernet +dc* at pci? # 21143, "tulip" clone ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +#skc* at pci? # SysKonnect GEnesis 984x +#sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +#txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +bge* at pci? # Broadcom BCM570x (aka Tigon3) +#stge* at pci? # Sundance TC9021 GigE +re* at pci? # Realtek 8169/8169S/8110S +#lge* at pci? # Level1 LXT1001 GigE +#hme* at pci? # Sun Happy Meal # Wireless network cards -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pci? # WaveLAN IEEE 802.11DS +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +#an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -#lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -ukphy* at mii? phy ? # "unknown" PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +#lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback #pseudo-device sl 1 # CSLIP diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index 81764b62557..43d108d5fcf 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.40 2004/06/13 21:49:15 niklas Exp $ +# $OpenBSD: RAMDISKC,v 1.41 2004/09/16 09:14:03 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -42,8 +42,8 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 @@ -58,13 +58,13 @@ pci* at mainbus0 option PCIVERBOSE #option EISAVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridge -ichpcib* at pci? dev ? function ? # Intel ICHx/ICHx-M LPC bridges -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges +gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge # ISA PCMCIA controllers pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 @@ -75,15 +75,15 @@ pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 pcic* at isapnp? # PCI PCMCIA controllers -pcic* at pci? dev? function ? +pcic* at pci? dev? # PCMCIA bus support -pcmcia* at pcic? controller ? socket ? +pcmcia* at pcic? # CardBus bus support (also see NOTE below) cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -92,24 +92,24 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? +wskbd* at pckbd? vga0 at isa? -vga* at pci? dev ? function ? +vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? +wsdisplay* at vga? +wsdisplay* at pcdisplay? pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports pccom1 at isa? port 0x2f8 irq 3 pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +pccom* at pcmcia? # PCMCIA modem cards pccom* at isapnp? # option for using CD1400 handshaking for incoming data @@ -122,162 +122,162 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable port ? irq ? -#bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +#bha2 at isa? disable +#bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat #scsibus* at bha? -#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers #aha* at isapnp? #scsibus* at aha? -#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? -#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -#ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers +#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +#ahc* at pci? # Adaptec 2940 SCSI controllers #scsibus* at ahc? -#gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +#gdt* at pci? # ICP Vortex GDT RAID controllers #scsibus* at gdt? -#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers -#scsibus* at pci? dev ? function ? -#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +#twe* at pci? # 3ware Escalade RAID controllers +#scsibus* at pci? +#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? -aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers #aic* at isapnp? -aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +aic* at pcmcia? # PCMCIA based aic SCSI controllers scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -#siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +#siop* at pci? # NCR 538XX SCSI controllers(new) #scsibus* at siop? -#adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -#adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +#adw* at pci? # AdvanSys ULTRA WIDE SCSI #scsibus* at adw? -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers +#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers #scsibus* at sea? -#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -#uha* at eisa? slot ? # UltraStor 24f SCSI controllers +#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers +#uha* at eisa? # UltraStor 24f SCSI controllers #scsibus* at uha? #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 #scsibus* at wds? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +fd* at fdc? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? function ? +wdc* at pcmcia? wdc* at isapnp? # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes +#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series we1 at isa? port 0x300 iomem 0xcc000 irq 10 # we* at isapnp? ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet -ep* at isa? port ? irq ? # 3C509 ethernet -ef* at isapnp? # 3C515 PnP ethernet +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet +#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet +#el0 at isa? port 0x300 irq 9 # 3C501 ethernet +ep0 at isa? # 3C509 ethernet +ep* at isa? # 3C509 ethernet +ef* at isapnp? # 3C515 PnP ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#ep0 at eisa? slot ? -#ep* at eisa? slot ? # 3C579 ethernet -#fea* at eisa? slot ? # DEC DEFEA FDDI -#le* at pci? dev ? function ? # PCnet-PCI based ethernet -#ep* at isapnp? # 3C509 PnP ethernet +#ie1 at isa? port 0x300 irq 10 # EtherExpress +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +#ep0 at eisa? +#ep* at eisa? # 3C579 ethernet +#fea* at eisa? # DEC DEFEA FDDI +#le* at pci? # PCnet-PCI based ethernet +#ep* at isapnp? # 3C509 PnP ethernet #le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -#ep0 at pci? dev ? function ? # 3C59x ethernet -#ep* at pci? dev ? function ? # 3C59x ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet -ne* at pcmcia? function ? # PCMCIA based NE2000 -ep* at pcmcia? function ? # PCMCIA based 3C5xx -#sm* at pcmcia? function ? # PCMCIA based sm -xe* at pcmcia? function ? # Xircom ethernet -#fpa* at pci? dev ? function ? # DEC DEFPA FDDI -xl* at pci? dev ? function ? # 3C9xx ethernet -xl* at cardbus? dev ? function ? # 3C575 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -#tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -#tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -#vr* at pci? dev ? function ? # VIA Rhine ethernet -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -#skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -#sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -#txp* at pci? dev ? function ? # 3com 3CR990 -#nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -#bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -#stge* at pci? dev ? function ? # Sundance TC9021 GigE -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -#hme* at pci? dev ? function ? # Sun Happy Meal -#bce* at pci? dev ? function ? # Broadcom BCM4401 +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +#ep0 at pci? # 3C59x ethernet +#ep* at pci? # 3C59x ethernet +ne* at pci? # NE2000-compat ethernet +ne* at pcmcia? # PCMCIA based NE2000 +ep* at pcmcia? # PCMCIA based 3C5xx +#sm* at pcmcia? # PCMCIA based sm +xe* at pcmcia? # Xircom ethernet +#fpa* at pci? # DEC DEFPA FDDI +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +rl* at cardbus? # RealTek 81[23]9 ethernet +#tx* at pci? # SMC 83C170 EPIC ethernet +#tl* at pci? # Compaq Thunderlan ethernet +#vr* at pci? # VIA Rhine ethernet +wb* at pci? # Winbond W89C840F ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +#skc* at pci? # SysKonnect GEnesis 984x +#sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +#txp* at pci? # 3com 3CR990 +#nge* at pci? # NS DP83820/DP83821 GigE +#bge* at pci? # Broadcom BCM570x (aka Tigon3) +#stge* at pci? # Sundance TC9021 GigE +#lge* at pci? # Level1 LXT1001 GigE +#hme* at pci? # Sun Happy Meal +#bce* at pci? # Broadcom BCM4401 # Wireless network cards -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -#lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -#sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -ukphy* at mii? phy ? # "unknown" PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +#lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +#sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback #pseudo-device sl 1 # CSLIP diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 14a8f93acf4..674ccbb9eec 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.79 2004/08/27 22:03:02 drahn Exp $ +# $OpenBSD: RAMDISK_CD,v 1.80 2004/09/16 09:14:03 mickey Exp $ machine i386 # architecture, used by config; REQUIRED @@ -43,8 +43,8 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root -cpu0 at mainbus? apid ? -bios0 at mainbus0 apid ? +cpu0 at mainbus? +bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 @@ -59,18 +59,18 @@ pci* at mainbus0 option PCIVERBOSE #option EISAVERBOSE -pchb* at pci? dev ? function ? # PCI-Host bridges -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? -pci* at pchb? bus ? -pcib* at pci? dev ? function ? # PCI-ISA bridge -ichpcib* at pci? dev ? function ? # Intel ICHx/ICHx-M LPC bridges -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges +gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? # ISA PCMCIA controllers @@ -79,79 +79,79 @@ pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 # PCI PCMCIA controllers -pcic* at pci? dev? function ? +pcic* at pci? # PCMCIA bus support -pcmcia* at pcic? controller ? socket ? +pcmcia* at pcic? # PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller +ehci* at pci? # Enhanced Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at ehci? usb* at uhci? usb* at ohci? -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -#uhid* at uhub? port ? configuration ? # USB Generic HID devices -#umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +#uhid* at uhub? # USB Generic HID devices +#umodem* at uhub? # USB Modems/Serial #ucom* at umodem? -#uvisor* at uhub? port ? configuration ? # Handspring Visor +#uvisor* at uhub? # Handspring Visor #ucom* at uvisor? -#uftdi* at uhub? port ? -#ucom* at uftdi? portno ? -#uaudio* at uhub? port ? configuration ?# USB Audio -#ulpt* at uhub? port ? configuration ? # USB Printers -uhidev* at uhub? port ? configuration ? interface ? -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 -umass* at uhub? port ? configuration ? # USB Mass Storage devices +#uftdi* at uhub? +#ucom* at uftdi? +#uaudio* at uhub? # USB Audio +#ulpt* at uhub? # USB Printers +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -#ums* at uhidev? reportid ? +#ums* at uhidev? #wsmouse* at ums? mux 0 -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -urio* at uhub? port ? # Diamond Multimedia Rio 500 -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -#uscanner* at uhub? port ? # USB Scanners -#usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +urio* at uhub? # Diamond Multimedia Rio 500 +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +#uscanner* at uhub? # USB Scanners +#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#ugen* at uhub? port ? configuration ? # USB Generic driver +#uyap* at uhub? # Y@P firmware loader +#ugen* at uhub? # USB Generic driver npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? isapnp0 at isa? -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? console ? +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +wskbd* at pckbd? vga0 at isa? -vga* at pci? dev ? function ? -pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at vga? console ? -wsdisplay* at pcdisplay? console ? +vga* at pci? +pcdisplay0 at isa? # CGA, MDA, EGA, HGA +wsdisplay* at vga? +wsdisplay* at pcdisplay? pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports pccom1 at isa? port 0x2f8 irq 3 pccom2 at isa? port 0x3e8 irq 5 #pccom3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? slave ? +#pccom* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? slave ? +#pccom* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? slave ? -pccom* at pcmcia? function ? # PCMCIA modem cards +#pccom* at rtfps? +pccom* at pcmcia? # PCMCIA modem cards pccom* at isapnp? # option for using CD1400 handshaking for incoming data @@ -164,193 +164,193 @@ pccom* at isapnp? #lpt1 at isa? port 0x278 #lpt2 at isa? port 0x3bc -bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha1 at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers -bha2 at isa? disable port ? irq ? -bha* at pci? dev ? function ? -#bha* at eisa? slot ? # XXX eisa still runs in isa-compat +bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers +bha2 at isa? disable +bha* at pci? +#bha* at eisa? # XXX eisa still runs in isa-compat scsibus* at bha? -aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers -aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers aha* at isapnp? scsibus* at aha? -ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? dev ? function ? # Adaptec 2940/3940/78?? SCSI controllers +ahc0 at isa? # Adaptec 284x SCSI controllers +ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers scsibus* at ahc? -ahd* at pci? dev ? function ? # Adaptec 79?? SCSI controllers +ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? dev ? function ? # LSI Fusion-MPT SCSI/Fibre +mpt* at pci? # LSI Fusion-MPT SCSI/Fibre scsibus* at mpt? -dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID PCI -dpt* at eisa? slot ? # DPT SmartCache/SmartRAID EISA +dpt* at pci? # DPT SmartCache/SmartRAID PCI +dpt* at eisa? # DPT SmartCache/SmartRAID EISA scsibus* at dpt? -gdt* at pci? dev ? function ? # ICP Vortex GDT RAID controllers +gdt* at pci? # ICP Vortex GDT RAID controllers scsibus* at gdt? -aac* at pci? dev ? function ? # Adaptec FSA RAID controllers +aac* at pci? # Adaptec FSA RAID controllers scsibus* at aac? -ami* at pci? dev ? function ? # AMI MegaRAID controllers +ami* at pci? # AMI MegaRAID controllers scsibus* at ami? -cac* at pci? dev ? function ? # Compaq Smart ARRAY RAID controllers -cac* at eisa? slot ? +cac* at pci? # Compaq Smart ARRAY RAID controllers +cac* at eisa? scsibus* at cac? -twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +twe* at pci? # 3ware Escalade RAID controllers scsibus* at twe? -iha* at pci? dev ? function ? # Initio Ultra/UltraWide SCSI controllers +iha* at pci? # Initio Ultra/UltraWide SCSI controllers scsibus* at iha? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel scsibus* at isp? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers aic* at isapnp? -aic* at pcmcia? function ? # PCMCIA based aic SCSI controllers +aic* at pcmcia? # PCMCIA based aic SCSI controllers scsibus* at aic? -#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers(old) +#ncr* at pci? # NCR 538XX SCSI controllers(old) #scsibus* at ncr? -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers(new) +siop* at pci? # NCR 538XX SCSI controllers(new) scsibus* at siop? -adv* at pci? dev ? function ? # AdvanSys 1200A/B and ULTRA SCSI +adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI scsibus* at adv? -adw* at pci? dev ? function ? # AdvanSys ULTRA WIDE SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI scsibus* at adw? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI scsibus* at pcscp? sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers scsibus* at sea? -trm* at pci? dev ? function ? # Tekram DC-3x5U SCSI Controllers +trm* at pci? # Tekram DC-3x5U SCSI Controllers scsibus* at trm? -uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha1 at isa? disable port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers -uha* at eisa? slot ? # UltraStor 24f SCSI controllers +uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers +uha* at eisa? # UltraStor 24f SCSI controllers scsibus* at uha? wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 scsibus* at wds? # I2O -iop* at pci? dev ? function ? # I2O -ioprbs* at iop? tid ? # Random block storage +iop* at pci? # I2O +ioprbs* at iop? # Random block storage scsibus* at ioprbs? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -#ch* at scsibus? target ? lun ? # SCSI autochangers -#uk* at scsibus? target ? lun ? # SCSI unknown devices +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +#ch* at scsibus? # SCSI autochangers +#uk* at scsibus? # SCSI unknown devices fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 irq ? drq ? -fd* at fdc? drive ? +#fdc1 at isa? port 0x370 +fd* at fdc? #mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives # IDE controllers -pciide* at pci ? dev ? function ? flags 0x0000 +pciide* at pci? flags 0x0000 wdc0 at isa? port 0x1f0 irq 14 flags 0x00 wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? function ? +wdc* at pcmcia? wdc* at isapnp? # IDE hard drives -wd* at wdc? channel ? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 # ATAPI<->SCSI -atapiscsi* at wdc? channel ? -atapiscsi* at pciide? channel ? +atapiscsi* at wdc? +atapiscsi* at pciide? scsibus* at atapiscsi? -#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes +#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series we1 at isa? port 0x300 iomem 0xcc000 irq 10 # we* at isapnp? ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet -eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet -el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet -ep* at isa? port ? irq ? # 3C509 ethernet -ef* at isapnp? # 3C515 PnP ethernet +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet +eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet +el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet +ep0 at isa? # 3C509 ethernet +ep* at isa? # 3C509 ethernet +ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -ep0 at eisa? slot ? -ep* at eisa? slot ? # 3C579 ethernet -ef* at isapnp? # 3C515 ethernet -#fea* at eisa? slot ? # DEC DEFEA FDDI -le* at pci? dev ? function ? # PCnet-PCI based ethernet -ep* at isapnp? # 3C509 PnP ethernet +#ie1 at isa? port 0x300 irq 10 # EtherExpress +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +ep0 at eisa? +ep* at eisa? # 3C579 ethernet +ef* at isapnp? # 3C515 ethernet +#fea* at eisa? # DEC DEFEA FDDI +le* at pci? # PCnet-PCI based ethernet +ep* at isapnp? # 3C509 PnP ethernet le* at isapnp? -de* at pci? dev ? function ? # DC21X4X-based ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -ep0 at pci? dev ? function ? # 3C59x ethernet -ep* at pci? dev ? function ? # 3C59x ethernet -ne* at pci? dev ? function ? # NE2000-compat ethernet -ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -sm* at pcmcia? function ? # PCMCIA based sm ethernet -xe* at pcmcia? function ? # Xircom ethernet -fpa* at pci? dev ? function ? # DEC DEFPA FDDI -xl* at pci? dev ? function ? # 3C9xx ethernet -xl* at cardbus? dev ? function ? # 3C575 ethernet -rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet -tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet -tl* at pci? dev ? function ? # Compaq Thunderlan ethernet -vr* at pci? dev ? function ? # VIA Rhine ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -sis* at pci? dev ? function ? # SiS 900/7016 ethernet -wb* at pci? dev ? function ? # Winbond W89C840F ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -skc* at pci? dev ? function ? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -txp* at pci? dev ? function ? # 3com 3CR990 -nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -stge* at pci? dev ? function ? # Sundance TC9021 GigE -bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3) -#lge* at pci? dev ? function ? # Level1 LXT1001 GigE -mtd* at pci? dev ? function ? # Myson MTD803 -bce* at pci? dev ? function ? # Broadcom BCM4401 +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +ep0 at pci? # 3C59x ethernet +ep* at pci? # 3C59x ethernet +ne* at pci? # NE2000-compat ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +sm* at pcmcia? # PCMCIA based sm ethernet +xe* at pcmcia? # Xircom ethernet +fpa* at pci? # DEC DEFPA FDDI +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +tx* at pci? # SMC 83C170 EPIC ethernet +tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +wb* at pci? # Winbond W89C840F ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +txp* at pci? # 3com 3CR990 +nge* at pci? # NS DP83820/DP83821 GigE +re* at pci? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +bge* at pci? # Broadcom BCM570x (aka Tigon3) +#lge* at pci? # Level1 LXT1001 GigE +mtd* at pci? # Myson MTD803 +bce* at pci? # Broadcom BCM4401 # Wireless network cards -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH -an* at pcmcia? function ? # Aironet IEEE 802.11DS -#cnw* at pcmcia? function ? # Xircom Netwave -ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#awi* at pcmcia? # Bay Networks IEEE 802.11FH +an* at pcmcia? # Aironet IEEE 802.11DS +#cnw* at pcmcia? # Xircom Netwave +ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback #pseudo-device sl 1 # CSLIP diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 0481c851ddb..0492169db7d 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.127 2004/09/15 20:28:53 grange Exp $ +# $OpenBSD: files.i386,v 1.128 2004/09/16 09:14:03 mickey Exp $ # # new style config file for i386 architecture # @@ -83,7 +83,7 @@ include "../../../dev/ata/files.ata" # System bus types # -define mainbus { apid = -1 } +define mainbus {[apid = -1]} device mainbus: isabus, eisabus, pcibus, mainbus attach mainbus at root file arch/i386/i386/mainbus.c mainbus @@ -197,7 +197,7 @@ attach sysbeep at pcppi # Floppy disk controller # XXX temporarily conflicts with arc, will soon move to files.isa -device fdc {drive = -1} +device fdc {[drive = -1]} attach fdc at isa file dev/isa/fdc.c fdc needs-flag @@ -287,7 +287,7 @@ define mpbios file arch/i386/i386/mpbios.c mpbios needs-flag # CPUS -define cpu { apid = -1 } +define cpu {[apid = -1]} device cpu attach cpu at mainbus file arch/i386/i386/cpu.c cpu diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index 6f1199d7bbf..06e2015bc85 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.4 2004/07/28 12:28:46 miod Exp $ +# $OpenBSD: GENERIC,v 1.5 2004/09/16 09:14:03 mickey Exp $ machine luna88k m88k @@ -32,16 +32,16 @@ spc1 at mainbus0 # Workstation Console attachments wsdisplay* at fb? -wskbd* at ws? console ? +wskbd* at ws? wsmouse* at ws? # SCSI bus support scsibus* at spc? # SCSI devices -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK index e066edb7d52..ddb3cd11784 100644 --- a/sys/arch/luna88k/conf/RAMDISK +++ b/sys/arch/luna88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2004/04/29 14:33:24 miod Exp $ +# $OpenBSD: RAMDISK,v 1.4 2004/09/16 09:14:03 mickey Exp $ machine luna88k m88k @@ -47,16 +47,16 @@ spc1 at mainbus0 # Workstation Console attachments wsdisplay* at fb? -wskbd* at ws? console ? +wskbd* at ws? wsmouse* at ws? # SCSI bus support scsibus* at spc? # SCSI devices -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROM +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROM pseudo-device loop 1 pseudo-device bpfilter 1 diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index f28bacebd24..0ed58cf74e6 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 2004/08/04 20:14:40 miod Exp $ +# $OpenBSD: GENERIC,v 1.34 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC - an all-in-one kernel for the mac68k @@ -35,7 +35,7 @@ intvid0 at obio? # Internal video hardware mc* at obio? # MACE ethernet on Centris/Quadra 660av sn* at obio? # Internal ethernet zsc0 at obio? # Zilog serial chip -zstty* at zsc? channel ? +zstty* at zsc? nubus0 at mainbus? @@ -58,9 +58,9 @@ scsibus* at esp? scsibus* at ncrscsi? #scsibus* at sbc? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -ch* at scsibus? target ? lun ? # SCSI autochangers -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # SCSI unknown +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +ch* at scsibus? # SCSI autochangers +ss* at scsibus? # SCSI scanners +uk* at scsibus? # SCSI unknown diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index 2ef885d372d..20b9c1bbe5e 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICSBC,v 1.17 2004/08/04 20:14:40 miod Exp $ +# $OpenBSD: GENERICSBC,v 1.18 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERICSBC --- our generic kernel using the SBC SCSI driver @@ -35,7 +35,7 @@ intvid0 at obio? # Internal video hardware mc* at obio? # MACE ethernet on Centris/Quadra 660av sn* at obio? # Internal ethernet zsc0 at obio? # Zilog serial chip -zstty* at zsc? channel ? +zstty* at zsc? nubus0 at mainbus? @@ -58,9 +58,9 @@ scsibus* at esp? #scsibus* at ncrscsi? scsibus* at sbc? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives -ch* at scsibus? target ? lun ? # SCSI autochangers -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # SCSI unknown +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives +ch* at scsibus? # SCSI autochangers +ss* at scsibus? # SCSI scanners +uk* at scsibus? # SCSI unknown diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK index 933731dd603..6bbc6b6ae5a 100644 --- a/sys/arch/mac68k/conf/RAMDISK +++ b/sys/arch/mac68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2004/04/01 22:15:55 xsa Exp $ +# $OpenBSD: RAMDISK,v 1.14 2004/09/16 09:14:03 mickey Exp $ # # RAMDISK - bsd.rd configuration file (non-SBC version) @@ -52,7 +52,7 @@ intvid0 at obio? # Internal video hardware mc* at obio? # MACE ethernet on Centris/Quadra 660av sn* at obio? # Internal ethernet zsc0 at obio? # Zilog serial chip -zstty* at zsc? channel ? +zstty* at zsc? nubus0 at mainbus? @@ -75,8 +75,8 @@ scsibus* at esp? scsibus* at ncrscsi? #scsibus* at sbc? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives pseudo-device rd 1 diff --git a/sys/arch/mac68k/conf/RAMDISKSBC b/sys/arch/mac68k/conf/RAMDISKSBC index bca194e7a3e..65d11590c30 100644 --- a/sys/arch/mac68k/conf/RAMDISKSBC +++ b/sys/arch/mac68k/conf/RAMDISKSBC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKSBC,v 1.4 2004/04/01 22:15:55 xsa Exp $ +# $OpenBSD: RAMDISKSBC,v 1.5 2004/09/16 09:14:03 mickey Exp $ # # RAMDISKSBC - bsd.rd configuration file (SBC version) @@ -52,7 +52,7 @@ intvid0 at obio? # Internal video hardware mc* at obio? # MACE ethernet on Centris/Quadra 660av sn* at obio? # Internal ethernet zsc0 at obio? # Zilog serial chip -zstty* at zsc? channel ? +zstty* at zsc? nubus0 at mainbus? @@ -75,8 +75,8 @@ scsibus* at esp? #scsibus* at ncrscsi? scsibus* at sbc? -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives pseudo-device rd 1 diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index 8a3e34db884..c35b4fc1436 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: files.mac68k,v 1.29 2002/04/18 22:12:37 miod Exp $ +# $OpenBSD: files.mac68k,v 1.30 2004/09/16 09:14:03 mickey Exp $ # $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $ # mac68k-specific configuration info @@ -85,7 +85,7 @@ file arch/mac68k/dev/sbc.c sbc attach esp at obio_norm file arch/mac68k/dev/esp.c esp -device zsc { channel = -1 } +device zsc {[channel = -1]} attach zsc at obio_norm file arch/mac68k/dev/zs.c zsc needs-flag file arch/mac68k/dev/z8530sc.c zsc diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 73e96932c14..f6e80f2335e 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.58 2004/08/25 13:03:27 drahn Exp $g +# $OpenBSD: GENERIC,v 1.59 2004/09/16 09:14:03 mickey Exp $g # # PPC GENERIC config file # @@ -20,8 +20,6 @@ option ALTIVEC option APERTURE # in-kernel aperture driver for XFree86 option WSDISPLAY_COMPAT_RAWKBD - - option USER_PCICONF # user-space PCI configuration include "../../../conf/GENERIC" @@ -31,93 +29,93 @@ config bsd swap generic mainbus0 at root cpu* at mainbus0 -mpcpcibr* at mainbus0 # MPC106 PCI Bridge. +mpcpcibr* at mainbus0 # MPC106 PCI Bridge. memc* at mainbus0 pchb* at pci? #### PCI Bus devices. pci* at mpcpcibr? -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? - -siop* at pci? dev ? function ? -fxp* at pci? dev ? function ? -de* at pci? dev ? function ? -#vme* at pci? dev ? function ? -vgafb0 at pci? dev ? function ? # PCI VGA graphics -#ep* at pci? dev ? function ? # 3Com 3c59x -#ne* at pci? dev ? function ? # NE2000-compatible Ethernet -#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI -ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI -#bha* at pci? dev ? function ? # BusLogic 9xx SCSI -#ami* at pci? dev ? function ? -#pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI -pciide* at pci? dev ? function ? -kauaiata* at pci? dev ? function ? # Apple ATA 100 +ppb* at pci? # PCI-PCI bridges +pci* at ppb? + +siop* at pci? +fxp* at pci? +de* at pci? +#vme* at pci? +vgafb0 at pci? # PCI VGA graphics +#ep* at pci? # 3Com 3c59x +#ne* at pci? # NE2000-compatible Ethernet +#adv* at pci? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI +ahc* at pci? # Adaptec 294x, aic78x0 SCSI +#bha* at pci? # BusLogic 9xx SCSI +#ami* at pci? +#pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI +pciide* at pci? +kauaiata* at pci? # Apple ATA 100 wdc* at kauaiata? -macobio0 at pci? dev ? function ? -gem* at pci? dev ? function ? # GMAC ethernet -hme* at pci? dev ? function ? # HME ethernet -dc* at pci? dev ? function ? # DEC Tulip 21143 clones -xl* at pci? dev ? function ? # 3C9xx ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -an* at pci? dev ? function ? # Cisco/Aironet -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -iop* at pci? dev ? function ? # I2O processor -ioprbs* at iop? tid ? # I2O arrays -iopsp* at iop? tid ? # I2O SCSI pass-through - -dcphy* at mii? phy ? # Digital Clone PHYs -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS1890 PHYs -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -#nsphyter* at mii? phy ? # NS83843 PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8022[013] PHYs -#tlphy* at mii? phy ? # ThunderLAN PHYs -#tqphy* at mii? phy ? # TDK Semiconductor PHYs -brgphy* at mii? phy ? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -eephy* at mii? phy ? # Marvell 88E1000 Gigabit PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # generic unknown PHYs +macobio0 at pci? +gem* at pci? # GMAC ethernet +hme* at pci? # HME ethernet +dc* at pci? # DEC Tulip 21143 clones +xl* at pci? # 3C9xx ethernet +em* at pci? # Intel Pro/1000 ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +re* at pci? # Realtek 8169/8169S/8110S +an* at pci? # Cisco/Aironet +wi* at pci? # WaveLAN IEEE 802.11DS +iop* at pci? # I2O processor +ioprbs* at iop? # I2O arrays +iopsp* at iop? # I2O SCSI pass-through + +dcphy* at mii? # Digital Clone PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS1890 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +#nsphyter* at mii? # NS83843 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +#qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8022[013] PHYs +#tlphy* at mii? # ThunderLAN PHYs +#tqphy* at mii? # TDK Semiconductor PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 Gigabit PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # generic unknown PHYs # crypto -lofn* at pci? dev ? function ? # Hifn6500 -hifn* at pci? dev ? function ? # Hifn7751/7811/7951 -ubsec* at pci? dev ? function ? # Broadcom 58xx -safe* at pci? dev ? function ? # SafeNet SafeXcel 1141/1741 - -macintr0 at macobio? # old interrupt controller -openpic0 at macobio? # openpic interrupt controller -bm* at macobio? # BMAC ethernet -#mc* at macobio? # MACE ethernet -#esp* at macobio? flags 0x00ff # 53c9x SCSI -#mesh* at macobio? flags 0xffff # MESH SCSI -#nvram* at macobio? # nvram -adb* at macobio? # Apple Desktop Bus -apm0 at adb? # APM emulation -wi* at macobio? # airport -gpio* at macobio? # GPIO, PMU interrupt router. -gpio* at gpio? # GPIO, PMU interrupt router. -aed* at adb? # ADB Event Device -akbd* at adb? # ADB keyboard +lofn* at pci? # Hifn6500 +hifn* at pci? # Hifn7751/7811/7951 +ubsec* at pci? # Broadcom 58xx +safe* at pci? # SafeNet SafeXcel 1141/1741 + +macintr0 at macobio? # old interrupt controller +openpic0 at macobio? # openpic interrupt controller +bm* at macobio? # BMAC ethernet +#mc* at macobio? # MACE ethernet +#esp* at macobio? flags 0x00ff # 53c9x SCSI +#mesh* at macobio? flags 0xffff # MESH SCSI +#nvram* at macobio? # nvram +adb* at macobio? # Apple Desktop Bus +apm0 at adb? # APM emulation +wi* at macobio? # airport +gpio* at macobio? # GPIO, PMU interrupt router. +gpio* at gpio? # GPIO, PMU interrupt router. +aed* at adb? # ADB Event Device +akbd* at adb? # ADB keyboard # FireWire Controllers -#fwohci* at pci? dev ? function ? # PCI FireWire adapter -#fwohci* at cardbus? dev ? function ? # CardBus FireWire adapter +#fwohci* at pci? # PCI FireWire adapter +#fwohci* at cardbus? # CardBus FireWire adapter -#fw* at fwbus? # IPv4/v6 over FireWire -#fwnode* at fwbus? idhi ? idlo ? +#fw* at fwbus? # IPv4/v6 over FireWire +#fwnode* at fwbus? -#fwscsi* at fwnode? # SCSI over FireWire +#fwscsi* at fwnode? # SCSI over FireWire #scsibus* at fwscsi? #option FWOHCI_DEBUG @@ -126,25 +124,25 @@ akbd* at adb? # ADB keyboard #option SBP2_DEBUG #option FWSCSI_DEBUG -wskbd* at akbd? console ? mux 1 -ams* at adb? # ADB mouse +wskbd* at akbd? mux 1 +ams* at adb? # ADB mouse wsmouse* at ams? mux 0 -abtn* at adb? # ADB button? +abtn* at adb? # ADB button? zsc* at macobio? -zstty* at zsc? channel ? +zstty* at zsc? #i2c* at macobio? #tas* at i2c? -awacs* at macobio? # Apple audio device -ki2c* at macobio? # Keywest I2C -snapper* at macobio? # Snapper audio device +awacs* at macobio? # Apple audio device +ki2c* at macobio? # Keywest I2C +snapper* at macobio? # Snapper audio device -bktr0 at pci? dev ? function ? # Bt8[47][89] tv/fmradio/video +bktr0 at pci? # Bt8[47][89] tv/fmradio/video radio* at bktr? # PCI audio devices -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 +eap* at pci? # Ensoniq AudioPCI S5016 #scsibus* at adv? scsibus* at ahc? @@ -161,83 +159,83 @@ scsibus* at siop? mediabay* at macobio? wdc* at mediabay? wdc* at macobio? -wd* at wdc? drive ? flags 0x0000 -wd* at pciide? drive ? flags 0x0000 -atapiscsi* at wdc? channel ? flags 0x0000 -atapiscsi* at pciide? channel ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? flags 0x0000 +atapiscsi* at pciide? flags 0x0000 scsibus* at atapiscsi? # PCI USB Controllers -ohci* at pci? # Open Host Controller -ehci* at pci? disable # Enhanced Host Controller +ohci* at pci? # Open Host Controller +ehci* at pci? disable # Enhanced Host Controller # USB bus support usb* at ohci? flags 0x1 usb* at ehci? # USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +ugen* at uhub? # USB Generic driver # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -an* at pcmcia? function ? # Cisco/Aironet -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -#fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet -#rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -wdc* at pcmcia? function ? +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +an* at pcmcia? # Cisco/Aironet +wi* at pcmcia? # WaveLAN IEEE 802.11DS +dc* at cardbus? # 21143, "tulip" clone ethernet +#fxp* at cardbus? # Intel PRO/100 ethernet +xl* at cardbus? # 3C575/3C656 ethernet +#rl* at cardbus? # RealTek 81[23]9 ethernet +wdc* at pcmcia? wsdisplay* at vgafb? -wskbd* at ukbd? console ? mux 1 +wskbd* at ukbd? mux 1 # Audio support audio* at awacs? @@ -245,12 +243,12 @@ audio* at snapper? audio* at eap? audio* at uaudio? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #pseudo-device hotplug 1 # devices hot plugging pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index da166bb9771..aca5f6232fa 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.33 2004/08/25 13:03:27 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.34 2004/09/16 09:14:03 mickey Exp $ # # PPC GENERIC config file # @@ -39,74 +39,74 @@ pchb* at pci? # host bridge identifiers #### PCI Bus devices. pci* at mpcpcibr? -ppb* at pci? dev ? function ? # PCI-PCI bridges -pci* at ppb? bus ? - -siop* at pci? dev ? function ? -#ncr* at pci? dev ? function ? -fxp* at pci? dev ? function ? -de* at pci? dev ? function ? -#vme* at pci? dev ? function ? -vgafb0 at pci? dev ? function ? # PCI VGA graphics -#ep* at pci? dev ? function ? # 3Com 3c59x -#ne* at pci? dev ? function ? # NE2000-compatible Ethernet -#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI -ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI -#bha* at pci? dev ? function ? # BusLogic 9xx SCSI -#pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI -pciide* at pci? dev ? function ? -kauaiata* at pci? dev ? function ? # Apple ATA 100 +ppb* at pci? # PCI-PCI bridges +pci* at ppb? + +siop* at pci? +#ncr* at pci? +fxp* at pci? +de* at pci? +#vme* at pci? +vgafb0 at pci? # PCI VGA graphics +#ep* at pci? # 3Com 3c59x +#ne* at pci? # NE2000-compatible Ethernet +#adv* at pci? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI +ahc* at pci? # Adaptec 294x, aic78x0 SCSI +#bha* at pci? # BusLogic 9xx SCSI +#pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI +pciide* at pci? +kauaiata* at pci? # Apple ATA 100 wdc* at kauaiata? -macobio0 at pci? dev ? function ? -gem* at pci? dev ? function ? # GMAC ethernet -hme* at pci? dev ? function ? # HME ethernet -dc* at pci? dev ? function ? # DEC Tulip 21143 clones -xl* at pci? dev ? function ? # 3C9xx ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet -ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -re* at pci? dev ? function ? # Realtek 8169/8169S/8110S -an* at pci? dev ? function ? # Cisco/Aironet 802.11DS -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS +macobio0 at pci? +gem* at pci? # GMAC ethernet +hme* at pci? # HME ethernet +dc* at pci? # DEC Tulip 21143 clones +xl* at pci? # 3C9xx ethernet +em* at pci? # Intel Pro/1000 ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +re* at pci? # Realtek 8169/8169S/8110S +an* at pci? # Cisco/Aironet 802.11DS +wi* at pci? # WaveLAN IEEE 802.11DS # how many of these are needed? -dcphy* at mii? phy ? # Digital Clone PHYs -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890 -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -#nsphyter* at mii? phy ? # NS83843 PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs -sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs -#tlphy* at mii? phy ? # ThunderLAN PHYs -#tqphy* at mii? phy ? # TDK Semiconductor PHYs -brgphy* at mii? phy ? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -eephy* at mii? phy ? # Marvell 88E1000 Gigabit PHYs -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # generic unknown PHYs - -macintr0 at macobio? # old interrupt controller -openpic0 at macobio? # openpic interrupt controller -bm* at macobio? # bmac ethernet -#mc* at macobio? # MACE ethernet +dcphy* at mii? # Digital Clone PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # Integrated Circuit Systems ICS1890 +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +#nsphyter* at mii? # NS83843 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +#qsphy* at mii? # Quality Semiconductor QS6612 PHYs +sqphy* at mii? # Seeq 80220/80221/80223 PHYs +#tlphy* at mii? # ThunderLAN PHYs +#tqphy* at mii? # TDK Semiconductor PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 Gigabit PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # generic unknown PHYs + +macintr0 at macobio? # old interrupt controller +openpic0 at macobio? # openpic interrupt controller +bm* at macobio? # bmac ethernet +#mc* at macobio? # MACE ethernet #esp* at macobio? flags 0x00ff# 53c9x SCSI #mesh* at macobio? flags 0xffff# MESH SCSI -#nvram* at macobio? # nvram -adb* at macobio? # Apple Desktop Bus -wi* at macobio? # Apple Airport 802.11DS -gpio* at macobio? # GPIO, PMU interrupt router. -gpio* at gpio? # GPIO, PMU interrupt router. -aed* at adb? # ADB Event Device -akbd* at adb? # ADB keyboard -wskbd* at akbd? console ? mux 1 -#ams* at adb? # ADB mouse +#nvram* at macobio? # nvram +adb* at macobio? # Apple Desktop Bus +wi* at macobio? # Apple Airport 802.11DS +gpio* at macobio? # GPIO, PMU interrupt router. +gpio* at gpio? # GPIO, PMU interrupt router. +aed* at adb? # ADB Event Device +akbd* at adb? # ADB keyboard +wskbd* at akbd? mux 1 +#ams* at adb? # ADB mouse #wsmouse* at ams? mux 0 -#abtn* at adb? # ADB button? +#abtn* at adb? # ADB button? zsc* at macobio? -zstty* at zsc? channel ? +zstty* at zsc? scsibus* at siop? #scsibus* at ncr? @@ -120,65 +120,65 @@ scsibus* at ahc? mediabay* at macobio? wdc* at mediabay? wdc* at macobio? -wd* at wdc? drive ? flags 0x0000 -wd* at pciide? channel ? drive ? -atapiscsi* at wdc? channel ? flags 0x0000 -atapiscsi* at pciide? channel ? flags 0x0000 +wd* at wdc? flags 0x0000 +wd* at pciide? +atapiscsi* at wdc? flags 0x0000 +atapiscsi* at pciide? flags 0x0000 scsibus* at atapiscsi? # PCI USB Controllers -ohci* at pci? # Open Host Controller -ehci* at pci? disable # Enhanced Host Controller +ohci* at pci? # Open Host Controller +ehci* at pci? disable # Enhanced Host Controller # USB bus support usb* at ohci? flags 0x1 usb* at ehci? uhub* at usb? -uhub* at uhub? port ? configuration ? interface ? +uhub* at uhub? -uhidev* at uhub? port ? configuration ? interface ? -uhid* at uhidev? reportid ? # USB Generic HID devices -ukbd* at uhidev? reportid ? # USB HID Keyboard devices -#ums* at uhub? port ? configuration ? # USB Mice +uhidev* at uhub? +uhid* at uhidev? # USB Generic HID devices +ukbd* at uhidev? # USB HID Keyboard devices +#ums* at uhub? # USB Mice #wsmouse* at ums? mux 0 -#ulpt* at uhub? port ? configuration ? # USB Printer -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -#uscanner* at uhub? port ? # USB Scanner driver -#usscanner* at uhub? port ? # USB SCSI scanners +#ulpt* at uhub? # USB Printer +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +#uscanner* at uhub? # USB Scanner driver +#usscanner* at uhub? # USB SCSI scanners #scsibus* at usscanner? -#uyap* at uhub? port ? # Y@P firmware loader -#ugen* at uhub? port ? configuration ? # USB Generic driver -umass* at uhub? port ? configuration ? # USB Mass Storage devices +#uyap* at uhub? # Y@P firmware loader +#ugen* at uhub? # USB Generic driver +umass* at uhub? # USB Mass Storage devices scsibus* at umass? # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? -cbb* at pci? dev ? function ? +cbb* at pci? cardslot* at cbb? -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet -#fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet -#rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -#wdc* at pcmcia? function ? +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#dc* at cardbus? # 21143, "tulip" clone ethernet +#fxp* at cardbus? # Intel PRO/100 ethernet +xl* at cardbus? # 3C575/3C656 ethernet +#rl* at cardbus? # RealTek 81[23]9 ethernet +#wdc* at pcmcia? wsdisplay* at vgafb? -wskbd* at ukbd? console ? mux 1 - -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? -#uk* at scsibus? target ? lun ? +wskbd* at ukbd? mux 1 + +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +#ch* at scsibus? +#ss* at scsibus? +#uk* at scsibus? pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index 76fd82435a4..b2894cd1cf9 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.20 2004/07/20 14:51:07 miod Exp $ +# $OpenBSD: files.macppc,v 1.21 2004/09/16 09:14:03 mickey Exp $ # # macppc-specific configuration info @@ -136,7 +136,7 @@ device openpic {} attach openpic at macobio file arch/macppc/dev/openpic.c openpic -device zsc {channel = -1} +device zsc {[channel = -1]} attach zsc at macobio file arch/macppc/dev/zs.c zsc needs-flag file arch/macppc/dev/z8530sc.c zsc diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index 972c78c3de7..4494458b3e4 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2004/01/28 23:53:56 miod Exp $ +# $OpenBSD: GENERIC,v 1.22 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -90,13 +90,13 @@ scsibus* at wdsc? scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/MINIROOT b/sys/arch/mvme68k/conf/MINIROOT index 8ea4b82389c..ac21e95e942 100644 --- a/sys/arch/mvme68k/conf/MINIROOT +++ b/sys/arch/mvme68k/conf/MINIROOT @@ -1,4 +1,4 @@ -# $OpenBSD: MINIROOT,v 1.11 2002/03/14 00:47:58 miod Exp $ +# $OpenBSD: MINIROOT,v 1.12 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -89,12 +89,12 @@ scsibus* at wdsc? scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? # 2 meg ramdisk option MINIROOTSIZE=4096 @@ -103,4 +103,4 @@ pseudo-device rd 2 #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147 index 6dae4a10b7c..114c620be2a 100644 --- a/sys/arch/mvme68k/conf/MVME147 +++ b/sys/arch/mvme68k/conf/MVME147 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME147,v 1.17 2001/11/08 23:53:10 miod Exp $ +# $OpenBSD: MVME147,v 1.18 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -49,13 +49,13 @@ vmel0 at vme0 scsibus* at wdsc? #scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162 index 1a33395188f..0bc648a8b03 100644 --- a/sys/arch/mvme68k/conf/MVME162 +++ b/sys/arch/mvme68k/conf/MVME162 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME162,v 1.20 2001/11/08 23:53:10 miod Exp $ +# $OpenBSD: MVME162,v 1.21 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -56,13 +56,13 @@ vmel0 at vme0 scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167 index d619f092863..9de2d24a187 100644 --- a/sys/arch/mvme68k/conf/MVME167 +++ b/sys/arch/mvme68k/conf/MVME167 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME167,v 1.20 2001/11/08 23:53:10 miod Exp $ +# $OpenBSD: MVME167,v 1.21 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -52,13 +52,13 @@ vmel0 at vme0 scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177 index f5b24104d8f..5147cff84f4 100644 --- a/sys/arch/mvme68k/conf/MVME177 +++ b/sys/arch/mvme68k/conf/MVME177 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME177,v 1.9 2001/11/08 23:53:10 miod Exp $ +# $OpenBSD: MVME177,v 1.10 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -52,13 +52,13 @@ vmel0 at vme0 scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK index 5f57a37ae5e..f2db6e1b3fc 100644 --- a/sys/arch/mvme68k/conf/RAMDISK +++ b/sys/arch/mvme68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.4 2004/01/04 00:29:50 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.5 2004/09/16 09:14:03 mickey Exp $ machine mvme68k m68k @@ -101,13 +101,13 @@ scsibus* at wdsc? scsibus* at ssh? scsibus* at vs? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 -#xd* at xdc? target ? +#xd* at xdc? pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index f9a1a124656..2f3e5782af8 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.43 2004/05/07 18:12:55 miod Exp $ +# $OpenBSD: GENERIC,v 1.44 2004/09/16 09:14:03 mickey Exp $ machine mvme88k m88k @@ -72,9 +72,9 @@ vs5 at vmes0 addr 0xffff7800 ipl 2 scsibus* at vs? scsibus* at osiop? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index f525dacd1ac..bd250ddd6f6 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.31 2004/05/07 18:12:55 miod Exp $ +# $OpenBSD: M187,v 1.32 2004/09/16 09:14:03 mickey Exp $ machine mvme88k m88k @@ -62,6 +62,6 @@ scsibus* at vs? scsibus* at osiop? # ------------------------------ scsibus0 devices ---------------------- -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index 9ebc241e5e9..a1b29f2a799 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.23 2004/04/29 14:33:27 miod Exp $ +# $OpenBSD: M188,v 1.24 2004/09/16 09:14:03 mickey Exp $ machine mvme88k m88k @@ -55,6 +55,6 @@ vs5 at vmes0 addr 0xffff7800 ipl 2 scsibus* at vs? # ------------------------------ scsibus devices ----------------------- -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index ad1085380ca..26bd0391bf0 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.25 2004/05/07 18:12:55 miod Exp $ +# $OpenBSD: M197,v 1.26 2004/09/16 09:14:03 mickey Exp $ machine mvme88k m88k @@ -62,6 +62,6 @@ scsibus* at vs? scsibus* at osiop? # ------------------------------ scsibus? devices ---------------------- -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index 082de531dcd..3eeb710c607 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.24 2004/05/07 18:12:55 miod Exp $ +# $OpenBSD: RAMDISK,v 1.25 2004/09/16 09:14:03 mickey Exp $ machine mvme88k m88k @@ -78,9 +78,9 @@ vs5 at vmes0 addr 0xffff7800 ipl 2 scsibus* at vs? scsibus* at osiop? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? pseudo-device loop 1 pseudo-device bpfilter 1 diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index 3156667dbbf..36539f219a8 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.4 2001/09/02 19:40:03 miod Exp $ +# $OpenBSD: GENERIC,v 1.5 2004/09/16 09:14:03 mickey Exp $ # # MVMEPPC GENERIC config file # @@ -23,26 +23,26 @@ config bsd swap generic mainbus0 at root cpu* at mainbus0 bugtty0 at mainbus0 -raven0 at mainbus0 # raven ASIC +raven0 at mainbus0 # raven ASIC #### PCI Bus devices. -openpic0 at raven0 # interrupt controller -#mpic0 at raven0 # interrupt controller -mpcpcibr0 at raven0 # PCI controller +openpic0 at raven0 # interrupt controller +#mpic0 at raven0 # interrupt controller +mpcpcibr0 at raven0 # PCI controller pci* at mpcpcibr0 -#ppb* at pci? dev ? function ? # PCI-PCI bridges -#pci* at ppb? bus ? +#ppb* at pci? # PCI-PCI bridges +#pci* at ppb? # host bridge identifiers -pchb* at pci? # PCI host bridge -pcib* at pci? dev ? function ? # PCI-ISA bridge -siop* at pci? dev ? function ? -#ncr* at pci? dev ? function ? -de* at pci? dev ? function ? -#vme* at pci? dev ? function ? -#pciide* at pci? dev ? function ? +pchb* at pci? # PCI host bridge +pcib* at pci? # PCI-ISA bridge +siop* at pci? +#ncr* at pci? +de* at pci? +#vme* at pci? +#pciide* at pci? # ISA Bus isa* at pcib? @@ -51,17 +51,17 @@ isa* at pcib? #pms* at pckbc? # PS/2 mouse for wsmouse #pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse #vga0 at isa? -#vga* at pci? dev ? function ? -#com* at isa? port 0x3f8 irq 4 # standard serial ports +#vga* at pci? +#com* at isa? port 0x3f8 irq 4 # standard serial ports #com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port +#lpt* at isa? port 0x3bc irq 7 # standard parallel port # how many of these are needed? -#ukphy* at mii? phy ? # generic unknown PHYs +#ukphy* at mii? # generic unknown PHYs -#nvram* at mainbus0 # nvram +#nvram* at mainbus0 # nvram #zsc* at obio? -#zstty* at zsc? channel ? +#zstty* at zsc? #### SCSI attachment points @@ -69,9 +69,9 @@ scsibus* at siop? #scsibus* at ncr? #wdc* at mainbus? flags 0x0 -#wd* at wdc? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 -#atapiscsi* at wdc? channel ? flags 0x0000 +#atapiscsi* at wdc? flags 0x0000 # ATAPI<->SCSI #scsibus* at atapiscsi? @@ -79,10 +79,8 @@ scsibus* at siop? #### SCSI Bus devices sd0 at scsibus? target 0 lun 0 -#st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? -#uk* at scsibus? target ? lun ? - - +#st* at scsibus? +#cd* at scsibus? +#ch* at scsibus? +#ss* at scsibus? +#uk* at scsibus? diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index cb400320489..bcec429647a 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2002/03/14 00:47:58 miod Exp $ +# $OpenBSD: RAMDISK,v 1.8 2004/09/16 09:14:03 mickey Exp $ # # MVMEPPC GENERIC config file # @@ -24,26 +24,26 @@ config bsd root on rd0a swap on rd0b mainbus0 at root cpu* at mainbus0 bugtty0 at mainbus0 -raven0 at mainbus0 # raven ASIC +raven0 at mainbus0 # raven ASIC #### PCI Bus devices. -openpic0 at raven0 # interrupt controller -#mpic0 at raven0 # interrupt controller -mpcpcibr0 at raven0 # PCI controller +openpic0 at raven0 # interrupt controller +#mpic0 at raven0 # interrupt controller +mpcpcibr0 at raven0 # PCI controller pci* at mpcpcibr0 -#ppb* at pci? dev ? function ? # PCI-PCI bridges -#pci* at ppb? bus ? +#ppb* at pci? # PCI-PCI bridges +#pci* at ppb? # host bridge identifiers -pchb* at pci? # PCI host bridge -pcib* at pci? dev ? function ? # PCI-ISA bridge -siop* at pci? dev ? function ? -#ncr* at pci? dev ? function ? -de* at pci? dev ? function ? -#vme* at pci? dev ? function ? -#pciide* at pci? dev ? function ? +pchb* at pci? # PCI host bridge +pcib* at pci? # PCI-ISA bridge +siop* at pci? +#ncr* at pci? +de* at pci? +#vme* at pci? +#pciide* at pci? # ISA Bus isa* at pcib? @@ -52,17 +52,17 @@ isa* at pcib? #pms* at pckbc? # PS/2 mouse for wsmouse #pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse #vga0 at isa? -#vga* at pci? dev ? function ? -#com* at isa? port 0x3f8 irq 4 # standard serial ports +#vga* at pci? +#com* at isa? port 0x3f8 irq 4 # standard serial ports #com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port +#lpt* at isa? port 0x3bc irq 7 # standard parallel port # how many of these are needed? -#ukphy* at mii? phy ? # generic unknown PHYs +#ukphy* at mii? # generic unknown PHYs -#nvram* at mainbus0 # nvram +#nvram* at mainbus0 # nvram #zsc* at obio? -#zstty* at zsc? channel ? +#zstty* at zsc? #### SCSI attachment points @@ -70,9 +70,9 @@ scsibus* at siop? #scsibus* at ncr? #wdc* at mainbus? flags 0x0 -#wd* at wdc? drive ? flags 0x0000 +#wd* at wdc? flags 0x0000 -#atapiscsi* at wdc? channel ? flags 0x0000 +#atapiscsi* at wdc? flags 0x0000 # ATAPI<->SCSI #scsibus* at atapiscsi? @@ -80,11 +80,11 @@ scsibus* at siop? #### SCSI Bus devices sd0 at scsibus? target 0 lun 0 -#st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? -#uk* at scsibus? target ? lun ? +#st* at scsibus? +#cd* at scsibus? +#ch* at scsibus? +#ss* at scsibus? +#uk* at scsibus? pseudo-device rd 1 # ram disk diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC index 9df34babddc..9510f9b9c8d 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.8 2004/09/09 22:11:39 pefo Exp $ +# $OpenBSD: GENERIC,v 1.9 2004/09/16 09:14:04 mickey Exp $ # machine sgi mips64 @@ -57,61 +57,56 @@ macepcibr0 at macebus0 # MACE controller PCI Bus bridge. pci* at macepcibr? #### SCSI -ahc* at pci? dev ? function ? -siop* at pci? dev ? function ? +ahc* at pci? +siop* at pci? scsibus* at siop? scsibus* at ahc? #### NICs -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -ep* at pci? dev ? function ? # 3Com 3c59x -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet -ne* at pci? dev ? function ? # NE2000-compatible Ethernet -ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet -vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet - - +dc* at pci? # 21143, "tulip" clone ethernet +ep* at pci? # 3Com 3c59x +fxp* at pci? # EtherExpress 10/100B ethernet +mtd* at pci? # Myson MTD803 3-in-1 Ethernet +ne* at pci? # NE2000-compatible Ethernet +ti* at pci? # Alteon ACEnic gigabit Ethernet +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet ##### Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -nsgphy* at mii? phy ? # NS gigabit PHYs -urlphy* at mii? phy ? # Realtek RTL8150L internal PHY -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs - - +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs #### WS console -#wsdisplay* at vga? console? -#wskbd* at ukbd? console ? mux 1 +#wsdisplay* at vga? +#wskbd* at ukbd? mux 1 #### SCSI Bus devices - -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? -uk* at scsibus? target ? lun ? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? #pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK index e56ccce608d..1a437851cf3 100644 --- a/sys/arch/sgi/conf/RAMDISK +++ b/sys/arch/sgi/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2004/09/15 16:07:31 pefo Exp $ +# $OpenBSD: RAMDISK,v 1.8 2004/09/16 09:14:04 mickey Exp $ # machine sgi mips64 @@ -75,62 +75,57 @@ macepcibr0 at macebus0 # MACE controller PCI Bus bridge. pci* at macepcibr? # PCI is on pci bridge #### SCSI controllers -ahc* at pci? dev ? function ? -siop* at pci? dev ? function ? +ahc* at pci? +siop* at pci? #### NICs -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -ep* at pci? dev ? function ? # 3Com 3c59x -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet -ne* at pci? dev ? function ? # NE2000-compatible Ethernet -ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet -vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet - - +dc* at pci? # 21143, "tulip" clone ethernet +ep* at pci? # 3Com 3c59x +fxp* at pci? # EtherExpress 10/100B ethernet +mtd* at pci? # Myson MTD803 3-in-1 Ethernet +ne* at pci? # NE2000-compatible Ethernet +ti* at pci? # Alteon ACEnic gigabit Ethernet +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet ##### Media Independent Interface (mii) drivers -exphy* at mii? phy ? # 3Com internal PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -icsphy* at mii? phy ? # ICS 1890 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -sqphy* at mii? phy ? # Seeq 8x220 PHYs -rlphy* at mii? phy ? # RealTek 8139 internal PHYs -mtdphy* at mii? phy ? # Myson MTD972 PHYs -dcphy* at mii? phy ? # Digital Clone PHYs -acphy* at mii? phy ? # Altima AC101 PHYs -amphy* at mii? phy ? # AMD 79C873 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -brgphy* at mii? phy ? # Broadcom Gigabit PHYs -eephy* at mii? phy ? # Marvell 88E1000 series PHY -xmphy* at mii? phy ? # XaQti XMAC-II PHYs -nsgphy* at mii? phy ? # NS gigabit PHYs -urlphy* at mii? phy ? # Realtek RTL8150L internal PHY -rgephy* at mii? phy ? # Realtek 8169S/8110S PHY -ukphy* at mii? phy ? # "unknown" PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs #### SCSI Bus devices - scsibus* at ahc? scsibus* at siop? -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? -#uk* at scsibus? target ? lun ? - +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +#ch* at scsibus? +#ss* at scsibus? +#uk* at scsibus? #### PSEUDO Devices - pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter ports diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 457aed5a323..1c25b83e4ac 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.75 2004/03/09 15:24:27 miod Exp $ +# $OpenBSD: GENERIC,v 1.76 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -97,9 +97,9 @@ zs1 at obio0 addr 0xf0000000 level 12 # sun4/200 and sun4/300 zs1 at obio0 addr 0x00000000 level 12 # sun4/100 zs2 at obio0 addr 0xe0000000 level 12 # sun4/300 -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? # Magma serial/parallel port devices magma* at sbus? # magma serial cards @@ -189,13 +189,13 @@ xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44 xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45 xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46 xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47 -xd* at xdc? drive ? +xd* at xdc? # Xylogics 451 or 451 VME SMD disk controllers and disks, found # on sun4 systems. xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48 xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49 -xy* at xyc? drive ? +xy* at xyc? # NCR5380-based "Sun SCSI 3" VME SCSI controller. # This driver has several flags which may be enabled by OR'ing @@ -304,27 +304,27 @@ tctrl0 at obio0 # Sun PCMCIA bridge stp* at sbus? -pcmcia* at stp? socket ? +pcmcia* at stp? # PCMCIA controller found on Tadpole SPARCbook tslot* at sbus? -pcmcia* at tslot? socket ? +pcmcia* at tslot? # PCMCIA devices -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -ne* at pcmcia? function ? # NE2000-compat ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#com* at pcmcia? function ? # PCMCIA modems/serial ports +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#an* at pcmcia? # Aironet IEEE 802.11DS +ne* at pcmcia? # NE2000-compat ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#com* at pcmcia? # PCMCIA modems/serial ports # Media Independent Interface (mii) drivers (required by hme, ne, ep) -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -ukphy* at mii? phy ? +bmtphy* at mii? # Broadcom 10/100 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? +qsphy* at mii? # Quality Semi QS6612 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. @@ -335,12 +335,12 @@ scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. fdc0 at mainbus0 # sun4c controller diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index f121b7bf61b..0a2aef0b5ff 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.51 2004/03/12 06:04:01 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.52 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -109,9 +109,9 @@ zs1 at obio0 addr 0xf0000000 level 12 # sun4/200 and sun4/300 zs1 at obio0 addr 0x00000000 level 12 # sun4/100 zs2 at obio0 addr 0xe0000000 level 12 # sun4/300 -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? # SUNW,xbox SBus Expansion Subsystem xbox* at sbus? # SBus Expansion box @@ -173,8 +173,8 @@ ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c # HappyMeal ethernet hme* at sbus? # Media Independent Interface (mii) drivers (required for hme) -nsphy* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs # Quad-ethernet glue device, and sub-devices qec* at sbus? @@ -187,28 +187,28 @@ xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44 xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45 xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46 xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47 -xd* at xdc? drive ? +xd* at xdc? # Xylogics 451 or 451 VME SMD disk controllers and disks, found # on sun4 systems. xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48 xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49 -xy* at xyc? drive ? +xy* at xyc? # Sun PCMCIA bridge #stp* at sbus? -#pcmcia* at stp? socket ? +#pcmcia* at stp? # PCMCIA controller found on Tadpole SPARCbook #tslot* at sbus? -#pcmcia* at tslot? socket ? +#pcmcia* at tslot? # PCMCIA devices -#wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -#ne* at pcmcia? function ? # NE2000-compat ethernet -#ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#com* at pcmcia? function ? # PCMCIA modems/serial ports +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#an* at pcmcia? # Aironet IEEE 802.11DS +#ne* at pcmcia? # NE2000-compat ethernet +#ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#com* at pcmcia? # PCMCIA modems/serial ports # NCR5380-based "Sun SCSI 3" VME SCSI controller. # This driver has several flags which may be enabled by OR'ing @@ -320,12 +320,12 @@ scsibus* at sw? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -#ss* at scsibus? target ? lun ? # SCSI scanners -#uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +#ss* at scsibus? # SCSI scanners +#uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. fdc0 at mainbus0 # sun4c controller diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index b13d7884bbd..bb7684d79b7 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.28 2003/05/14 01:07:22 miod Exp $ +# $OpenBSD: SUN4,v 1.29 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -60,9 +60,9 @@ zs1 at obio0 addr 0xf0000000 level 12 # sun4/200 and sun4/300 zs1 at obio0 addr 0x00000000 level 12 # sun4/100 zs2 at obio0 addr 0xe0000000 level 12 # sun4/300 -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? # # Note the flags on the esp entries below, that work around @@ -99,13 +99,13 @@ xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44 xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45 xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46 xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47 -xd* at xdc? drive ? +xd* at xdc? # Xylogics 451 or 451 VME SMD disk controllers and disks, found # on sun4 systems. xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48 xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49 -xy* at xyc? drive ? +xy* at xyc? # NCR5380-based "Sun SCSI 3" VME SCSI controller. # This driver has several flags which may be enabled by OR'ing @@ -163,12 +163,12 @@ scsibus* at sw? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices #pseudo-device strip 1 # radio clock diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 01d82483f85..9f4d85477a4 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.49 2004/05/09 22:08:04 miod Exp $ +# $OpenBSD: SUN4C,v 1.50 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -49,9 +49,9 @@ timer0 at mainbus0 # sun4c zs0 at mainbus0 # sun4c zs1 at mainbus0 # sun4c -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? # Magma serial/parallel port devices magma* at sbus? # magma serial cards @@ -144,22 +144,22 @@ wsdisplay* at rfx? # Sun PCMCIA bridge stp* at sbus? -pcmcia* at stp? socket ? +pcmcia* at stp? # PCMCIA devices -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -ne* at pcmcia? function ? # NE2000-compat ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#com* at pcmcia? function ? # PCMCIA modems/serial ports +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#an* at pcmcia? # Aironet IEEE 802.11DS +ne* at pcmcia? # NE2000-compat ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#com* at pcmcia? # PCMCIA modems/serial ports # Media Independent Interface (mii) drivers (required by ne and ep) -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? -tqphy* at mii? phy ? # TDK 78Q212x PHYs -ukphy* at mii? phy ? +bmtphy* at mii? # Broadcom 10/100 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. @@ -168,12 +168,12 @@ scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. fdc0 at mainbus0 # sun4c controller diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index d1373748112..fd2f6d4e0a8 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.62 2004/05/09 22:08:04 miod Exp $ +# $OpenBSD: SUN4M,v 1.63 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -62,9 +62,9 @@ led0 at obio0 # sun4m zs0 at obio0 # sun4m zs1 at obio0 # sun4m -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? # Magma serial/parallel port devices magma* at sbus? # magma serial cards @@ -194,27 +194,27 @@ tctrl0 at obio0 # Sun PCMCIA bridge stp* at sbus? -pcmcia* at stp? socket ? +pcmcia* at stp? # PCMCIA controller found on Tadpole SPARCbook tslot* at sbus? -pcmcia* at tslot? socket ? +pcmcia* at tslot? # PCMCIA devices -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#an* at pcmcia? function ? # Aironet IEEE 802.11DS -ne* at pcmcia? function ? # NE2000-compat ethernet -ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet -#com* at pcmcia? function ? # PCMCIA modems/serial ports +wi* at pcmcia? # WaveLAN IEEE 802.11DS +#an* at pcmcia? # Aironet IEEE 802.11DS +ne* at pcmcia? # NE2000-compat ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +#com* at pcmcia? # PCMCIA modems/serial ports # Media Independent Interface (mii) drivers (required by hme, ne, ep) -bmtphy* at mii? phy ? # Broadcom 10/100 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -nsphyter* at mii? phy ? -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -tqphy* at mii? phy ? # TDK 78Q212x PHYs -ukphy* at mii? phy ? +bmtphy* at mii? # Broadcom 10/100 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? +qsphy* at mii? # Quality Semi QS6612 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. @@ -223,15 +223,15 @@ scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices # Floppy controller and drive found on SPARCstations. -fdc0 at obio0 # sun4m controller -fd* at fdc0 # the drive itself +fdc0 at obio0 # sun4m controller +fd* at fdc0 # the drive itself #pseudo-device strip 1 # radio clock diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index 8789795020e..e8798d4f82f 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc,v 1.59 2004/02/29 21:44:12 miod Exp $ +# $OpenBSD: files.sparc,v 1.60 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 @@ -61,7 +61,7 @@ device memreg attach memreg at mainbus, obio file arch/sparc/sparc/memreg.c -device zs { channel = -1 } +device zs {[channel = -1]} attach zs at mainbus, obio file arch/sparc/dev/zs.c zs needs-flag file arch/sparc/dev/z8530sc.c zs @@ -239,14 +239,14 @@ file arch/sparc/dev/if_le.c le attach ie at obio, vmes, vmel file arch/sparc/dev/if_ie.c ie -device xdc {drive = -1} +device xdc {[drive = -1]} attach xdc at vmel device xd: disk attach xd at xdc file arch/sparc/dev/xd.c xd needs-flag major {xd = 10} -device xyc {drive = -1} +device xyc {[drive = -1]} attach xyc at vmes device xy: disk attach xy at xyc diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 130289b82f4..1ac62a5f3d5 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.98 2004/08/19 21:49:01 miod Exp $ +# $OpenBSD: GENERIC,v 1.99 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $ machine sparc64 @@ -30,113 +30,113 @@ pci* at psycho? # schizo* at mainbus0 pci* at schizo? # pci* at ppb? -ppb* at pci? dev ? function ? +ppb* at pci? ebus* at pci? # PCI Ethernet -hme* at pci? dev ? function ? -gem* at pci? dev ? function ? -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet +hme* at pci? +gem* at pci? +#ti* at pci? # Alteon Tigon 1Gb ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +xl* at pci? # 3C9xx ethernet +dc* at pci? # 21143, "tulip" clone ethernet +em* at pci? # Intel Pro/1000 ethernet # PCI SCSI -ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers +ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? -siop* at pci? dev ? function ? # NCR 538XX SCSI controllers +siop* at pci? # NCR 538XX SCSI controllers scsibus* at siop? -isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel +isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel option ISP_COMPILE_FW=1 # PCI Display -vgafb* at pci? dev ? function ? +vgafb* at pci? wsdisplay* at vgafb? # PCI crypto -hifn* at pci? dev ? function ? # Hifn 7751/7811/7951 -#nofn* at pci? dev ? function ? # Hifn 7814/7851/7854 -lofn* at pci? dev ? function ? # Hifn 6500 -ubsec* at pci? dev ? function ? # Broadcom 580[125]/582[012] +hifn* at pci? # Hifn 7751/7811/7951 +#nofn* at pci? # Hifn 7814/7851/7854 +lofn* at pci? # Hifn 6500 +ubsec* at pci? # Broadcom 580[125]/582[012] # PCI sound -autri* at pci? dev ? function ? flags 0x0000 # Trident 4D WAVE -eap* at pci? dev ? function ? # Ensoniq AudioPCI S5016 -eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive +autri* at pci? flags 0x0000 # Trident 4D WAVE +eap* at pci? # Ensoniq AudioPCI S5016 +eso* at pci? # ESS Solo-1 PCI AudioDrive -puc* at pci? # PCI "universial" comm device -com* at puc? port ? -#lpt* at puc? port ? +puc* at pci? # PCI "universial" comm device +com* at puc? +#lpt* at puc? # Sound support -audio* at audioce? -audio* at audiocs? -audio* at autri? -audio* at eap? -audio* at eso? +audio* at audioce? +audio* at audiocs? +audio* at autri? +audio* at eap? +audio* at eso? # OPL[23] FM synthesizers -opl* at eso? +opl* at eso? # MIDI support -midi* at autri? -midi* at opl? +midi* at autri? +midi* at opl? # PCI USB Controllers -ohci* at pci? dev ? function ? # Open Host Controller -uhci* at pci? dev ? function ? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) # USB bus support usb* at ohci? flags 0x1 usb* at uhci? flags 0x1 # USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? port ? configuration ? # USB Hubs -umodem* at uhub? port ? configuration ? # USB Modems/Serial +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvisor* at uhub? port ? configuration ? # Handspring Visor +uvisor* at uhub? # Handspring Visor ucom* at uvisor? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? portno ? -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? -uaudio* at uhub? port ? configuration ? # USB Audio +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uaudio* at uhub? # USB Audio audio* at uaudio? -umidi* at uhub? port ? configuration ? # USB MIDI +umidi* at uhub? # USB MIDI midi* at umidi? -ulpt* at uhub? port ? configuration ? # USB Printers -umass* at uhub? port ? configuration ? # USB Mass Storage devices +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices -ums* at uhidev? reportid ? # USB mouse +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? # USB keyboard -wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? # USB generic HID support -aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet -cue* at uhub? port ? # CATC USB-EL1201A based Ethernet -kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -cdce* at uhub? port ? # CDC Ethernet -upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' -url* at uhub? port ? # Realtek RTL8150L based adapters -wi* at uhub? port ? # WaveLAN IEEE 802.11DS -urio* at uhub? port ? # Diamond Multimedia Rio 500 -uscanner* at uhub? port ? # USB Scanners -usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +urio* at uhub? # Diamond Multimedia Rio 500 +uscanner* at uhub? # USB Scanners +usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? -uyap* at uhub? port ? # Y@P firmware loader -udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? port ? configuration ? # USB Generic driver +uyap* at uhub? # Y@P firmware loader +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +ugen* at uhub? # USB Generic driver #### Standard system devices -- all required for a given architecture @@ -154,15 +154,15 @@ comkbd* at ebus? wskbd* at comkbd? # i8042 based serial ports (PS/2 ports) -pckbc* at ebus? # controller -pckbd* at pckbc? # ps2 keyboard -wskbd* at pckbd? console ? # generic keyboard layer -pms* at pckbc? # ps2 mouse -wsmouse* at pms? # generic mouse -pmsi* at pckbc? # ps2 "intelli"mouse -wsmouse* at pmsi? # generic mouse +pckbc* at ebus? # controller +pckbd* at pckbc? # ps2 keyboard +wskbd* at pckbd? # generic keyboard layer +pms* at pckbc? # ps2 mouse +wsmouse* at pms? # generic mouse +pmsi* at pckbc? # ps2 "intelli"mouse +wsmouse* at pmsi? # generic mouse -audioce* at ebus? # ebus cs4231 +audioce* at ebus? # ebus cs4231 # parallel ports lpt* at ebus? @@ -172,12 +172,12 @@ uperf* at ebus? uperf* at sbus? zs* at sbus? -zstty* at zs? channel ? -zskbd* at zs? channel ? -wskbd* at zskbd? console ? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? ## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console +pcons0 at mainbus0 # PROM console ## Mostek/DS1287 clocks clock* at sbus? @@ -211,9 +211,9 @@ spif* at sbus? stty* at spif? sbpp* at spif? -pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0a00 -atapiscsi* at pciide? channel ? +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0a00 +atapiscsi* at pciide? scsibus* at atapiscsi? # @@ -240,64 +240,64 @@ scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -st* at scsibus? target ? lun ? # SCSI tapes -cd* at scsibus? target ? lun ? # SCSI CD-ROMs -ch* at scsibus? target ? lun ? # SCSI changer devices -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # unknown SCSI devices +sd* at scsibus? # SCSI disks +st* at scsibus? # SCSI tapes +cd* at scsibus? # SCSI CD-ROMs +ch* at scsibus? # SCSI changer devices +ss* at scsibus? # SCSI scanners +uk* at scsibus? # unknown SCSI devices # Media Independent Interface (mii) drivers) -exphy* at mii? phy ? # 3Com internal PHYs -brgphy* at mii? phy ? # Broadcom PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -dcphy* at mii? phy ? # Digital clone PHYs -amphy* at mii? phy ? # AMD AM79c873 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -ukphy* at mii? phy ? # Unknown PHYs - -bwtwo* at sbus? # bw2, sbus mono framebuffer +exphy* at mii? # 3Com internal PHYs +brgphy* at mii? # Broadcom PHYs +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +dcphy* at mii? # Digital clone PHYs +amphy* at mii? # AMD AM79c873 PHYs +iophy* at mii? # Intel 82553 PHYs +inphy* at mii? # Intel 82555 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +ukphy* at mii? # Unknown PHYs + +bwtwo* at sbus? # bw2, sbus mono framebuffer wsdisplay* at bwtwo? -cgsix* at sbus? # cg6, sbus color framebuffer +cgsix* at sbus? # cg6, sbus color framebuffer wsdisplay* at cgsix? -cgthree* at sbus? # cg3, sbus color framebuffer +cgthree* at sbus? # cg3, sbus color framebuffer wsdisplay* at cgthree? -zx* at sbus? # Sun Leo (ZX) framebuffer +zx* at sbus? # Sun Leo (ZX) framebuffer wsdisplay* at zx? -rfx* at sbus? # RasterFlex framebuffer series +rfx* at sbus? # RasterFlex framebuffer series wsdisplay* at rfx? -mgx* at sbus? # SMS MGX/MGXPlus framebuffer +mgx* at sbus? # SMS MGX/MGXPlus framebuffer wsdisplay* at mgx? -agten* at sbus? # Fujitsu AG-10e framebuffer +agten* at sbus? # Fujitsu AG-10e framebuffer wsdisplay* at agten? audiocs* at sbus? -asio* at sbus? # Aurora 210SJ +asio* at sbus? # Aurora 210SJ com* at asio? -apio* at sbus? # Aurora 210SJ +apio* at sbus? # Aurora 210SJ lpt* at apio? -stp* at sbus? # STP4020 -pcmcia* at stp? socket ? -#com* at pcmcia? function ? # PCMCIA modems/serial ports -wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS -wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS +stp* at sbus? # STP4020 +pcmcia* at stp? +#com* at pcmcia? # PCMCIA modems/serial ports +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS creator* at mainbus0 creator* at upa0 wsdisplay* at creator? -#pseudo-device hotplug 1 # devices hot plugging +#pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices #pseudo-device wsmux 2 diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 9b44f4c1fad..00924c4c5ab 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.28 2004/08/26 03:44:49 brad Exp $ +# $OpenBSD: RAMDISK,v 1.29 2004/09/16 09:14:04 mickey Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -34,32 +34,32 @@ mainbus0 at root cpu0 at mainbus0 # Bus types found on SPARC systems. -sbus0 at mainbus0 # Ultra 1 +sbus0 at mainbus0 # Ultra 1 psycho* at mainbus0 -pci* at psycho? # Ultra 5 +pci* at psycho? # Ultra 5 pci* at ppb? -ppb* at pci? dev ? function ? +ppb* at pci? ebus* at pci? # PCI Ethernet -hme* at pci? dev ? function ? -gem* at pci? dev ? function ? -#ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet -xl* at pci? dev ? function ? # 3C9xx ethernet -dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet -em* at pci? dev ? function ? # Intel Pro/1000 ethernet +hme* at pci? +gem* at pci? +#ti* at pci? # Alteon Tigon 1Gb ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +xl* at pci? # 3C9xx ethernet +dc* at pci? # 21143, "tulip" clone ethernet +em* at pci? # Intel Pro/1000 ethernet auxio* at ebus? auxio* at sbus? #com* at ebus? -clock* at sbus? # Mostek clock +clock* at sbus? # Mostek clock clock* at ebus? -rtc* at ebus? # DS1287/M5819 clock -timer* at mainbus0 # Timer chip +rtc* at ebus? # DS1287/M5819 clock +timer* at mainbus0 # Timer chip ## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console +pcons0 at mainbus0 # PROM console ## Lance Ethernet - AMD7990 le* at sbus? @@ -74,9 +74,9 @@ qe* at qec? be* at qec? hme* at sbus? -pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0a00 -atapiscsi* at pciide? channel ? +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0a00 +atapiscsi* at pciide? scsibus* at atapiscsi? # @@ -89,15 +89,15 @@ scsibus* at atapiscsi? # devices should be allowed to disconnect for the SCSI bus # to operate acceptably. # -dma* at sbus? # SBus -esp* at dma? flags 0x0000 # SBus +dma* at sbus? # SBus +esp* at dma? flags 0x0000 # SBus esp* at sbus? isp* at sbus? option ISP_COMPILE_1000_FW=1 scsibus* at esp? -siop* at pci? dev ? function ? -isp* at pci? dev ? function ? +siop* at pci? +isp* at pci? option ISP_COMPILE_FW=1 scsibus* at siop? @@ -105,20 +105,20 @@ scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -cd* at scsibus? target ? lun ? # SCSI CD-ROMs +sd* at scsibus? # SCSI disks +cd* at scsibus? # SCSI CD-ROMs # Media Independent Interface (mii) drivers) -exphy* at mii? phy ? # 3Com internal PHYs -brgphy* at mii? phy ? # Broadcom PHYs -nsphy* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -dcphy* at mii? phy ? # Digital clone PHYs -amphy* at mii? phy ? # AMD AM79c873 PHYs -iophy* at mii? phy ? # Intel 82553 PHYs -inphy* at mii? phy ? # Intel 82555 PHYs -lxtphy* at mii? phy ? # Level1 LXT970 PHYs -ukphy* at mii? phy ? # Unknown PHYs +exphy* at mii? # 3Com internal PHYs +brgphy* at mii? # Broadcom PHYs +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +dcphy* at mii? # Digital clone PHYs +amphy* at mii? # AMD AM79c873 PHYs +iophy* at mii? # Intel 82553 PHYs +inphy* at mii? # Intel 82555 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +ukphy* at mii? # Unknown PHYs pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index cb892e0c883..7dda213f906 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.7 2004/03/20 14:56:05 deraadt Exp $ +# $OpenBSD: RAMDISKU1,v 1.8 2004/09/16 09:14:04 mickey Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -63,20 +63,20 @@ hme* at sbus? # devices should be allowed to disconnect for the SCSI bus # to operate acceptably. # -dma* at sbus? # SBus -esp* at dma? flags 0x0000 # SBus +dma* at sbus? # SBus +esp* at dma? flags 0x0000 # SBus esp* at sbus? scsibus* at esp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -#cd* at scsibus? target ? lun ? # SCSI CD-ROMs +sd* at scsibus? # SCSI disks +#cd* at scsibus? # SCSI CD-ROMs # Media Independent Interface (mii) drivers) -nsphy* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -ukphy* at mii? phy ? # Unknown PHYs +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +ukphy* at mii? # Unknown PHYs pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 4b0fbf52c7a..1ef1bf17d78 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.6 2004/01/04 00:29:50 deraadt Exp $ +# $OpenBSD: RAMDISKU5,v 1.7 2004/09/16 09:14:04 mickey Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -35,40 +35,40 @@ cpu0 at mainbus0 # Bus types found on SPARC systems. psycho* at mainbus0 -pci* at psycho? # Ultra 5 +pci* at psycho? # Ultra 5 pci* at ppb? -ppb* at pci? dev ? function ? +ppb* at pci? ebus* at pci? -hme* at pci? dev ? function ? -gem* at pci? dev ? function ? +hme* at pci? +gem* at pci? auxio* at ebus? #com* at ebus? -clock* at ebus? # Mostek clock +clock* at ebus? # Mostek clock ## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console +pcons0 at mainbus0 # PROM console -timer* at mainbus0 # Timer chip (some systems) +timer* at mainbus0 # Timer chip (some systems) -pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0a00 -atapiscsi* at pciide? channel ? +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0a00 +atapiscsi* at pciide? scsibus* at atapiscsi? -siop* at pci? dev ? function ? +siop* at pci? scsibus* at siop? # These entries find devices on all SCSI busses and assign # unit numers dynamically. -sd* at scsibus? target ? lun ? # SCSI disks -#cd* at scsibus? target ? lun ? # SCSI CD-ROMs +sd* at scsibus? # SCSI disks +#cd* at scsibus? # SCSI CD-ROMs # Media Independent Interface (mii) drivers) -nsphy* at mii? phy ? # NS and compatible PHYs -qsphy* at mii? phy ? # Quality Semi QS6612 PHYs -ukphy* at mii? phy ? # Unknown PHYs +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +ukphy* at mii? # Unknown PHYs pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index c2efe117c5e..f4efde31a36 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.48 2003/12/04 11:11:24 miod Exp $ +# $OpenBSD: files.sparc64,v 1.49 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -148,7 +148,7 @@ file arch/sparc64/dev/comkbd_ebus.c comkbd attach lpt at ebus with lpt_ebus file arch/sparc64/dev/lpt_ebus.c lpt_ebus -device zs {channel = -1} +device zs {[channel = -1]} attach zs at mainbus, sbus file arch/sparc64/dev/zs.c zs needs-flag file arch/sparc64/dev/z8530sc.c zs diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 577caa6de4f..f6e207a51c4 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2003/03/08 04:43:45 hugh Exp $ +# $OpenBSD: GENERIC,v 1.35 2004/09/16 09:14:04 mickey Exp $ # $NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $ machine vax # machine type; required @@ -127,12 +127,12 @@ mt* at mscpbus? drive? # MSCP tape scsibus* at asc? scsibus* at ncr? -sd* at scsibus? target? lun? -st* at scsibus? target? lun? -cd* at scsibus? target? lun? -ch* at scsibus? target? lun? -ss* at scsibus? target? lun? -uk* at scsibus? target? lun? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? # Workstation console wsdisplay0 at smg? @@ -142,6 +142,6 @@ wsdisplay0 at smg? #wsdisplay0 at qv0 lkkbd0 at dz0 line 0 -wskbd* at lkkbd? console ? +wskbd* at lkkbd? lkms0 at dz0 line 1 wsmouse* at lkms? diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 1fb740c939c..700114fb3a2 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.21 2004/01/04 00:29:50 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.22 2004/09/16 09:14:04 mickey Exp $ machine vax # machine type @@ -139,12 +139,12 @@ mt* at mscpbus? drive? # MSCP tape scsibus* at asc? scsibus* at ncr? -sd* at scsibus? target? lun? -st* at scsibus? target? lun? -cd* at scsibus? target? lun? -#ch* at scsibus? target? lun? -#ss* at scsibus? target? lun? -#uk* at scsibus? target? lun? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +#ch* at scsibus? +#ss* at scsibus? +#uk* at scsibus? # Workstation console #wsdisplay0 at smg? @@ -153,7 +153,7 @@ cd* at scsibus? target? lun? #wsdisplay0 at qv0 #lkkbd0 at dz0 line 0 -#wskbd* at lkkbd? console ? +#wskbd* at lkkbd? #lkms0 at dz0 line 1 #wsmouse* at lkms? diff --git a/sys/dev/i2o/files.i2o b/sys/dev/i2o/files.i2o index 19be362bea6..6fbb932adf5 100644 --- a/sys/dev/i2o/files.i2o +++ b/sys/dev/i2o/files.i2o @@ -1,6 +1,6 @@ -# $OpenBSD: files.i2o,v 1.6 2001/07/04 04:36:43 mickey Exp $ +# $OpenBSD: files.i2o,v 1.7 2004/09/16 09:14:02 mickey Exp $ -device iop {tid = -1}: scsi +device iop {[tid = -1]}: scsi file dev/i2o/iop.c iop & iop_pci needs-flag # SCSI peripheral diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index db9e38b9952..6654c3b758d 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.158 2004/09/15 21:32:42 mickey Exp $ +# $OpenBSD: files.pci,v 1.159 2004/09/16 09:14:02 mickey Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -405,7 +405,7 @@ file dev/pci/if_sk.c skc | sk # PCI "universal" communication device driver, for PCI com, lpt, etc. ports # (see documentation in the driver for what, exactly, should be supported) -device puc { port = -1 } +device puc {[port = -1]} attach puc at pci file dev/pci/puc.c puc file dev/pci/pucdata.c puc diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc index 5c8b0895d6e..387eeb05a03 100644 --- a/sys/dev/tc/files.tc +++ b/sys/dev/tc/files.tc @@ -1,4 +1,4 @@ -# $OpenBSD: files.tc,v 1.6 2002/05/02 22:56:06 miod Exp $ +# $OpenBSD: files.tc,v 1.7 2004/09/16 09:14:02 mickey Exp $ # $NetBSD: files.tc,v 1.26 2001/11/28 10:21:24 lukem Exp $ # # Config file and device description for machine-independent @@ -9,7 +9,7 @@ device tc {[slot = -1], [offset = -1]} file dev/tc/tc.c tc needs-flag # IOCTL ASIC -device ioasic { offset = -1 } +device ioasic {[offset = -1]} attach ioasic at tc file dev/tc/ioasic_subr.c ioasic @@ -29,7 +29,7 @@ attach fta at tc file dev/tc/if_fta.c fta # TCDS dual channel SCSI -device tcds { chip = -1 } +device tcds {[chip = -1]} attach tcds at tc file dev/tc/tcds.c tcds |