From 8354e685085cd9ea13a0d2e51cde4a42429e8398 Mon Sep 17 00:00:00 2001 From: thorpej Date: Mon, 16 Feb 1998 22:12:45 +0000 Subject: [PATCH] Remove "class" declarations, and add "devclass" declarations where appropriate. Fix several inconsistencies between device class and attributes. Mostly from Chris Demetriou. --- sys/arch/alpha/conf/files.alpha | 60 +++++++------- sys/arch/amiga/conf/files.amiga | 118 ++++++++++++++-------------- sys/arch/arm32/conf/files.arm32 | 76 +++++++++--------- sys/arch/atari/conf/files.atari | 46 +++++------ sys/arch/bebox/conf/files.bebox | 26 +++--- sys/arch/hp300/conf/files.hp300 | 52 ++++++------ sys/arch/i386/conf/files.i386 | 34 ++++---- sys/arch/mac68k/conf/files.mac68k | 38 ++++----- sys/arch/mvme68k/conf/files.mvme68k | 22 +++--- sys/arch/pc532/conf/files.pc532 | 14 ++-- sys/arch/pica/conf/files.pica | 26 +++--- sys/arch/pmax/conf/files.pmax | 36 ++++----- sys/arch/sparc/conf/files.sparc | 68 ++++++++-------- sys/arch/sun3/conf/files.sun3 | 58 +++++++------- sys/arch/vax/conf/files.vax | 114 +++++++++++++-------------- sys/arch/vax/mscp/files.mscp | 10 +-- sys/arch/x68k/conf/files.x68k | 30 +++---- sys/conf/files | 50 ++++++------ sys/dev/ata/files.ata | 4 +- sys/dev/eisa/files.eisa | 8 +- sys/dev/isa/files.isa | 54 ++++++------- sys/dev/isapnp/files.isapnp | 6 +- sys/dev/mii/files.mii | 8 +- sys/dev/ofisa/files.ofisa | 4 +- sys/dev/ofw/files.ofw | 14 ++-- sys/dev/pci/files.pci | 16 ++-- sys/dev/pcmcia/files.pcmcia | 6 +- sys/dev/scsipi/files.scsipi | 22 +++--- sys/dev/tc/files.tc | 13 ++- sys/dev/vme/files.vme | 14 ++-- 30 files changed, 524 insertions(+), 523 deletions(-) diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 8c8e5c2c1557..16494c663129 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $NetBSD: files.alpha,v 1.62 1998/01/29 22:23:06 ross Exp $ +# $NetBSD: files.alpha,v 1.63 1998/02/16 22:12:45 thorpej Exp $ # # alpha-specific configuration info @@ -34,17 +34,17 @@ file arch/alpha/common/shared_intr.c alpha_shared_intr | dec_eb164 | define alpha_sgmap file arch/alpha/common/sgmap_common.c alpha_sgmap | dec_3000_500 -device vga class dull: wsconsdev +device vga: wsconsdev file arch/alpha/common/vga.c vga # # Bus-independent devices # -device mainbus class dull { } # no locators (yet?) +device mainbus { } # no locators (yet?) attach mainbus at root -device cpu class cpu { } # not really optional +device cpu { } # not really optional attach cpu at mainbus file arch/alpha/alpha/cpu.c cpu @@ -82,7 +82,7 @@ file arch/alpha/wscons/wscons_rops.c raster # # "Workstation Console" glue; attaches frame buffer to emulator & kbd. # -device wscons class tty +device wscons: tty attach wscons at wsconsdev file arch/alpha/wscons/wscons.c wscons needs-flag file arch/alpha/wscons/wscons_emul.c wscons @@ -96,19 +96,19 @@ file arch/alpha/wscons/ms.c wscons # TurboLaser Bus Support # -device tlsb class dull { node = -1, offset = -1 } +device tlsb { node = -1, offset = -1 } attach tlsb at mainbus file arch/alpha/tlsb/tlsb.c tlsb & dec_kn8ae -device kft class dull { } +device kft { } attach kft at tlsb file arch/alpha/tlsb/kftxx.c kft -device tlsbmem class dull +device tlsbmem attach tlsbmem at tlsb file arch/alpha/tlsb/tlsbmem.c tlsbmem -device gbus class dull { offset = -1 } +device gbus { offset = -1 } attach gbus at tlsb file arch/alpha/tlsb/gbus.c gbus @@ -126,7 +126,7 @@ include "dev/tc/files.tc" # TC attachment is MD attach tc at tcbus -device tcasic class dull: tcbus +device tcasic: tcbus attach tcasic at mainbus file arch/alpha/tc/tcasic.c tcasic file arch/alpha/tc/tc_bus_mem.c tcasic @@ -142,27 +142,27 @@ file arch/alpha/tc/tc_3000_300.c tcasic & dec_3000_300 file arch/alpha/tc/ioasic.c ioasic # Color Frame buffer -device cfb class dull: raster, wsconsdev +device cfb: raster, wsconsdev attach cfb at tc file arch/alpha/tc/cfb.c cfb # Smart Frame buffer -device sfb class dull: raster, wsconsdev +device sfb: raster, wsconsdev attach sfb at tc file arch/alpha/tc/sfb.c sfb # 8530 UARTs -device scc class tty +device scc: tty attach scc at ioasic file arch/alpha/tc/scc.c scc needs-count # the TCDS ASIC -device tcds class dull { slot = -1 } +device tcds { slot = -1 } attach tcds at tc file arch/alpha/tc/tcds.c tcds needs-count # 53C[F]90 SCSI -device asc class dull: scsi, ncr53c9x +device asc: scsi, ncr53c9x attach asc at tcds file arch/alpha/tc/asc.c asc needs-count file arch/alpha/tc/tcds_dma.c asc @@ -189,15 +189,15 @@ include "dev/isa/files.isa" file arch/alpha/isa/isa_machdep.c isa -device pcppi class dull { } +device pcppi { } attach pcppi at isa file arch/alpha/isa/pcppi.c pcppi -device pckbd class dull +device pckbd attach pckbd at pcppi file arch/alpha/isa/pckbd.c pckbd -device pms class dull +device pms attach pms at pcppi file arch/alpha/isa/pms.c pms @@ -205,9 +205,9 @@ attach vga at isa with vga_isa file arch/alpha/isa/vga_isa.c vga_isa needs-flag # Floppy disk controller -device fdc class dull { drive = -1 } +device fdc { drive = -1 } attach fdc at isa -device fd class disk: disk, isadma +device fd: disk, isadma attach fd at fdc file arch/alpha/isa/fd.c fdc needs-flag major { fd = 0 } @@ -232,7 +232,7 @@ file arch/alpha/pci/pci_sgmap_pte32.c alpha_pci_sgmap_pte32 define alpha_pci_sgmap_pte64 file arch/alpha/pci/pci_sgmap_pte64.c alpha_pci_sgmap_pte64 -device apecs class dull: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 +device apecs: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 attach apecs at mainbus file arch/alpha/pci/apecs.c apecs file arch/alpha/pci/apecs_bus_io.c apecs @@ -240,7 +240,7 @@ file arch/alpha/pci/apecs_bus_mem.c apecs file arch/alpha/pci/apecs_dma.c apecs file arch/alpha/pci/apecs_pci.c apecs -device cia class dull: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 +device cia: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 attach cia at mainbus file arch/alpha/pci/cia.c cia file arch/alpha/pci/cia_dma.c cia @@ -248,14 +248,14 @@ file arch/alpha/pci/cia_pci.c cia file arch/alpha/pci/cia_swiz_bus_io.c cia file arch/alpha/pci/cia_swiz_bus_mem.c cia -device a12c class dull: pcibus +device a12c: pcibus attach a12c at mainbus file arch/alpha/pci/a12c.c a12c file arch/alpha/pci/a12c_bus_mem.c a12c file arch/alpha/pci/a12c_dma.c a12c file arch/alpha/pci/a12c_pci.c a12c -device dwlpx class dull: pcibus, alpha_sgmap, alpha_pci_sgmap_pte32 +device dwlpx: pcibus, alpha_sgmap, alpha_pci_sgmap_pte32 attach dwlpx at kft file arch/alpha/pci/dwlpx.c dwlpx file arch/alpha/pci/dwlpx_dma.c dwlpx @@ -264,7 +264,7 @@ file arch/alpha/pci/pci_kn8ae.c dwlpx # XXX doesn't really fit here file arch/alpha/pci/dwlpx_bus_mem.c dwlpx file arch/alpha/pci/dwlpx_bus_io.c dwlpx -device lca class dull: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 +device lca: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64 attach lca at mainbus file arch/alpha/pci/lca.c lca file arch/alpha/pci/lca_bus_io.c lca @@ -289,14 +289,14 @@ file arch/alpha/pci/pci_kn20aa.c dec_kn20aa file arch/alpha/pci/pci_machdep.c pci -device sio class dull: isabus, alpha_shared_intr +device sio: isabus, alpha_shared_intr attach sio at pci -device pceb class dull: isabus, eisabus +device pceb: isabus, eisabus attach pceb at pci file arch/alpha/pci/sio.c sio | pceb needs-flag file arch/alpha/pci/sio_pic.c sio | pceb -device tga class dull: raster, wsconsdev +device tga: raster, wsconsdev attach tga at pci file arch/alpha/pci/tga.c tga needs-flag file arch/alpha/pci/tga_conf.c tga @@ -309,7 +309,7 @@ file arch/alpha/pci/vga_pci.c vga_pci needs-flag # # A12 if_de hack, this is temporary! # -device ade class ifnet: ether, ifnet, arp +device ade: ether, ifnet, arp attach ade at pci file arch/alpha/pci/if_ade.c ade @@ -317,7 +317,7 @@ file arch/alpha/pci/if_ade.c ade # Devices that can live on multiple busses # -device mcclock class dull +device mcclock attach mcclock at ioasic with mcclock_ioasic attach mcclock at isa with mcclock_isa attach mcclock at gbus with mcclock_tlsb diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga index 63c2c9488aec..d9d1427bf5e3 100644 --- a/sys/arch/amiga/conf/files.amiga +++ b/sys/arch/amiga/conf/files.amiga @@ -1,73 +1,73 @@ -# $NetBSD: files.amiga,v 1.71 1998/01/12 10:39:01 thorpej Exp $ +# $NetBSD: files.amiga,v 1.72 1998/02/16 22:12:45 thorpej Exp $ # maxpartitions must be first item in files.${ARCH}.newconf maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL! maxusers 2 8 64 -device mainbus class dull {} +device mainbus {} attach mainbus at root -device cpu class cpu +device cpu attach cpu at mainbus # zorro expansion bus. -device zbus class dull {} +device zbus {} attach zbus at mainbus file arch/amiga/dev/zbus.c zbus define event {} file arch/amiga/dev/event.c event -device clock class dull +device clock attach clock at mainbus file arch/amiga/dev/clock.c file dev/clock_subr.c # A2000 internal hwc -device a2kbbc class dull +device a2kbbc attach a2kbbc at mainbus file arch/amiga/dev/a2kbbc.c a2kbbc # A3000/4000 internal hwc -device a34kbbc class dull +device a34kbbc attach a34kbbc at mainbus file arch/amiga/dev/a34kbbc.c a34kbbc # keyboard -device kbd class dull: event +device kbd: event attach kbd at mainbus file arch/amiga/dev/kbd.c kbd needs-flag # serial port -device ser class tty: tty +device ser: tty attach ser at mainbus file arch/amiga/dev/ser.c ser needs-count # parallel port -device par class dull +device par attach par at mainbus file arch/amiga/dev/par.c par needs-count # audio -device aucc class dull: audio +device aucc: audio attach aucc at mainbus file arch/amiga/dev/aucc.c aucc needs-flag -device melody class dull: audio, tms320av110 +device melody: audio, tms320av110 attach melody at zbus file arch/amiga/dev/melody.c melody # mouse -device ms class dull: event +device ms: event attach ms at mainbus file arch/amiga/dev/ms.c ms needs-flag # floppy -device fdc class dull { unit = -1 } +device fdc { unit = -1 } attach fdc at mainbus -device fd class disk +device fd: disk attach fd at fdc file arch/amiga/dev/fd.c fd needs-flag major {fd = 2} @@ -75,11 +75,11 @@ major {fd = 2} # graphic devices define grfbus {} -device grf class dull {} +device grf {} attach grf at grfbus file arch/amiga/dev/grf.c grf needs-count -device ite class tty +device ite: tty attach ite at grf file arch/amiga/dev/ite.c ite needs-flag file arch/amiga/dev/kbdmap.c ite @@ -88,7 +88,7 @@ file arch/amiga/dev/kf_8x11.c kfont_8x11 file arch/amiga/dev/kf_custom.c kfont_custom # custom chips grf (ite0 grf0) -device grfcc class dull: grfbus +device grfcc: grfbus attach grfcc at mainbus file arch/amiga/dev/grf_cc.c grfcc needs-flag file arch/amiga/dev/ite_cc.c grfcc & ite @@ -100,44 +100,44 @@ file arch/amiga/dev/grfabs_cc.c grfcc | view file arch/amiga/dev/grfabs_ccglb.c grfcc | view # retina ZII grf (ite1 grf1) -device grfrt class dull: grfbus +device grfrt: grfbus attach grfrt at zbus file arch/amiga/dev/grf_rt.c grfrt needs-flag file arch/amiga/dev/ite_rt.c grfrt & ite # retina ZIII grf (ite2 grf2) -device grfrh class dull: grfbus +device grfrh: grfbus attach grfrh at zbus file arch/amiga/dev/grf_rh.c grfrh needs-flag file arch/amiga/dev/ite_rh.c grfrh & ite # cirrus grf (ite3 grf3) -device grfcl class dull: grfbus +device grfcl: grfbus attach grfcl at zbus file arch/amiga/dev/grf_cl.c grfcl needs-flag file arch/amiga/dev/ite_cl.c grfcl & ite # A2410 grf (ite4 grf4) -device grful class dull: grfbus +device grful: grfbus attach grful at zbus file arch/amiga/dev/grf_ul.c grful needs-flag file arch/amiga/dev/ite_ul.c grful & ite file arch/amiga/dev/grf_ultms.g grful # CyberVison 64 grf (ite5 grf5) -device grfcv class dull: grfbus +device grfcv: grfbus attach grfcv at zbus file arch/amiga/dev/grf_cv.c grfcv needs-flag file arch/amiga/dev/ite_cv.c grfcv & ite # Tseng grf (ite6 grf6) -device grfet class dull: grfbus +device grfet: grfbus attach grfet at zbus file arch/amiga/dev/grf_et.c grfet needs-flag file arch/amiga/dev/ite_et.c grfet & ite # CyberVison 64/3D grf (ite7 grf7) -device grfcv3d class dull: grfbus +device grfcv3d: grfbus attach grfcv3d at zbus file arch/amiga/dev/grf_cv3d.c grfcv3d needs-flag file arch/amiga/dev/ite_cv3d.c grfcv3d & ite @@ -148,37 +148,37 @@ attach le at zbus with le_zbus file arch/amiga/dev/if_le.c le_zbus needs-flag # Hydra ethernet card -device ed class ifnet: ifnet, ether, arp +device ed: ifnet, ether, arp attach ed at zbus with ed_zbus file arch/amiga/dev/if_ed.c ed_zbus needs-flag # C=/Ameristar A2060 / 560 -device bah class ifnet: ifnet, arc, arp +device bah: ifnet, arc, arp attach bah at zbus with bah_zbus file arch/amiga/dev/if_bah.c bah_zbus needs-flag # CEI A4066 EthernetPLUS -device es class ifnet: ifnet, ether, arp +device es: ifnet, ether, arp attach es at zbus file arch/amiga/dev/if_es.c es needs-flag # Quicknet ethernet card -device qn class ifnet: ifnet, ether, arp +device qn: ifnet, ether, arp attach qn at zbus file arch/amiga/dev/if_qn.c qn needs-flag # A2232 msc serial ports -device msc class tty: tty +device msc: tty attach msc at zbus file arch/amiga/dev/msc.c msc needs-count # bsc/Alf Data MultiFaceCard -device mfc class dull { unit = -1 } +device mfc { unit = -1 } attach mfc at zbus -device mfcs class tty +device mfcs: tty attach mfcs at mfc -device mfcp class dull +device mfcp attach mfcp at mfc file arch/amiga/dev/mfc.c mfcs | mfcp needs-count @@ -187,12 +187,12 @@ define supio {port = -1} # DraCo superio chip -device drsupio class dull: supio +device drsupio: supio attach drsupio at mainbus file arch/amiga/dev/drsupio.c drsupio # Hypercom 3/4 -device hyper class dull: supio +device hyper: supio attach hyper at zbus file arch/amiga/dev/hyper.c hyper @@ -200,11 +200,11 @@ attach com at supio with com_supio file arch/amiga/dev/com_supio.c com_supio # handle gvp's odd autoconf info.. -device gvpbus class dull {} +device gvpbus {} attach gvpbus at zbus file arch/amiga/dev/gvpbus.c gvpbus -device lpt class dull +device lpt file dev/ic/lpt.c lpt needs-flag attach lpt at supio with lpt_supio @@ -220,17 +220,17 @@ define sbic file arch/amiga/dev/sbic.c sbic # GVP series II -device gtsc class dull: scsi, sbic +device gtsc: scsi, sbic attach gtsc at gvpbus file arch/amiga/dev/gtsc.c gtsc needs-flag # Amiga 3000 internal -device ahsc class dull: scsi, sbic +device ahsc: scsi, sbic attach ahsc at mainbus file arch/amiga/dev/ahsc.c ahsc needs-flag # C= A2091 -device atzsc class dull: scsi, sbic +device atzsc: scsi, sbic attach atzsc at zbus file arch/amiga/dev/atzsc.c atzsc needs-flag @@ -239,22 +239,22 @@ define sci file arch/amiga/dev/sci.c sci # Supra Wordsync II -device wstsc class dull: scsi, sci +device wstsc: scsi, sci attach wstsc at zbus file arch/amiga/dev/wstsc.c wstsc needs-flag # IVS -device ivsc class dull: scsi, sci +device ivsc: scsi, sci attach ivsc at zbus file arch/amiga/dev/ivsc.c ivsc needs-flag # MLH -device mlhsc class dull: scsi, sci +device mlhsc: scsi, sci attach mlhsc at zbus file arch/amiga/dev/mlhsc.c mlhsc needs-flag # CSA twelve gauge. -device otgsc class dull: scsi, sci +device otgsc: scsi, sci attach otgsc at zbus file arch/amiga/dev/otgsc.c otgsc needs-flag @@ -263,76 +263,76 @@ define siop file arch/amiga/dev/siop.c siop # PPI Zeus -device zssc class dull: scsi, siop +device zssc: scsi, siop attach zssc at zbus file arch/amiga/dev/zssc.c zssc needs-flag # CSA Magnum -device mgnsc class dull: scsi, siop +device mgnsc: scsi, siop attach mgnsc at zbus file arch/amiga/dev/mgnsc.c mgnsc needs-flag # MacroSystems USA Warp Engine -device wesc class dull: scsi, siop +device wesc: scsi, siop attach wesc at zbus file arch/amiga/dev/wesc.c wesc needs-flag # C= A4091 & A4000T -device afsc class dull: scsi, siop +device afsc: scsi, siop attach afsc at zbus -device aftsc class dull: scsi, siop +device aftsc: scsi, siop attach aftsc at mainbus file arch/amiga/dev/afsc.c afsc | aftsc needs-flag # Emulex ESP216 & FAS216 controllers # FastlaneZ3 -device flsc class dull: scsi, ncr53c9x +device flsc: scsi, ncr53c9x attach flsc at zbus file arch/amiga/dev/flsc.c flsc needs-flag # Blizzard1230-I,II -device bzsc class dull: scsi, ncr53c9x +device bzsc: scsi, ncr53c9x attach bzsc at zbus file arch/amiga/dev/bzsc.c bzsc needs-flag # Blizzard12x0-IV -device bzivsc class dull: scsi, ncr53c9x +device bzivsc: scsi, ncr53c9x attach bzivsc at zbus file arch/amiga/dev/bzivsc.c bzivsc needs-flag # Blizzard2060 scsi -device bztzsc class dull: scsi, ncr53c9x +device bztzsc: scsi, ncr53c9x attach bztzsc at zbus file arch/amiga/dev/bztzsc.c bztzsc needs-flag # CyberSCSI [I] scsi -device cbsc class dull: scsi, ncr53c9x +device cbsc: scsi, ncr53c9x attach cbsc at zbus file arch/amiga/dev/cbsc.c cbsc needs-flag # CyberSCSI MKII scsi -device cbiisc class dull: scsi, ncr53c9x +device cbiisc: scsi, ncr53c9x attach cbiisc at zbus file arch/amiga/dev/cbiisc.c cbiisc needs-flag # EMPLANT -device empsc class dull: scsi, sci +device empsc: scsi, sci attach empsc at zbus file arch/amiga/dev/empsc.c empsc needs-flag # Amiga 4000/1200 IDE masquerading as SCSI -device idesc class dull: scsi +device idesc: scsi attach idesc at mainbus file arch/amiga/dev/idesc.c idesc needs-flag # MacroSystem DraCo internal -device drsc class dull: scsi, siop +device drsc: scsi, siop attach drsc at mainbus file arch/amiga/dev/drsc.c drsc needs-flag # MacroSystem DraCo internal DS2404 hwc -device drbbc class dull +device drbbc attach drbbc at mainbus file arch/amiga/dev/drbbc.c drbbc diff --git a/sys/arch/arm32/conf/files.arm32 b/sys/arch/arm32/conf/files.arm32 index c47f1bcfb977..8274e51f3513 100644 --- a/sys/arch/arm32/conf/files.arm32 +++ b/sys/arch/arm32/conf/files.arm32 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm32,v 1.35 1998/01/14 23:56:23 cgd Exp $ +# $NetBSD: files.arm32,v 1.36 1998/02/16 22:12:46 thorpej Exp $ # # First try for arm-specific configuration info # @@ -6,26 +6,26 @@ maxpartitions 8 maxusers 2 8 64 -device mainbus class dull { [base = -1], [dack = -1], [irq = -1] } +device mainbus { [base = -1], [dack = -1], [irq = -1] } attach mainbus at root file arch/arm32/mainbus/mainbus.c mainbus file arch/arm32/mainbus/mainbus_io.c mainbus file arch/arm32/mainbus/mainbus_io_asm.S mainbus -device cpu class cpu +device cpu attach cpu at mainbus file arch/arm32/mainbus/cpu.c cpu needs-flag major {cpu = 38} # PIOC (Peripheral IO Controller) device # parent to wdc, fdc, com lpt -device pioc class dull { [offset = -1], [dack = -1], [irq = -1] } +device pioc { [offset = -1], [dack = -1], [irq = -1] } attach pioc at mainbus file arch/arm32/mainbus/pioc.c pioc # Standard NetBSD wd driver -device wdc class dull: atapi, ata -device wd class disk: disk +device wdc: atapi, ata +device wd: disk attach wd at ata file arch/arm32/dev/wdc.c wdc needs-flag file arch/arm32/dev/wd.c wd needs-flag @@ -35,15 +35,15 @@ attach wdc at pioc with wdc_pioc file arch/arm32/mainbus/wdc_pioc.c wdc_pioc # Standard NetBSD fd driver -device fdc class dull {drive = -1} +device fdc {drive = -1} attach fdc at pioc -device fd class disk: disk +device fd: disk attach fd at fdc file arch/arm32/mainbus/fd.c fdc needs-flag major {fd = 17} # Standard parallel driver -device lpt class dull +device lpt file dev/ic/lpt.c lpt needs-flag major {lpt = 8} @@ -63,7 +63,7 @@ major {md = 18} # IOMD device # parent to kbd, qms, pms, iic # also provides irq and timer services -device iomd class dull {} +device iomd {} attach iomd at mainbus file arch/arm32/iomd/iomd.c iomd needs-flag file arch/arm32/iomd/iomd_io.c iomd @@ -75,12 +75,12 @@ file arch/arm32/iomd/iomd_dma.c iomd # IOMD mouse devices # clock device -device clock class dull +device clock attach clock at iomd file arch/arm32/iomd/iomd_clock.c iomd # quadmouse device -device qms class dull: tty +device qms file arch/arm32/dev/qms.c qms needs-flag major {qms = 9} @@ -88,7 +88,7 @@ attach qms at iomd with qms_iomd file arch/arm32/iomd/qms_iomd.c qms_iomd # PS/2 mouse device -device pms class dull: tty +device pms file arch/arm32/dev/pms.c pms needs-flag major {pms = 40} @@ -96,7 +96,7 @@ attach pms at iomd with pms_iomd file arch/arm32/iomd/pms_iomd.c pms_iomd # Standard keyboard driver -device kbd class dull +device kbd file arch/arm32/dev/kbd.c kbd needs-flag major {kbd = 11} @@ -104,7 +104,7 @@ attach kbd at iomd with kbd_iomd file arch/arm32/iomd/kbd_iomd.c kbd_iomd # IIC device -device iic class dull { addr = -1 } +device iic { addr = -1 } file arch/arm32/dev/iic.c iic needs-flag attach iic at iomd with iic_iomd @@ -112,38 +112,38 @@ file arch/arm32/iomd/iic_iomd.c iic_iomd file arch/arm32/iomd/iomd_iic.S iic_iomd # IIC based RTC -device rtc class dull {} +device rtc {} attach rtc at iic file arch/arm32/dev/rtc.c rtc needs-flag -device todclock class dull +device todclock attach todclock at rtc file arch/arm32/dev/todclock.c todclock needs-count # VIDC device # parent to vidcvideo, vidcaudio, beep -device vidc class dull { [base = -1], [dack = -1], [irq = -1] } +device vidc { [base = -1], [dack = -1], [irq = -1] } attach vidc at mainbus file arch/arm32/vidc/vidc20.c vidc needs-count # Audio devices -device beep class dull +device beep attach beep at vidc file arch/arm32/vidc/beep.c beep needs-flag major {beep = 10} -device vidcaudio class dull: audio +device vidcaudio: audio attach vidcaudio at vidc file arch/arm32/vidc/vidcaudio.c vidcaudio needs-flag major {vidcaudio = 36} -device lmcaudio class dull: audio +device lmcaudio: audio attach lmcaudio at vidc file arch/arm32/vidc/lmcaudio.c lmcaudio needs-flag file arch/arm32/vidc/lmc1982.S lmcaudio # Podule bus device -device podulebus class dull { [slot = -1] } +device podulebus { [slot = -1] } attach podulebus at root file arch/arm32/podulebus/podulebus.c podulebus needs-flag file arch/arm32/podulebus/podulebus_io.c podulebus @@ -155,27 +155,27 @@ define dp8390pio file arch/arm32/dev/dp8390_pio.c dp8390pio file arch/arm32/dev/dp8390.c dp8390pio -device em class ifnet: ether, ifnet, dp8390pio, arp +device em: ether, ifnet, dp8390pio, arp attach em at podulebus file arch/arm32/podulebus/if_em.c em -device ea class ifnet: ether, ifnet, arp +device ea: ether, ifnet, arp attach ea at podulebus file arch/arm32/podulebus/if_ea.c ea -device eb class ifnet: ether, ifnet, arp +device eb: ether, ifnet, arp attach eb at podulebus file arch/arm32/podulebus/if_eb.c eb -device eh class ifnet: ether, ifnet, arp +device eh: ether, ifnet, arp attach eh at podulebus file arch/arm32/podulebus/if_eh.c eh -device ie class ifnet: ether, ifnet, arp +device ie: ether, ifnet, arp attach ie at podulebus file arch/arm32/podulebus/if_ie.c ie -device es class ifnet: ether, ifnet, arp +device es: ether, ifnet, arp attach es at mainbus file arch/arm32/rc7500/if_es.c es & rc7500 @@ -205,7 +205,7 @@ define sbic file arch/arm32/podulebus/sbic.c sbic # Acorn SCSI I specific layer for sbic -device asc class dull: scsi, sbic +device asc: scsi, sbic attach asc at podulebus file arch/arm32/podulebus/asc.c asc needs-flag @@ -214,7 +214,7 @@ define esc file arch/arm32/podulebus/esc.c esc # Connect32 specific layer for esc -device cosc class dull: scsi, esc +device cosc: scsi, esc attach cosc at podulebus file arch/arm32/podulebus/cosc.c cosc @@ -222,7 +222,7 @@ file arch/arm32/podulebus/cosc.c cosc define sfas file arch/arm32/podulebus/sfas.c sfas -device ptsc class dull: scsi, sfas +device ptsc: scsi, sfas attach ptsc at podulebus file arch/arm32/podulebus/ptsc.c ptsc @@ -231,12 +231,12 @@ define ncr file arch/arm32/dev/ncr5380sbc.c ncr # Oak specific layer for ncr -device oak class dull: scsi, ncr +device oak: scsi, ncr attach oak at podulebus file arch/arm32/podulebus/oak.c oak # ICS IDE driver -device icside class dull {} +device icside {} attach icside at podulebus file arch/arm32/podulebus/icside.c icside file arch/arm32/podulebus/icside_io.c icside @@ -245,7 +245,7 @@ file arch/arm32/podulebus/icside_io_asm.S icside attach wdc at icside with wdc_ics # Yellowstone RapIDE driver -device rapide class dull {} +device rapide {} attach rapide at podulebus file arch/arm32/podulebus/rapide.c rapide file arch/arm32/podulebus/rapide_io_asm.S rapide @@ -253,7 +253,7 @@ file arch/arm32/podulebus/rapide_io_asm.S rapide attach wdc at rapide with wdc_rapide # Simtec IDE driver -device simide class dull {} +device simide {} attach simide at podulebus file arch/arm32/podulebus/simide.c simide file arch/arm32/podulebus/simide_io_asm.S simide @@ -261,16 +261,16 @@ file arch/arm32/podulebus/simide_io_asm.S simide attach wdc at simide with wdc_sim # Atomwide Multi-Port Serial driver -device amps class dull {} +device amps {} attach amps at podulebus attach com at amps with com_amps file arch/arm32/podulebus/amps.c amps -device vidcvideo class dull +device vidcvideo attach vidcvideo at vidc file arch/arm32/vidc/console/vidcvideo.c vidcvideo needs-count major {vidcvideo = 37} -device vt class tty: tty +device vt: tty attach vt at vidc file arch/arm32/vidc/console/console.c vt needs-count diff --git a/sys/arch/atari/conf/files.atari b/sys/arch/atari/conf/files.atari index 61f0a17cc0a5..7acc3f0b5264 100644 --- a/sys/arch/atari/conf/files.atari +++ b/sys/arch/atari/conf/files.atari @@ -1,41 +1,41 @@ # -# $NetBSD: files.atari,v 1.46 1998/02/01 21:23:27 is Exp $ +# $NetBSD: files.atari,v 1.47 1998/02/16 22:12:46 thorpej Exp $ maxpartitions 16 maxusers 2 8 64 -device mainbus class dull {} +device mainbus {} attach mainbus at root -device cpu class cpu +device cpu attach cpu at mainbus define event {} file arch/atari/dev/event.c event -device clock class dull +device clock attach clock at mainbus file dev/clock_subr.c file arch/atari/dev/clock.c # keyboard -device kbd class dull: event +device kbd: event attach kbd at mainbus file arch/atari/dev/kbd.c kbd needs-flag # serial port via 68901 (modem1/serial1) -device ser class tty: tty +device ser: tty attach ser at mainbus file arch/atari/dev/ser.c ser needs-flag # serial port via 85C30 (modem2/serial2) -device zs class tty: tty +device zs: tty attach zs at mainbus file arch/atari/dev/zs.c zs needs-count # printer -device lp class dull +device lp attach lp at mainbus file arch/atari/dev/lpt.c lp needs-flag @@ -43,22 +43,22 @@ file arch/atari/dev/lpt.c lp needs-flag file arch/atari/dev/md_root.c memory_disk_hooks # nvram -device nvr class dull +device nvr attach nvr at mainbus file arch/atari/dev/nvram.c nvr needs-flag -device fdc class dull { unit = -1 } +device fdc { unit = -1 } attach fdc at mainbus # TT/Falcon floppy driver -device fd class disk +device fd: disk attach fd at fdc file arch/atari/dev/fd.c fd needs-flag file arch/atari/dev/dma.c major {fd = 2} # Hades floppy driver -device hdfd class disk +device hdfd: disk attach hdfd at fdc file arch/atari/dev/hdfd.c hdfd needs-flag file arch/atari/dev/hdfd_intr.s hdfd @@ -66,18 +66,18 @@ major {hdfd = 2} # IDE driver also called wd driver # The problem with calling it wd here is a name clash with the driver in ISA. -device idec class dull {[drive = -1], [option = 0]} +device idec {[drive = -1], [option = 0]} attach idec at mainbus -device ide class disk: disk +device ide: disk attach ide at idec file arch/atari/dev/wd.c idec needs-flag major {ide = 14} # The generic VME-bus driver -device vmebus class dull {} +device vmebus {} attach vmebus at mainbus -device vme class dull {[ioport = -1], [iosize = 0], [mem = -1], [memsiz = 0], [irq = -1] } +device vme {[ioport = -1], [iosize = 0], [mem = -1], [memsiz = 0], [irq = -1] } attach vme at vmebus file arch/atari/vme/vme.c vme file arch/atari/vme/vme_machdep.c vme @@ -94,23 +94,23 @@ file arch/atari/vme/if_le_vme.c le_vme # graphic devices define grfb {} -device grfbus class dull: grfb +device grfbus: grfb attach grfbus at mainbus file arch/atari/dev/grf.c -device grfcc class dull {} +device grfcc {} attach grfcc at grfb file arch/atari/dev/ite_cc.c grfcc needs-count file arch/atari/dev/grfabs.c grfcc file arch/atari/dev/grfabs_tt.c grfcc file arch/atari/dev/grfabs_fal.c grfcc -device grfet class dull {} +device grfet {} attach grfet at grfb file arch/atari/dev/ite_et.c grfet needs-count file arch/atari/dev/grfabs_et.c grfet -device ite class tty +device ite: tty attach ite at grfcc,grfet file arch/atari/dev/ite.c ite needs-flag file arch/atari/dev/kbdmap.c ite @@ -129,7 +129,7 @@ file arch/atari/dev/ms.c mouse needs-count # file arch/atari/pci/pci_machdep.c pci | grfet -device pcibus class dull +device pcibus attach pcibus at mainbus include "dev/pci/files.pci" @@ -139,7 +139,7 @@ include "dev/pci/files.pci" # file arch/atari/isa/isa_machdep.c isa -device isabus class dull +device isabus attach isabus at mainbus include "dev/isa/files.isa" @@ -152,7 +152,7 @@ major {cd = 6} include "dev/scsipi/files.scsipi" # ncr 5380 controller -device ncrscsi class dull: scsi +device ncrscsi: scsi attach ncrscsi at mainbus file arch/atari/dev/atari5380.c ncrscsi diff --git a/sys/arch/bebox/conf/files.bebox b/sys/arch/bebox/conf/files.bebox index 909b32bdf4a0..184d673a9a3c 100644 --- a/sys/arch/bebox/conf/files.bebox +++ b/sys/arch/bebox/conf/files.bebox @@ -1,4 +1,4 @@ -# $NetBSD: files.bebox,v 1.7 1998/02/12 01:03:58 sakamoto Exp $ +# $NetBSD: files.bebox,v 1.8 1998/02/16 22:12:46 thorpej Exp $ # # First try for bebox specific configuration info # @@ -66,7 +66,7 @@ major {md = 17} # System bus types # define mainbus { } -device mainbus class dull: isabus, pcibus, mainbus +device mainbus: isabus, pcibus, mainbus attach mainbus at root file arch/bebox/bebox/mainbus.c mainbus @@ -79,12 +79,12 @@ include "../../../dev/pci/files.pci" file arch/bebox/pci/pci_machdep.c pci # PCI-Host bridge chipsets -device pchb class dull: pcibus +device pchb: pcibus attach pchb at pci file arch/bebox/pci/pchb.c pchb # PCI-ISA bridges -device pcib class dull: isabus +device pcib: isabus attach pcib at pci file arch/bebox/pci/pcib.c pcib @@ -108,12 +108,12 @@ file arch/bebox/isa/isaclock.c isa define pckbd { [irq = -1], [port = -1] } # PC console support a la "pccons" -device pc class tty: tty, pckbd +device pc: tty, pckbd attach pc at isa file arch/bebox/isa/pccons.c pc needs-flag # PC console support a la "pcvt" -device vt class tty: tty, pckbd +device vt: tty, pckbd attach vt at isa file arch/bebox/isa/pcvt/pcvt_drv.c vt needs-flag file arch/bebox/isa/pcvt/pcvt_ext.c vt needs-flag @@ -123,31 +123,31 @@ file arch/bebox/isa/pcvt/pcvt_sup.c vt needs-flag file arch/bebox/isa/pcvt/pcvt_vtf.c vt needs-flag # PC Mice; Logitech-style, Microsoft-style, and PS/2-style -device lms class dull +device lms attach lms at isa file arch/bebox/isa/lms.c lms needs-flag -device mms class dull +device mms attach mms at isa file arch/bebox/isa/mms.c mms needs-flag -device pms class dull +device pms attach pms at pckbd file arch/bebox/isa/pms.c pms needs-flag # Floppy disk controller -device fdc class dull {drive = -1} +device fdc {drive = -1} attach fdc at isa -device fd class disk: disk, isadma +device fd: disk, isadma attach fd at fdc file arch/bebox/isa/fd.c fdc needs-flag major {fd = 2} # PC speaker -device spkr class dull: tty +device spkr attach spkr at pckbd file arch/bebox/isa/spkr.c spkr needs-flag # Game adapter (joystick) -device joy class dull +device joy file arch/bebox/isa/joy.c joy needs-flag attach joy at isa with joy_isa diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 index 06bf0184ee3a..11cd844e13fc 100644 --- a/sys/arch/hp300/conf/files.hp300 +++ b/sys/arch/hp300/conf/files.hp300 @@ -1,4 +1,4 @@ -# $NetBSD: files.hp300,v 1.33 1998/02/01 21:23:28 is Exp $ +# $NetBSD: files.hp300,v 1.34 1998/02/16 22:12:46 thorpej Exp $ # # hp300-specific configuration info @@ -21,14 +21,14 @@ defopt USELEDS # make the lights twinkle # Mainbus # -device mainbus class dull { } +device mainbus { } attach mainbus at root # # Internal i/o space # -device intio class dull { } +device intio { } attach intio at mainbus file arch/hp300/dev/intio.c intio @@ -36,7 +36,7 @@ file arch/hp300/dev/intio.c intio # DIO bus # -device dio class dull { scode = -1 } +device dio { scode = -1 } attach dio at mainbus file arch/hp300/dev/dio.c dio @@ -45,12 +45,12 @@ file arch/hp300/dev/dio.c dio # # Apollo Utilility Chip (a.k.a. "Frodo") found on 4xx workstations -device frodo class dull { offset = -1 } +device frodo { offset = -1 } attach frodo at intio file arch/hp300/dev/frodo.c frodo # Apollo APCI 8250-like UARTs -device apci class tty +device apci: tty attach apci at frodo file arch/hp300/dev/apci.c apci needs-flag @@ -58,29 +58,29 @@ file arch/hp300/dev/apci.c apci needs-flag define grfdev { } # Frame buffer devices -device dvbox class dull: grfdev +device dvbox: grfdev file arch/hp300/dev/grf_dv.c dvbox needs-flag -device gbox class dull: grfdev +device gbox: grfdev file arch/hp300/dev/grf_gb.c gbox needs-flag -device hyper class dull: grfdev +device hyper: grfdev file arch/hp300/dev/grf_hy.c hyper needs-flag -device rbox class dull: grfdev +device rbox: grfdev file arch/hp300/dev/grf_rb.c rbox needs-flag -device topcat class dull: grfdev +device topcat: grfdev file arch/hp300/dev/grf_tc.c topcat needs-flag # `grf' framebuffer abstraction -device grf class dull { } +device grf { } attach grf at grfdev file arch/hp300/dev/grf.c grf needs-flag file arch/hp300/dev/grf_subr.c grf # Internal Terminal Emulator -device ite class tty +device ite: tty attach ite at grf file arch/hp300/dev/ite.c ite needs-flag file arch/hp300/dev/ite_subr.c ite @@ -103,12 +103,12 @@ attach rbox at dio with rbox_dio attach topcat at dio with topcat_dio # DCA serial interface -device dca class tty: tty +device dca: tty attach dca at dio file arch/hp300/dev/dca.c dca needs-flag # DCM serial interface -device dcm class tty: tty +device dcm: tty attach dcm at dio file arch/hp300/dev/dcm.c dcm needs-flag @@ -119,57 +119,57 @@ file arch/hp300/dev/if_le.c le # HP-IB interfaces define hpibdev { } -device nhpib class dull: hpibdev +device nhpib: hpibdev attach nhpib at dio file arch/hp300/dev/nhpib.c nhpib -device fhpib class dull: hpibdev +device fhpib: hpibdev attach fhpib at dio file arch/hp300/dev/fhpib.c fhpib # HP-IB bus layer -device hpibbus class dull { slave = -1, punit = -1 } +device hpibbus { slave = -1, punit = -1 } attach hpibbus at hpibdev file arch/hp300/dev/hpib.c hpibbus # HP-IB devices -device ct class tape: tape +device ct: tape attach ct at hpibbus file arch/hp300/dev/ct.c ct needs-flag major {ct = 0} -device mt class tape: tape +device mt: tape attach mt at hpibbus file arch/hp300/dev/mt.c mt needs-flag major {mt = 1} -device rd class disk: disk +device rd: disk attach rd at hpibbus file arch/hp300/dev/rd.c rd needs-flag file arch/hp300/dev/rd_compat.c rd # XXX major {rd = 2} -device ppi class dull +device ppi attach ppi at hpibbus file arch/hp300/dev/ppi.c ppi needs-flag # Old HP SCSI layer -device oscsi class dull { target = -1, lun = -1 } +device oscsi { target = -1, lun = -1 } attach oscsi at dio file arch/hp300/dev/scsi.c oscsi # Old HP SCSI devices -device sd class disk: disk +device sd: disk attach sd at oscsi file arch/hp300/dev/sd.c sd needs-flag file arch/hp300/dev/sd_compat.c sd # XXX major {sd = 4} -device st class tape: tape +device st: tape attach st at oscsi file arch/hp300/dev/st.c st needs-flag -device ac class dull +device ac attach ac at oscsi file arch/hp300/dev/ac.c ac needs-flag diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 8bf1d31b17ac..78d336a9fcc0 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.107 1998/02/06 07:53:26 thorpej Exp $ +# $NetBSD: files.i386,v 1.108 1998/02/16 22:12:46 thorpej Exp $ # # new style config file for i386 architecture # @@ -76,7 +76,7 @@ major {md = 17} # define mainbus { } -device mainbus class dull: isabus, eisabus, pcibus, mainbus +device mainbus: isabus, eisabus, pcibus, mainbus attach mainbus at root file arch/i386/i386/mainbus.c mainbus @@ -97,17 +97,17 @@ include "dev/pci/files.pci" file arch/i386/pci/pci_machdep.c pci # PCI-Host bridge chipsets -device pchb class dull: pcibus +device pchb: pcibus attach pchb at pci file arch/i386/pci/pchb.c pchb # PCI-EISA bridges -device pceb class dull: eisabus, isabus +device pceb: eisabus, isabus attach pceb at pci file arch/i386/pci/pceb.c pceb # PCI-ISA bridges -device pcib class dull: isabus +device pcib: isabus attach pcib at pci file arch/i386/pci/pcib.c pcib @@ -126,7 +126,7 @@ file arch/i386/isa/isa_machdep.c isa file arch/i386/isa/clock.c isa # Numeric Processing Extension; Math Co-processor -device npx class dull +device npx attach npx at isa file arch/i386/isa/npx.c npx needs-flag @@ -135,12 +135,12 @@ file arch/i386/isa/npx.c npx needs-flag define pckbd { [irq = -1], [port = -1] } # PC console support a la "pccons" -device pc class tty: tty, pckbd +device pc: tty, pckbd attach pc at isa file arch/i386/isa/pccons.c pc needs-flag # PC console support a la "pcvt" -device vt class tty: tty, pckbd +device vt: tty, pckbd attach vt at isa file arch/i386/isa/pcvt/pcvt_drv.c vt needs-flag file arch/i386/isa/pcvt/pcvt_ext.c vt needs-flag @@ -150,31 +150,31 @@ file arch/i386/isa/pcvt/pcvt_sup.c vt needs-flag file arch/i386/isa/pcvt/pcvt_vtf.c vt needs-flag # PC Mice; Logitech-style, Microsoft-style, and PS/2-style -device lms class dull +device lms attach lms at isa file arch/i386/isa/lms.c lms needs-flag -device mms class dull +device mms attach mms at isa file arch/i386/isa/mms.c mms needs-flag -device pms class dull +device pms attach pms at pckbd file arch/i386/isa/pms.c pms needs-flag # Floppy disk controller -device fdc class dull {drive = -1} +device fdc {drive = -1} attach fdc at isa -device fd class disk: disk, isadma +device fd: disk, isadma attach fd at fdc file arch/i386/isa/fd.c fdc needs-flag major {fd = 2} # PC speaker -device spkr class dull: tty +device spkr attach spkr at pckbd file arch/i386/isa/spkr.c spkr needs-flag # Game adapter (joystick) -device joy class dull +device joy file arch/i386/isa/joy.c joy needs-flag attach joy at isa with joy_isa @@ -206,7 +206,7 @@ file arch/i386/isa/joy_isapnp.c joy_isapnp # # Advanced Power Management support (APM) -device apm class dull: bioscall +device apm: bioscall attach apm at mainbus file arch/i386/i386/apm.c apm needs-count file arch/i386/i386/apmcall.s apm @@ -253,7 +253,7 @@ defopt PCIC_ISA_ALLOC_IOBASE defopt PCIC_ISA_ALLOC_IOSIZE defopt PCIC_ISA_INTR_ALLOC_MASK -device pcic class dull {[controller = -1], [socket = -1]} +device pcic {[controller = -1], [socket = -1]} file dev/ic/i82365.c pcic # PCIC pcmcia contoller diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index b5df7c5ad027..67503e387cd1 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: files.mac68k,v 1.76 1998/02/01 21:23:29 is Exp $ +# $NetBSD: files.mac68k,v 1.77 1998/02/16 22:12:46 thorpej Exp $ # mac68k-specific configuration info @@ -11,20 +11,20 @@ maxpartitions 8 maxusers 2 8 64 -device mainbus class dull { } # no locators (yet?) +device mainbus { } # no locators (yet?) attach mainbus at root define obio_norm { [addr = -1], ["no drq" = -1], ["no hsk" = -1] } define obio_scsi5380 { [addr = -1], [drq = -1], [hsk = -1] } -device obio class dull: obio_norm, obio_scsi5380 +device obio: obio_norm, obio_scsi5380 attach obio at mainbus file arch/mac68k/dev/obio.c obio -device nubus class dull { } +device nubus { } attach nubus at mainbus file arch/mac68k/dev/nubus.c nubus -device adb class dull +device adb attach adb at obio_norm file arch/mac68k/dev/adb.c adb file arch/mac68k/dev/adbsys.c @@ -32,40 +32,40 @@ file arch/mac68k/dev/adbsysasm.s file arch/mac68k/dev/adb_direct.c file arch/mac68k/dev/pm_direct.c -device asc class dull +device asc attach asc at obio_norm file arch/mac68k/dev/asc.c asc needs-flag define grfbus { } file arch/mac68k/dev/grf_subr.c grfbus -device intvid class dull: grfbus +device intvid: grfbus attach intvid at obio_norm file arch/mac68k/dev/grf_iv.c intvid -device macvid class dull: grfbus +device macvid: grfbus attach macvid at nubus file arch/mac68k/dev/grf_mv.c macvid -device grf class dull { } +device grf { } attach grf at grfbus file arch/mac68k/dev/grf.c grf needs-flag -device ite class tty +device ite: tty attach ite at grf file arch/mac68k/dev/ite.c ite needs-flag -device ae class ifnet: ifnet, ether, arp, dp8390nic +device ae: ifnet, ether, arp, dp8390nic attach ae at nubus with ae_nubus file arch/mac68k/dev/if_ae_nubus.c ae_nubus file arch/mac68k/dev/if_ae.c ae -device mc class ifnet: ifnet, ether, arp +device mc: ifnet, ether, arp attach mc at obio_norm with mc_obio file arch/mac68k/dev/if_mc.c mc file arch/mac68k/dev/if_mc_obio.c mc_obio -device sn class ifnet: ifnet, ether, arp +device sn: ifnet, ether, arp attach sn at obio_norm with sn_obio attach sn at nubus with sn_nubus file arch/mac68k/dev/if_sn.c sn @@ -75,33 +75,33 @@ file arch/mac68k/dev/if_sn_nubus.c sn_nubus include "dev/scsipi/files.scsipi" # Option 1 for ncr5380 support -device ncrscsi class dull: scsi +device ncrscsi: scsi attach ncrscsi at obio_scsi5380 file arch/mac68k/dev/mac68k5380.c ncrscsi needs-flag # Option 2 for ncr5380 support -device sbc class dull: scsi, ncr5380sbc +device sbc: scsi, ncr5380sbc attach sbc at obio_scsi5380 with sbc_obio file arch/mac68k/dev/sbc_obio.c sbc_obio file arch/mac68k/dev/sbc.c sbc -device esp class dull: scsi, ncr53c9x +device esp: scsi, ncr53c9x attach esp at obio_norm file arch/mac68k/dev/esp.c esp needs-flag -device zsc class dull { 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 file dev/ic/z8530sc.c zsc -device zstty class tty: tty +device zstty: tty attach zstty at zsc #file arch/mac68k/dev/z8530tty.c zstty needs-flag file dev/ic/z8530tty.c zstty needs-flag # This one is out of alphabetical order -device fpu class dull +device fpu attach fpu at mainbus file arch/mac68k/mac68k/fpu.c fpu diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k index 86bc33a71b73..a001438a8721 100644 --- a/sys/arch/mvme68k/conf/files.mvme68k +++ b/sys/arch/mvme68k/conf/files.mvme68k @@ -1,35 +1,35 @@ -# $NetBSD: files.mvme68k,v 1.18 1998/02/01 21:23:30 is Exp $ +# $NetBSD: files.mvme68k,v 1.19 1998/02/16 22:12:47 thorpej Exp $ # config file for mvme68k # maxpartitions must be first item in files.${ARCH}.newconf maxpartitions 8 -device mainbus class dull { } +device mainbus { } attach mainbus at root # MVME-147 Peripheral Channel Controller -device pcc class dull { [ ipl = -1 ] } +device pcc { [ ipl = -1 ] } attach pcc at mainbus file arch/mvme68k/dev/pcc.c pcc needs-flag -device clock class dull +device clock attach clock at pcc with clock_pcc file arch/mvme68k/dev/clock_pcc.c clock_pcc -device zsc class dull { channel = -1 } +device zsc { channel = -1 } file arch/mvme68k/dev/zs.c zsc file dev/ic/z8530sc.c zsc attach zsc at pcc with zsc_pcc file arch/mvme68k/dev/zs_pcc.c zsc_pcc needs-flag -device zstty class tty: tty +device zstty: tty attach zstty at zsc file dev/ic/z8530tty.c zstty needs-flag # printer -device lpt class dull +device lpt attach lpt at pcc with lpt_pcc file arch/mvme68k/dev/lpt.c lpt needs-flag @@ -38,13 +38,13 @@ attach le at pcc with le_pcc file arch/mvme68k/dev/if_le.c le # Generic VME support -device vmechip class dull { } +device vmechip { } file arch/mvme68k/dev/vme.c vmechip -device vmes class dull { [ atype = -1 ], addr = 0, [ ipl = -1 ], [ vec = - 1 ] } +device vmes { [ atype = -1 ], addr = 0, [ ipl = -1 ], [ vec = - 1 ] } attach vmes at vmechip -device vmel class dull { [ atype = -1 ], addr = 0, [ ipl = -1 ], [ vec = - 1 ] } +device vmel { [ atype = -1 ], addr = 0, [ ipl = -1 ], [ vec = - 1 ] } attach vmel at vmechip # Memory disk for boot tape @@ -66,7 +66,7 @@ define sbic file arch/mvme68k/dev/sbic.c sbic # ... on the MVME-147 -device wdsc class dull: sbic, scsi +device wdsc: sbic, scsi attach wdsc at pcc with wdsc_pcc file arch/mvme68k/dev/wdsc.c wdsc_pcc diff --git a/sys/arch/pc532/conf/files.pc532 b/sys/arch/pc532/conf/files.pc532 index 232978e92410..9333560939e6 100644 --- a/sys/arch/pc532/conf/files.pc532 +++ b/sys/arch/pc532/conf/files.pc532 @@ -1,4 +1,4 @@ -# $NetBSD: files.pc532,v 1.33 1998/01/12 19:55:37 thorpej Exp $ +# $NetBSD: files.pc532,v 1.34 1998/02/16 22:12:47 thorpej Exp $ # # new style config file for pc532 architecture # @@ -8,7 +8,7 @@ maxpartitions 8 maxusers 2 16 64 -device mainbus class dull {[addr = -1], [irq = -1]} +device mainbus {[addr = -1], [irq = -1]} attach mainbus at root file arch/pc532/pc532/mainbus.c @@ -18,18 +18,18 @@ major {vnd = 5} file arch/pc532/dev/md_root.c memory_disk_hooks major {md = 3} -device rtc class dull +device rtc attach rtc at mainbus -device clock class dull +device clock attach clock at mainbus file dev/clock_subr.c file arch/pc532/pc532/clock.c -device scn class tty: tty +device scn: tty attach scn at mainbus file arch/pc532/dev/scn.c scn needs-flag -device lpt class dull: ether, ifnet, arp +device lpt: ether, ifnet, arp attach lpt at mainbus file arch/pc532/dev/lpt.c lpt needs-flag @@ -38,7 +38,7 @@ major {sd = 0} major {st = 2} major {cd = 4} -device ncr class dull: scsi, ncr5380sbc +device ncr: scsi, ncr5380sbc attach ncr at mainbus file arch/pc532/dev/ncr.c ncr needs-flag #device aic: scsi diff --git a/sys/arch/pica/conf/files.pica b/sys/arch/pica/conf/files.pica index 0e71f33dd3a2..40a911f1a6fd 100644 --- a/sys/arch/pica/conf/files.pica +++ b/sys/arch/pica/conf/files.pica @@ -1,30 +1,30 @@ -# $NetBSD: files.pica,v 1.10 1998/01/12 20:04:24 thorpej Exp $ +# $NetBSD: files.pica,v 1.11 1998/02/16 22:12:47 thorpej Exp $ maxpartitions 8 maxusers 2 8 64 -device mainbus class dull { } # no locators +device mainbus { } # no locators attach mainbus at root # Our CPU configurator -device cpu class cpu # not optional +device cpu # not optional attach cpu at mainbus file arch/pica/pica/cpu.c cpu # # PICA bus autoconfiguration devices # -device pica class dull { } # { slot = -1, offset = -1 } +device pica { } # { slot = -1, offset = -1 } attach pica at mainbus file arch/pica/pica/pica.c pica needs-flag # Real time clock, must have one.. -device clock class dull +device clock attach clock at pica file arch/pica/pica/clock.c clock file arch/pica/pica/clock_mc.c clock # Ethernet chip -device sn class ifnet: ifnet, ether, arp +device sn: ifnet, ether, arp attach sn at pica file arch/pica/dev/if_sn.c sn needs-count @@ -34,33 +34,33 @@ major {sd = 0} major {cd = 3} # Machine dependent SCSI interface driver -device asc class dull: scsi +device asc: scsi attach asc at pica file arch/pica/dev/asc.c asc needs-count # NS16450/16550 Serial line driver -device pcom class tty +device pcom: tty attach pcom at pica file arch/pica/dev/com.c pcom needs-count # Parallel printer port driver -device lpt class dull +device lpt attach lpt at pica file arch/pica/dev/lpt.c lpt needs-count # Console driver on PC-style graphics -device pc class tty +device pc: tty attach pc at pica -device pms class dull +device pms attach pms at pica file arch/pica/dev/pccons.c pc | pms needs-count # PS2 type mouse driver. # Floppy disk controller -device fdc class dull {drive = -1} +device fdc {drive = -1} attach fdc at pica -device fd class disk +device fd: disk attach fd at fdc file arch/pica/dev/fd.c fdc needs-flag major {fd = 7} diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax index 34b7d24e2f17..901eff9127ae 100644 --- a/sys/arch/pmax/conf/files.pmax +++ b/sys/arch/pmax/conf/files.pmax @@ -1,4 +1,4 @@ -# $NetBSD: files.pmax,v 1.48 1998/01/12 20:12:28 thorpej Exp $ +# $NetBSD: files.pmax,v 1.49 1998/02/16 22:12:47 thorpej Exp $ # DECstation-specific configuration info # maxpartitions must be first item in files.${ARCH}. @@ -9,10 +9,10 @@ maxusers 2 8 64 # # Bus-independent devices # -device mainbus class dull { } # no locators +device mainbus { } # no locators attach mainbus at root -device cpu class cpu # not optional +device cpu # not optional attach cpu at mainbus file arch/pmax/pmax/cpu.c cpu @@ -53,7 +53,7 @@ file arch/pmax/tc/asic.c ioasic # Real-time clock (not optional) -device clock class dull +device clock attach clock at ioasic, mainbus with mcclock_ioasic file arch/pmax/pmax/clock.c file arch/pmax/pmax/mcclock.c clock @@ -74,12 +74,12 @@ major { rz = 21 } # Old 4.4bsd pmax-specific scsi driver (deprecated). # define oldscsi {} -device oldscsibus class dull {target = -1, drive = -1} +device oldscsibus {target = -1, drive = -1} attach oldscsibus at oldscsi # asc: system-slot or turbochannel-option SCSI interface #device asc: oldscsi,scsi -device asc class dull: oldscsi +device asc: oldscsi attach asc at ioasic with asc_ioasic file dev/tc/asc_ioasic.c asc_ioasic attach asc at tc with asc_tc @@ -89,17 +89,17 @@ file dev/tc/asc.c asc needs-flag # sii: kn01 SCSI interface #device sii: scsi,oldscsi -device sii class dull: oldscsi +device sii: oldscsi file arch/pmax/dev/sii.c sii needs-flag attach sii at mainbus with sii_ds file arch/pmax/dev/sii_ds.c sii_ds -device tz class tape: tape +device tz: tape attach tz at oldscsibus file arch/pmax/dev/tz.c tz needs-count -device rz class disk: disk +device rz: disk attach rz at oldscsibus file arch/pmax/dev/rz.c rz needs-count @@ -109,7 +109,7 @@ file arch/pmax/dev/rz.c rz needs-count # DC7085 (DZ-like four-port serial device) on mainbus on non-IOASIC machines. # For the 3MAX (aka kn02 aka 5k/200) pretend that it's on an ASIC. -device dc class tty +device dc: tty file arch/pmax/dev/dc.c dc attach dc at ioasic with dc_ioasic file arch/pmax/dev/dc_ioasic.c dc_ioasic needs-flag @@ -118,7 +118,7 @@ file arch/pmax/dev/dc_ds.c dc_ds needs-flag # The "desktop bus" on the MAXINE (5k/25). What is it, anyway? ADB? -device dtop class dull +device dtop attach dtop at ioasic file arch/pmax/dev/dtop.c dtop needs-flag @@ -131,7 +131,7 @@ file dev/tc/if_le_ibus.c le_pmax needs-flag #for kn01_intr # 3100 (pmax) onboard framebuffer -device pm class dull +device pm file arch/pmax/dev/pm.c pm needs-flag file arch/pmax/dev/bt478.c pm attach pm at mainbus with pm_ds @@ -141,31 +141,31 @@ file arch/pmax/dev/pm_ds.c pm_ds # Turbochannel options. ######################################################################## -device cfb class dull +device cfb attach cfb at tc file arch/pmax/dev/cfb.c cfb needs-flag -device sfb class dull +device sfb attach sfb at tc file arch/pmax/dev/sfb.c sfb needs-flag -device mfb class dull +device mfb attach mfb at tc file arch/pmax/dev/mfb.c mfb needs-flag # Zilog 8350/Intel 82350(?) SCC UART. -device scc class tty +device scc: tty attach scc at ioasic file arch/pmax/tc/scc.c scc needs-flag # MAXINE onboard framebuffer -device xcfb class dull +device xcfb attach xcfb at tc file arch/pmax/dev/xcfb.c xcfb needs-flag file arch/pmax/dev/ims332.c xcfb # DECWRL 45Mbit T3 interface -device tt class tty +device tt: tty attach tt at tc file arch/pmax/dev/if_tt.c tt needs-count diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index b3cbe0bb6047..70d37eb6fead 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.48 1998/01/25 19:56:30 pk Exp $ +# $NetBSD: files.sparc,v 1.49 1998/02/16 22:12:47 thorpej Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -8,13 +8,13 @@ maxpartitions 8 maxusers 2 8 1024 -device mainbus class dull {} +device mainbus {} attach mainbus at root -device obio class dull { [addr = -1], [level = -1] } +device obio { [addr = -1], [level = -1] } attach obio at mainbus -device iommu class dull {} +device iommu {} attach iommu at mainbus file arch/sparc/sparc/iommu.c iommu @@ -24,48 +24,48 @@ attach vme at iommu, mainbus file arch/sparc/dev/obio.c obio file arch/sparc/dev/vme_machdep.c vme -device auxreg class dull +device auxreg attach auxreg at mainbus, obio file arch/sparc/sparc/auxreg.c -device clock class dull +device clock attach clock at mainbus, obio -device oclock class dull +device oclock attach oclock at obio -device timer class dull +device timer attach timer at mainbus, obio -device eeprom class dull +device eeprom attach eeprom at obio file arch/sparc/sparc/clock.c -device power class dull +device power attach power at obio file arch/sparc/dev/power.c power -device cpu class cpu +device cpu attach cpu at mainbus file arch/sparc/sparc/cpu.c -device memreg class dull +device memreg attach memreg at mainbus, obio file arch/sparc/sparc/memreg.c -device zs class dull {channel = -1} +device zs {channel = -1} attach zs at mainbus, obio file arch/sparc/dev/zs.c zs needs-count file dev/ic/z8530sc.c zs -device fdc class dull {} +device fdc {} attach fdc at mainbus, obio -device fd class disk: disk +device fd: disk attach fd at fdc file arch/sparc/dev/fd.c fdc | fd needs-flag file arch/sparc/sparc/bsd_fdintr.s fdc -device sbus class dull { slot = -1, offset = -1 } +device sbus { slot = -1, offset = -1 } attach sbus at mainbus, iommu file arch/sparc/dev/sbus.c sbus @@ -73,7 +73,7 @@ file arch/sparc/dev/sbus.c sbus # Console (zs) related stuff # -device zstty class tty: tty +device zstty: tty attach zstty at zs file dev/ic/z8530tty.c zstty needs-flag file arch/sparc/dev/zs_kgdb.c kgdb @@ -81,13 +81,13 @@ file arch/sparc/dev/zs_kgdb.c kgdb define zsevent file dev/sun/event.c zsevent -device kbd class dull: zsevent +device kbd: zsevent attach kbd at zs file dev/sun/kbd.c kbd needs-flag file dev/sun/kbd_tables.c kbd file arch/sparc/dev/kd.c kbd -device ms class dull: zsevent +device ms: zsevent attach ms at zs file dev/sun/ms.c ms needs-flag @@ -103,20 +103,20 @@ major { cd = 18 } major { xd = 10 } major { xy = 3 } -device dma class dull {} +device dma {} attach dma at sbus, obio -device ledma class dull {} +device ledma {} attach ledma at sbus file arch/sparc/dev/dma.c dma | ledma -device lebuffer class dull {} +device lebuffer {} attach lebuffer at sbus file arch/sparc/dev/lebuffer.c lebuffer -device esp class dull: scsi, ncr53c9x +device esp: scsi, ncr53c9x attach esp at sbus, dma, obio file arch/sparc/dev/esp.c esp -device audioamd class dull: audio +device audioamd: audio attach audioamd at mainbus, obio, sbus file arch/sparc/dev/amd7930.c audio file arch/sparc/sparc/amd7930intr.s audio @@ -127,35 +127,35 @@ define bt_dac # Include /dev/fb driver only if a framebuffer card is included define fb -device bwtwo class dull: fb +device bwtwo: fb attach bwtwo at sbus, obio, vme file arch/sparc/dev/bwtwo.c bwtwo needs-flag -device cgtwo class dull: fb +device cgtwo: fb attach cgtwo at sbus, obio, vme file arch/sparc/dev/cgtwo.c cgtwo needs-flag -device cgthree class dull: bt_dac, fb +device cgthree: bt_dac, fb attach cgthree at sbus file arch/sparc/dev/cgthree.c cgthree needs-flag -device cgfour class dull: bt_dac, fb +device cgfour: bt_dac, fb attach cgfour at obio file arch/sparc/dev/cgfour.c cgfour needs-flag -device cgsix class dull: bt_dac, fb +device cgsix: bt_dac, fb attach cgsix at sbus, obio file arch/sparc/dev/cgsix.c cgsix needs-flag -device cgeight class dull: bt_dac, fb +device cgeight: bt_dac, fb attach cgeight at obio file arch/sparc/dev/cgeight.c cgeight needs-flag -device tcx class dull: bt_dac, fb +device tcx: bt_dac, fb attach tcx at sbus file arch/sparc/dev/tcx.c tcx needs-flag -device cgfourteen class dull: fb +device cgfourteen: fb attach cgfourteen at obio file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag @@ -169,9 +169,9 @@ file arch/sparc/dev/if_le.c le attach ie at obio with ie_obio file arch/sparc/dev/if_ie_obio.c ie_obio -device si class dull: scsi, ncr5380sbc +device si: scsi, ncr5380sbc attach si at vme -device sw class dull: scsi, ncr5380sbc +device sw: scsi, ncr5380sbc attach sw at obio file arch/sparc/dev/si.c si | sw diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3 index 18767c7ea654..eaa6c2c029ed 100644 --- a/sys/arch/sun3/conf/files.sun3 +++ b/sys/arch/sun3/conf/files.sun3 @@ -1,4 +1,4 @@ -# $NetBSD: files.sun3,v 1.45 1998/02/05 04:56:31 gwr Exp $ +# $NetBSD: files.sun3,v 1.46 1998/02/16 22:12:47 thorpej Exp $ # # sun3-specific configuration info @@ -57,23 +57,23 @@ file dev/cons.c # Bus types # -device mainbus class dull {} +device mainbus {} attach mainbus at root file arch/sun3/sun3/mainbus.c # On-board I/O space (required). -device obio class dull {addr = -1, [ipl = -1], [vect = -1]} +device obio {addr = -1, [ipl = -1], [vect = -1]} attach obio at mainbus file arch/sun3/sun3/obio.c _sun3_ file arch/sun3/sun3x/obio.c _sun3x_ # On-board MEMory space (optional). -device obmem class dull {addr = -1, [ipl = -1], [vect = -1]} +device obmem {addr = -1, [ipl = -1], [vect = -1]} attach obmem at mainbus file arch/sun3/sun3/obmem.c obmem # VME (unit encodes address/data sizes) -device vme class dull {addr = -1, [ipl = -1], [vect = -1]} +device vme {addr = -1, [ipl = -1], [vect = -1]} attach vme at mainbus file arch/sun3/sun3/vme.c vme @@ -86,10 +86,10 @@ include "../../../dev/scsipi/files.scsipi" # Devices and attributes needed below # -device ie class ifnet: ifnet, ether, arp +device ie: ifnet, ether, arp file arch/sun3/dev/if_ie.c ie -device si class dull: scsi, ncr5380sbc +device si: scsi, ncr5380sbc file arch/sun3/dev/si.c si define fb @@ -107,37 +107,37 @@ file arch/sun3/sun3/idprom.c _sun3_ file arch/sun3/sun3x/idprom.c _sun3x_ # Interrupt register -device intreg class dull +device intreg attach intreg at obio file arch/sun3/sun3/intreg.c intreg # Memory error register -device memerr class dull +device memerr attach memerr at obio file arch/sun3/dev/memerr.c memerr # Zilog Serial (ZS) -device zsc class dull {channel = -1} +device zsc {channel = -1} attach zsc at obio file arch/sun3/dev/zs.c zsc needs-flag file dev/ic/z8530sc.c zsc # Intersil or Mostek clock -device clock class dull +device clock attach clock at obio -device oclock class dull +device oclock attach oclock at obio file arch/sun3/sun3/clock.c _sun3_ file arch/sun3/sun3x/clock.c _sun3x_ file dev/clock_subr.c # EEPROM (or NV-RAM) -device eeprom class dull +device eeprom attach eeprom at obio file arch/sun3/dev/eeprom.c eeprom # I/O MMU (a.k.a I/O mapper) -device iommu class dull +device iommu attach iommu at obio file arch/sun3/sun3x/iommu.c _sun3x_ @@ -158,20 +158,20 @@ attach si at obio with si_obio file arch/sun3/dev/si_obio.c si_obio # Sun3/80 on-board SCSI -device esp class dull: scsi, ncr53c9x +device esp: scsi, ncr53c9x attach esp at obio file arch/sun3/dev/esp.c esp file arch/sun3/dev/dma.c esp # Sun3/80 Floppy disk -device fdc class dull {} +device fdc {} attach fdc at obio -device fd class disk: disk +device fd: disk attach fd at fdc file arch/sun3/dev/fd.c fdc | fd needs-flag # Sun3/80 printer port -device pp class dull +device pp attach pp at obio file arch/sun3/dev/pp.c pp needs-flag @@ -179,11 +179,11 @@ file arch/sun3/dev/pp.c pp needs-flag # On-Board MEMory (OBMEM) # -device bwtwo class dull: fb +device bwtwo: fb attach bwtwo at obmem file arch/sun3/dev/bw2.c bwtwo needs-flag -device cgfour class dull: fb +device cgfour: fb attach cgfour at obmem file arch/sun3/dev/cg4.c cgfour needs-flag @@ -198,7 +198,7 @@ attach si at vme with si_vme file arch/sun3/dev/si_vme.c si_vme # Sun3/E SCSI+Ethernet board -device sebuf class dull {} +device sebuf {} attach sebuf at vme file arch/sun3/dev/sebuf.c sebuf attach ie at sebuf with ie_sebuf @@ -206,19 +206,19 @@ file arch/sun3/dev/if_ie_sebuf.c ie_sebuf attach si at sebuf with si_sebuf file arch/sun3/dev/si_sebuf.c si_sebuf -device cgtwo class dull: fb +device cgtwo: fb attach cgtwo at vme file arch/sun3/dev/cg2.c cgtwo needs-flag -device xyc class dull {drive = -1} +device xyc {drive = -1} attach xyc at vme -device xy class disk: disk +device xy: disk attach xy at xyc file arch/sun3/dev/xy.c xy needs-flag -device xdc class dull {drive = -1} +device xdc {drive = -1} attach xdc at vme -device xd class disk: disk +device xd: disk attach xd at xdc file arch/sun3/dev/xd.c xd needs-flag @@ -227,7 +227,7 @@ file arch/sun3/dev/xd.c xd needs-flag # Console (zs) related stuff # -device zstty class tty: tty +device zstty: tty attach zstty at zsc file dev/ic/z8530tty.c zstty needs-flag file arch/sun3/dev/zs_kgdb.c kgdb @@ -235,13 +235,13 @@ file arch/sun3/dev/zs_kgdb.c kgdb define zsevent file dev/sun/event.c zsevent -device kbd class dull: zsevent +device kbd: zsevent attach kbd at zsc file dev/sun/kbd.c kbd needs-flag file dev/sun/kbd_tables.c kbd file arch/sun3/dev/kd.c kbd -device ms class dull: zsevent +device ms: zsevent attach ms at zsc file dev/sun/ms.c ms needs-flag diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index fd4ab597d424..629719495fac 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.31 1998/02/08 14:05:19 ragge Exp $ +# $NetBSD: files.vax,v 1.32 1998/02/16 22:12:48 thorpej Exp $ # # new style config file for vax architecture # @@ -8,45 +8,45 @@ maxpartitions 8 maxusers 8 32 64 -device backplane class dull { } +device backplane { } attach backplane at root -device sbi class dull { tr=-1 } +device sbi { tr=-1 } attach sbi at backplane file arch/vax/vax/sbi.c sbi needs-flag -device cmi class dull { tr=-1 } +device cmi { tr=-1 } attach cmi at backplane -device bi class dull { node=-1 } +device bi { node=-1 } attach bi at backplane file arch/vax/bi/bi.c bi needs-flag -device vsbus class dull { } +device vsbus { } attach vsbus at backplane file arch/vax/vsa/vsbus.c vsbus -device cpu class cpu +device cpu attach cpu at backplane with cpu_backplane attach cpu at bi with cpu_bi -device mem class dull +device mem attach mem at backplane with mem_backplane attach mem at bi with mem_bi attach mem at sbi with mem_sbi attach mem at cmi with mem_cmi -device mba class dull { drive = -1 } +device mba { drive = -1 } attach mba at sbi with mba_sbi attach mba at cmi with mba_cmi file arch/vax/mba/mba.c mba needs-flag -device hp class disk: disk +device hp: disk attach hp at mba file arch/vax/mba/hp.c hp needs-flag major {hp = 0} -device ht class tape +device ht: tape attach ht at mba file arch/vax/mba/ht.c ht needs-flag @@ -56,58 +56,58 @@ major {ra = 9} major {mt = 16} # KDB50 on BI -device kdb class dull: mscp +device kdb: mscp attach kdb at bi file arch/vax/bi/kdb.c kdb -device uba class dull { csr } +device uba { csr } attach uba at backplane with uba_backplane attach uba at sbi with uba_sbi attach uba at cmi with uba_cmi attach uba at bi with uba_bi file arch/vax/uba/uba.c uba -device mtc class dull: mscp +device mtc: mscp attach mtc at uba -device uda class dull: mscp +device uda: mscp attach uda at uba file arch/vax/uba/uda.c uda | mtc -device de class ifnet: ifnet, ether, arp +device de: ifnet, ether, arp attach de at uba file arch/vax/if/if_de.c de needs-flag # DEQNA/DELQA used on Qbus -device qe class ifnet: ifnet, ether, arp +device qe: ifnet, ether, arp attach qe at uba file arch/vax/if/if_qe.c qe needs-flag # DEBNA/DEBNT Ethernet Adapter -device ni class ifnet: ifnet, ether, arp +device ni: ifnet, ether, arp attach ni at bi file arch/vax/bi/ni.c ni needs-flag # TS11 at UBA -device ts class tape +device ts: tape attach ts at uba file arch/vax/uba/ts.c ts needs-count # DHU-11 at UBA -device dhu class tty +device dhu: tty attach dhu at uba file arch/vax/uba/dhu.c dhu needs-count # DZ11 at UBA -device dz class tty +device dz: tty attach dz at uba file arch/vax/uba/dz.c dz needs-count # RD-type disks at VS2000's onboard MFM-controller -device hdc class dull { drive = -1 } +device hdc { drive = -1 } attach hdc at vsbus file arch/vax/vsa/hdc9224.c hdc needs-flag -device rd class disk: disk +device rd: disk attach rd at hdc major {rd = 19} @@ -123,7 +123,7 @@ major { cd = 22 } major { md = 23 } # builtin NCR5380 SCSI-controller on VAXstation -device ncr class dull: scsi, ncr5380sbc +device ncr: scsi, ncr5380sbc attach ncr at vsbus file arch/vax/vsa/ncr.c ncr needs-flag @@ -133,17 +133,17 @@ file arch/vax/if/if_le.c le needs-flag # DC367-B in VAXstation 2000/3100 (DZ-like 4-port serial line controller, # controls keyboard, mouse, modem, and printer/console) -device dc class tty +device dc: tty attach dc at vsbus file arch/vax/vsa/dc.c dc needs-flag file arch/vax/vsa/lk201.c dc # PM Framebuffer in VAXstation 2000/3100 -device pm class dull +device pm attach pm at vsbus file arch/vax/vsa/pm.c pm needs-flag -device dl class tty +device dl: tty attach dl at uba file arch/vax/uba/dl.c dl needs-flag @@ -152,139 +152,139 @@ file arch/vax/uba/dl.c dl needs-flag # # Ikonas framebuffer -device ik class dull +device ik attach ik at uba file arch/vax/uba/ik.c ik needs-count -device vs class dull +device vs attach vs at uba file arch/vax/uba/vs.c vs needs-count # RK06/07 on UBA -device rk class disk +device rk: disk attach rk at uba file arch/vax/uba/rk.c rk needs-count # TM11/TE10 at UBA -device te class tape +device te: tape attach te at uba file arch/vax/uba/tm.c te needs-count # TU78 at MBA -device mu class tape +device mu: tape attach mu at mba file arch/vax/mba/mt.c mu needs-count # DMF32 on UBA -device dmf class dull # XXX? +device dmf # XXX? attach dmf at uba file arch/vax/uba/dmf.c dmf needs-count file arch/vax/uba/dmz.c dmf needs-count # DMZ32 on UBA -device dmz class dull # XXX? +device dmz # XXX? attach dmz at uba file arch/vax/uba/dmx.c dmz needs-count # DN-11 on UBA -device dn class dull # XXX? +device dn # XXX? attach dn at uba file arch/vax/uba/dn.c dn needs-count # IDC (RB730) on UBA (VAX 11/730) -device idc class dull { drive=-1 } +device idc { drive=-1 } attach idc at uba -device rb class disk +device rb: disk attach rb at idc file arch/vax/uba/idc.c rb needs-count # LP-11 at UBA -device lp class dull +device lp attach lp at uba file arch/vax/uba/lp.c lp needs-count # ???? at UBA -device lpa class dull +device lpa attach lpa at uba file arch/vax/uba/lpa.c lpa needs-count # PS2 at UBA -device ps class dull +device ps attach ps at uba file arch/vax/uba/ps.c ps needs-count # RL02/RL11 at UBA -device hl class dull { drive=-1 } +device hl { drive=-1 } attach hl at uba -device rl class disk +device rl: disk attach rl at hl file arch/vax/uba/rl.c rl needs-count # SC-21/SC-31 at UBA -device sc class dull { drive=-1 } +device sc { drive=-1 } attach sc at uba -device up class disk +device up: disk attach up at sc file arch/vax/uba/up.c up needs-count # TU45 at UBA -device ut class dull { drive=-1} +device ut { drive=-1} attach ut at uba -device tj class tape +device tj: tape attach tj at ut file arch/vax/uba/ut.c tj needs-count # TU58/DECtape II -device uu class tape +device uu: tape attach uu at uba file arch/vax/uba/uu.c uu needs-count # Benson-Varian plotter at UBA -device va class dull { drive=-1} +device va { drive=-1} attach va at uba -device vz class dull +device vz attach vz at va file arch/vax/uba/va.c va needs-count # Versatec plotter at UBA -device vp class dull +device vp attach vp at uba file arch/vax/uba/vp.c vp needs-count # QVSS at UBA -device qv class dull +device qv attach qv at uba file arch/vax/uba/qv.c qv needs-count file arch/vax/uba/qfont.c qv needs-count # QDSS at UBA -device qd class dull +device qd attach qd at uba file arch/vax/uba/qd.c qd needs-count # Interlan NP100 at UBA -device np class ifnet +device np: ifnet attach np at uba file arch/vax/if/if_ix.c np needs-count file arch/vax/uba/np.c np needs-count # ACC LH/DH IMP on UBA -device acc class ifnet +device acc: ifnet attach acc at uba file arch/vax/if/if_acc.c acc needs-count # DR11C at UBA -device ct class dull # XXX +device ct # XXX attach ct at uba file arch/vax/uba/ct.c ct needs-count # A/D-converter on UBA -device ad class dull +device ad attach ad at uba file arch/vax/uba/ad.c ad needs-count # DH-11/DM-11 on UBA -device dh class dull # XXX? +device dh # XXX? attach dh at uba file arch/vax/uba/dh.c dh needs-count diff --git a/sys/arch/vax/mscp/files.mscp b/sys/arch/vax/mscp/files.mscp index 25ce02fcad39..9c1c29325df0 100644 --- a/sys/arch/vax/mscp/files.mscp +++ b/sys/arch/vax/mscp/files.mscp @@ -1,4 +1,4 @@ -# $NetBSD: files.mscp,v 1.3 1998/02/08 14:03:45 ragge Exp $ +# $NetBSD: files.mscp,v 1.4 1998/02/16 22:12:48 thorpej Exp $ # # File and device description for MSCP devices. # @@ -7,17 +7,17 @@ define mscp {} file arch/vax/mscp/mscp.c file arch/vax/mscp/mscp_subr.c -device mscpbus class dull {drive = -1} +device mscpbus {drive = -1} attach mscpbus at mscp -device rx class disk: disk +device rx: disk attach rx at mscpbus -device ra class disk: disk +device ra: disk attach ra at mscpbus file arch/vax/mscp/mscp_disk.c ra | rx needs-flag -device mt class tape: tape +device mt: tape attach mt at mscpbus file arch/vax/mscp/mscp_tape.c mt needs-flag diff --git a/sys/arch/x68k/conf/files.x68k b/sys/arch/x68k/conf/files.x68k index 38e3b6cde8f7..8fbd199f3c28 100644 --- a/sys/arch/x68k/conf/files.x68k +++ b/sys/arch/x68k/conf/files.x68k @@ -1,4 +1,4 @@ -# $NetBSD: files.x68k,v 1.18 1998/02/01 21:23:33 is Exp $ +# $NetBSD: files.x68k,v 1.19 1998/02/16 22:12:48 thorpej Exp $ # # new style config file for x68k architecture # @@ -8,10 +8,10 @@ maxpartitions 8 maxusers 2 16 64 -device mainbus class dull {} +device mainbus {} attach mainbus at root -device cpu class cpu +device cpu attach cpu at mainbus define event {} @@ -55,34 +55,34 @@ major {cd = 7} major {sd = 4} major {st = 5} -device spc class dull: scsi +device spc: scsi attach spc at mainbus file arch/x68k/dev/spc.c spc needs-count -device mha class dull: scsi +device mha: scsi attach mha at mainbus file arch/x68k/dev/mha.c mha needs-count -device ed class ifnet: ether, ifnet, arp +device ed: ether, ifnet, arp attach ed at mainbus file arch/x68k/dev/if_ed.c ed needs-flag -device fdc class dull { unit = -1 } +device fdc { unit = -1 } attach fdc at mainbus -device fd class disk +device fd: disk attach fd at fdc file arch/x68k/dev/fd.c fd needs-flag -device zs class tty: tty +device zs: tty attach zs at mainbus file arch/x68k/dev/zs.c zs needs-count -device xcom class tty: tty +device xcom: tty attach xcom at mainbus file arch/x68k/dev/com.c xcom needs-count -device par class dull +device par attach par at mainbus file arch/x68k/dev/par.c par needs-flag @@ -93,10 +93,10 @@ file arch/x68k/dev/ms.c mouse # graphic devices define grfb {} -device grfbus class dull: grfb +device grfbus: grfb attach grfbus at mainbus -device grf class dull {} +device grf {} attach grf at grfb file arch/x68k/dev/grf.c grf needs-count file arch/x68k/dev/grf_conf.c grf|ite @@ -104,7 +104,7 @@ file arch/x68k/dev/grf_machdep.c grf|ite file arch/x68k/dev/grf_tv.c grf|ite file arch/x68k/dev/grf_gv.c grf|ite -device ite class tty +device ite: tty attach ite at grf file arch/x68k/dev/ite.c ite needs-flag file arch/x68k/dev/ite_tv.c grf|ite @@ -114,7 +114,7 @@ pseudo-device bell file arch/x68k/dev/opmbell.c bell needs-flag file arch/x68k/dev/opm.c bell|fdc -device adpcm class dull: audio +device adpcm: audio attach adpcm at mainbus file arch/x68k/dev/bsd_audio.c adpcm needs-flag file arch/x68k/dev/adpcm.c adpcm diff --git a/sys/conf/files b/sys/conf/files index 9693c20807e1..2b0bc7e81f85 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.172 1998/02/12 20:12:03 thorpej Exp $ +# $NetBSD: files,v 1.173 1998/02/16 22:12:48 thorpej Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -32,11 +32,13 @@ defopt opt_uvm.h UVM defopt opt_uvmhist.h UVMHIST UVMHIST_PRINT defopt opt_pmap_new.h PMAP_NEW +# device classes +devclass disk +devclass tape +devclass ifnet +devclass tty + # generic attributes -define disk -define tape -define ifnet -define tty define audio { } define scsi {[channel = -1]} define ata {[drive = -1]} @@ -48,7 +50,7 @@ define mulaw define auconv # audio device, attaches to audio hardware driver -device audio class dull +device audio attach audio at audio # net device attributes - we have generic code for arc(net), ether(net), @@ -64,9 +66,9 @@ define arp # Device description for machine-independent IPKDB code. define ipkdb -device ipkdbif class dull: ipkdb -device ipkdbslip class dull: ipkdb -device ipkdbppp class dull: ipkdb +device ipkdbif: ipkdb +device ipkdbslip: ipkdb +device ipkdbppp: ipkdb # Common files for any ipkdb support file ipkdb/ipkdb_ipkdb.c ipkdb needs-flag @@ -83,43 +85,43 @@ file ipkdb/ipkdb_ppp.c ipkdbppp needs-flag # contain the cfdrivers. Attachments are provided by files. # Adaptec AIC-6[32]60 ICs -device aic class dull: scsi +device aic: scsi file dev/ic/aic6360.c aic # Adaptec 2[789]4X, 394X, aic7770 and aic78[5678]0 SCSI controllers -device ahc class dull: scsi +device ahc: scsi file dev/ic/aic7xxx.c ahc # BusLogic MultiMaster and MultiMaster Ultra SCSI controllers # (Must be declared before AHA to ensure bha probes before aha. # Probing AHA first configures bhas as aha, via their AHA # hardware-compatibility mode.) -device bha class dull: scsi +device bha: scsi file dev/ic/bha.c bha # Adaptec AHA-154x and AHA-164x controllers # (must be after bha, see above) -device aha class dull: scsi +device aha: scsi file dev/ic/aha.c aha # Qlogic ISP 10x0 SCSI Controllers -device isp class dull: scsi +device isp: scsi file dev/ic/isp.c isp # UltraStor SCSI controllers -device uha class dull: scsi +device uha: scsi file dev/ic/uha.c uha # 3Com Etherlink-III Ethernet controller -device ep class ifnet: arp, ether, ifnet +device ep: arp, ether, ifnet file dev/ic/elink3.c ep # DEC EtherWORKS III (LEMAC) Ethernet controllers -device lc class ifnet: arp, ether, ifnet +device lc: arp, ether, ifnet file dev/ic/lemac.c lc # LANCE and PCnet Ethernet controllers -device le class ifnet: arp, ether, ifnet +device le: arp, ether, ifnet file dev/ic/am7990.c le # 8390-family Ethernet controllers @@ -136,11 +138,11 @@ file dev/ic/pdq.c pdq file dev/ic/pdq_ifsubr.c pdq # Cyclades Cyclom-8/16/32 -device cy class tty: tty +device cy: tty file dev/ic/cy.c cy needs-flag # Efficient Networks, Inc. ATM interface -device en class ifnet: atm, ifnet +device en: atm, ifnet file dev/ic/midway.c en # NCR 53x9x or Emulex ESP SCSI Controller @@ -152,7 +154,7 @@ define i82586 file dev/ic/i82586.c i82586 # SMC 91Cxx Ethernet Controller -device sm class ifnet: arp, ether, ifnet +device sm: arp, ether, ifnet file dev/ic/smc91cxx.c sm # Interwave Am78C201 audio driver @@ -165,12 +167,12 @@ file dev/ic/tms320av110.c tms320av110 # Novell NE2000-compatible Ethernet cards, based on the # National Semiconductor DS8390. -device ne class ifnet: ether, ifnet, arp, dp8390nic +device ne: ether, ifnet, arp, dp8390nic file dev/ic/ne2000.c ne # 8250/16[45]50-based "com" ports # XXX In a perfect world, this would be done with attributes -device com class tty: tty +device com: tty file dev/ic/com.c com needs-flag # Device description for i2c bus and i2c eeprom @@ -181,7 +183,7 @@ define i2c_eeprom # XXX BECAUSE NOT ALL PORTS USE THE MI wdc DRIVER YET. # # # ESDI/IDE/etc. controllers -# device wdc class dull: ata, atapi +# device wdc: ata, atapi # file dev/ic/wdc.c # wdc & (wd | !wd) needs-flag # XXX diff --git a/sys/dev/ata/files.ata b/sys/dev/ata/files.ata index a52fb3b8c2d2..7ba666a586b9 100644 --- a/sys/dev/ata/files.ata +++ b/sys/dev/ata/files.ata @@ -1,4 +1,4 @@ -# $NetBSD: files.ata,v 1.1 1998/01/14 23:36:32 cgd Exp $ +# $NetBSD: files.ata,v 1.2 1998/02/16 22:12:50 thorpej Exp $ # # Config file and device description for machine-independent devices # which attach to ATA busses. Included by ports that need it. Ports @@ -6,6 +6,6 @@ # appropriate devices. # ATA disks -device wd class disk: disk +device wd: disk attach wd at ata file dev/ata/wd.c wd needs-flag diff --git a/sys/dev/eisa/files.eisa b/sys/dev/eisa/files.eisa index d2134c44571a..d2a64949b015 100644 --- a/sys/dev/eisa/files.eisa +++ b/sys/dev/eisa/files.eisa @@ -1,4 +1,4 @@ -# $NetBSD: files.eisa,v 1.16 1998/01/12 08:48:28 thorpej Exp $ +# $NetBSD: files.eisa,v 1.17 1998/02/16 22:12:48 thorpej Exp $ # # Config file and device description for machine-independent EISA code. # Included by ports that need it. Requires that the SCSI files be @@ -6,12 +6,12 @@ defopt EISAVERBOSE -device eisa class dull {[slot = -1]} +device eisa {[slot = -1]} attach eisa at eisabus file dev/eisa/eisa.c eisa needs-flag # Adaptec AHA-174x EISA SCSI Host Adapter family -device ahb class dull: scsi +device ahb: scsi attach ahb at eisa file dev/eisa/ahb.c ahb @@ -36,6 +36,6 @@ attach ep at eisa with ep_eisa file dev/eisa/if_ep_eisa.c ep_eisa # DEC DEFEA EISA FDDI Controller -device fea class ifnet: pdq, fddi, ifnet, arp +device fea: pdq, fddi, ifnet, arp attach fea at eisa file dev/eisa/if_fea.c fea diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa index 4360c6b9f440..446a23bc3b0b 100644 --- a/sys/dev/isa/files.isa +++ b/sys/dev/isa/files.isa @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.51 1998/01/19 22:18:28 augustss Exp $ +# $NetBSD: files.isa,v 1.52 1998/02/16 22:12:49 thorpej Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -8,7 +8,7 @@ # devices: # mcd, scd, wd, wt -device isa class dull {[port = -1], [size = 0], +device isa {[port = -1], [size = 0], [iomem = -1], [iosiz = 0], [irq = -1], [drq = -1], [drq2 = -1]} attach isa at isabus @@ -25,17 +25,17 @@ file dev/isa/isadma.c isadma needs-flag define commulti {[slave = -1]} # AST 4-port board -device ast class dull: commulti +device ast: commulti attach ast at isa file dev/isa/ast.c ast # BOCA 8-port board -device boca class dull: commulti +device boca: commulti attach boca at isa file dev/isa/boca.c boca # IBM RT PC 4-port board -device rtfps class dull: commulti +device rtfps: commulti attach rtfps at isa file dev/isa/rtfps.c rtfps @@ -55,7 +55,7 @@ file dev/isa/cy_isa.c cy_isa # PC-style parallel ports (XXX what chip?) # XXX chip driver should be defined elsewhere -device lpt class dull +device lpt file dev/ic/lpt.c lpt needs-flag # PC-style parallel ports: ISA bus attachment @@ -78,7 +78,7 @@ file dev/isa/aic_isa.c aic_isa # Qlogic ESP406/FAS408 boards # ncr53c9x device declaration in sys/conf/files -device esp class dull: scsi, ncr53c9x, isadma +device esp: scsi, ncr53c9x, isadma attach esp at isa with esp_isa file dev/isa/esp_isa.c esp_isa @@ -88,7 +88,7 @@ attach bha at isa with bha_isa: isadma file dev/isa/bha_isa.c bha_isa # Seagate ST0[12] ICs -device sea class dull: scsi, isadma +device sea: scsi, isadma attach sea at isa file dev/isa/seagate.c sea @@ -98,7 +98,7 @@ attach uha at isa with uha_isa: isadma file dev/isa/uha_isa.c uha_isa # Western Digital WD7000 and Future Domain TMC-7000 boards -device wds class dull: scsi, isadma +device wds: scsi, isadma attach wds at isa file dev/isa/wds.c wds @@ -107,12 +107,12 @@ file dev/isa/wds.c wds # # Mitsumi CD-ROM controllers -device mcd class disk: disk +device mcd: disk attach mcd at isa file dev/isa/mcd.c mcd needs-flag # Sony CDU-3[13]A CD-ROM drives -device scd class disk: disk +device scd: disk attach scd at isa file dev/isa/scd.c scd needs-flag @@ -120,7 +120,7 @@ file dev/isa/scd.c scd needs-flag # XXX BECAUSE NOT ALL PORTS USE THE MI DRIVER YET. # ESDI/IDE/etc. controllers -device wdc class dull: ata, atapi +device wdc: ata, atapi file dev/ic/wdc.c wdc & (wd | !wd) needs-flag # XXX @@ -128,7 +128,7 @@ attach wdc at isa with wdc_isa: isadma file dev/isa/wdc_isa.c wdc_isa # Wangtek- and Archive-compatible tape controller boards -device wt class tape: tape, isadma +device wt: tape, isadma attach wt at isa file dev/isa/wt.c wt needs-flag @@ -139,7 +139,7 @@ file dev/isa/wt.c wt needs-flag # WD/SMC 80x3 family, SMC Elite Ultra [8216], SMC EtherEZ # MUST be first: probe is non invasive, and registers are clobbered # by other drivers's probe -device we class ifnet: ether, ifnet, arp, dp8390nic +device we: ether, ifnet, arp, dp8390nic attach we at isa file dev/isa/if_we.c we @@ -148,17 +148,17 @@ define elink file dev/isa/elink.c elink # 3Com 3C503 -device ec class ifnet: ether, ifnet, arp, dp8390nic +device ec: ether, ifnet, arp, dp8390nic attach ec at isa file dev/isa/if_ec.c ec # 3Com 3C505 -device eg class ifnet: ether, ifnet, arp +device eg: ether, ifnet, arp attach eg at isa file dev/isa/if_eg.c eg # 3Com 3C501 -device el class ifnet: ether, ifnet, arp +device el: ether, ifnet, arp attach el at isa file dev/isa/if_el.c el @@ -169,7 +169,7 @@ file dev/isa/if_ep_isa.c ep_isa # Fujitsu MB8696[05]-based boards # (Allied Telesis AT1700) -device fe class ifnet: ether, ifnet, arp +device fe: ether, ifnet, arp attach fe at isa file dev/isa/if_fe.c fe @@ -181,7 +181,7 @@ file dev/isa/if_fe.c fe # Intel i82595-based boards. # (Intel EtherExpress PRO) -device iy class ifnet: ether, ifnet, arp +device iy: ether, ifnet, arp attach iy at isa file dev/isa/if_iy.c iy @@ -212,7 +212,7 @@ file dev/isa/if_sm_isa.c sm_isa # Intel i82586-based boards # (AT&T StarLAN 10, AT&T EN100, AT&T StarLAN Fiber, 3Com 3C507) # MUST BE LAST ! the probe clobbers some boards (like SMC boards). -device ie class ifnet: ether, ifnet, elink, arp +device ie: ether, ifnet, elink, arp attach ie at isa file dev/isa/if_ie.c ie @@ -225,14 +225,14 @@ define sbdsp file dev/isa/sbdsp.c sbdsp # SoundBlaster family -device sb class dull: audio, isadma, sbdsp, mulaw, auconv +device sb: audio, isadma, sbdsp, mulaw, auconv file dev/isa/sb.c sb needs-flag attach sb at isa with sb_isa file dev/isa/sb_isa.c sb_isa needs-flag # ProAudio Spectrum -device pas class dull: audio, isadma, sbdsp, mulaw, auconv +device pas: audio, isadma, sbdsp, mulaw, auconv attach pas at isa file dev/isa/pas.c pas needs-flag @@ -246,16 +246,16 @@ file dev/isa/ics2101.c ics2101 # Audio systems based on Echo Speech Corp. ESC61[45] ASICs -device pss class dull {[port = -1], [size = 0], +device pss {[port = -1], [size = 0], [iomem = -1], [iosiz = 0], [irq = -1], [drq = -1]} attach pss at isa -device sp class dull: audio, isadma, ad1848, auconv +device sp: audio, isadma, ad1848, auconv attach sp at pss file dev/isa/pss.c pss needs-flag # Microsoft Windows Sound System -device wss class dull: audio, isadma, ad1848, auconv +device wss: audio, isadma, ad1848, auconv file dev/isa/wss.c wss needs-flag attach wss at isa with wss_isa @@ -264,13 +264,13 @@ file dev/isa/wss_isa.c wss_isa needs-flag # Gravis UltraSound & UltraSound MAX. # Use the "flags" keyword in a config file to specify an extra DMA # channel for full-duplex operation. -device gus class dull: audio, isadma, ics2101, ad1848, mulaw, auconv +device gus: audio, isadma, ics2101, ad1848, mulaw, auconv attach gus at isa file dev/isa/gus.c gus needs-flag # # PlanetConnect satellite receiver driver. # -device satlink class dull: isadma +device satlink: isadma attach satlink at isa file dev/isa/satlink.c satlink needs-flag diff --git a/sys/dev/isapnp/files.isapnp b/sys/dev/isapnp/files.isapnp index 84d0a70128dc..b89657f6d9c1 100644 --- a/sys/dev/isapnp/files.isapnp +++ b/sys/dev/isapnp/files.isapnp @@ -1,11 +1,11 @@ -# $NetBSD: files.isapnp,v 1.9 1998/01/23 20:40:58 mycroft Exp $ +# $NetBSD: files.isapnp,v 1.10 1998/02/16 22:12:49 thorpej Exp $ # # Config file and device description for machine-independent ISAPnP code. # Included by ports that need it. # XXX: We don't use locators currenly... -device isapnp class dull {[port = -1], [size = 0], +device isapnp {[port = -1], [size = 0], [iomem = -1], [iosiz = 0], [irq = -1], [drq = -1]} attach isapnp at isa @@ -42,6 +42,6 @@ attach sb at isapnp with sb_isapnp file dev/isapnp/sb_isapnp.c sb_isapnp # GUS Pnp (Interwave) -device guspnp class dull: audio, isadma, interwave, mulaw +device guspnp: audio, isadma, interwave, mulaw attach guspnp at isapnp file dev/isapnp/gus_isapnp.c guspnp needs-flag diff --git a/sys/dev/mii/files.mii b/sys/dev/mii/files.mii index 372f416f8993..c0d85b59272d 100644 --- a/sys/dev/mii/files.mii +++ b/sys/dev/mii/files.mii @@ -1,15 +1,15 @@ -# $NetBSD: files.mii,v 1.3 1998/01/12 09:28:51 thorpej Exp $ +# $NetBSD: files.mii,v 1.4 1998/02/16 22:12:50 thorpej Exp $ -device mii class dull {dev = -1} +device mii {dev = -1} attach mii at miibus file dev/mii/mii.c miibus file dev/mii/generic_phy.c miibus -device tlphy class dull +device tlphy attach tlphy at mii file dev/mii/tlphy.c tlphy -device nsphy class dull +device nsphy attach nsphy at mii file dev/mii/nsphy.c nsphy diff --git a/sys/dev/ofisa/files.ofisa b/sys/dev/ofisa/files.ofisa index ad2290cfeb9e..59db2adfc30b 100644 --- a/sys/dev/ofisa/files.ofisa +++ b/sys/dev/ofisa/files.ofisa @@ -1,9 +1,9 @@ -# $NetBSD: files.ofisa,v 1.2 1998/02/07 00:49:19 cgd Exp $ +# $NetBSD: files.ofisa,v 1.3 1998/02/16 22:12:50 thorpej Exp $ # OFW ISA bus support # XXX eventually we should do something with these locators define ofisa { [i = -1], [it = -1], [iv = -1], [m = -1] } -device ofisa class dull: ofisa, openfirm +device ofisa: ofisa, openfirm attach ofisa at openfirm file dev/ofisa/ofisa.c ofisa diff --git a/sys/dev/ofw/files.ofw b/sys/dev/ofw/files.ofw index 2f385eb6f723..55238b5d6be6 100644 --- a/sys/dev/ofw/files.ofw +++ b/sys/dev/ofw/files.ofw @@ -1,4 +1,4 @@ -# $NetBSD: files.ofw,v 1.6 1998/01/26 21:47:35 cgd Exp $ +# $NetBSD: files.ofw,v 1.7 1998/02/16 22:12:49 thorpej Exp $ # # First cut on Openfirmware interface # @@ -8,32 +8,32 @@ define openfirm {} file dev/ofw/ofw_subr.c openfirm # Generic disk support -device ofdisk class disk: disk +device ofdisk: disk attach ofdisk at openfirm file dev/ofw/ofdisk.c ofdisk needs-flag # Generic net support define ipkdbofn { [ disable = 0 ] } -device ofnet class ifnet: ether, ifnet, ipkdbofn, arp +device ofnet: ether, ifnet, ipkdbofn, arp attach ofnet at openfirm file dev/ofw/ofnet.c ofnet | ipkdb_ofn needs-flag attach ipkdbif at ipkdbofn with ipkdb_ofn # Generic console support -device ofcons class tty: tty +device ofcons: tty attach ofcons at openfirm file dev/ofw/ofcons.c ofcons needs-flag # Generic RTC support -device ofrtc class dull +device ofrtc attach ofrtc at openfirm file dev/ofw/ofrtc.c ofrtc needs-flag # Generic bus support -device ofbus class dull: openfirm +device ofbus: openfirm attach ofbus at openfirm file dev/ofw/ofbus.c openfirm -device ofroot class dull: openfirm +device ofroot: openfirm attach ofroot at root diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index ef7020ee2a26..0797fec2549b 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.32 1998/01/12 09:39:57 thorpej Exp $ +# $NetBSD: files.pci,v 1.33 1998/02/16 22:12:49 thorpej Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -6,7 +6,7 @@ defopt PCIVERBOSE -device pci class dull {[dev = -1], [function = -1]} +device pci {[dev = -1], [function = -1]} attach pci at pcibus file dev/pci/pci.c pci needs-flag file dev/pci/pci_map.c pci @@ -29,7 +29,7 @@ attach isp at pci with isp_pci file dev/pci/isp_pci.c isp_pci # Ethernet driver for DC21040-based boards -device de class ifnet: ether, ifnet, arp +device de: ether, ifnet, arp attach de at pci file dev/pci/if_de.c de @@ -44,7 +44,7 @@ attach ep at pci with ep_pci file dev/pci/if_ep_pci.c ep_pci # Digital DEFPA PCI FDDI Controller -device fpa class ifnet: pdq, fddi, ifnet, arp +device fpa: pdq, fddi, ifnet, arp attach fpa at pci file dev/pci/if_fpa.c fpa @@ -54,12 +54,12 @@ attach le at pci with le_pci file dev/pci/if_le_pci.c le_pci # NCR 53c8xx SCSI chips -device ncr class dull: scsi +device ncr: scsi attach ncr at pci file dev/pci/ncr.c ncr # PCI-PCI bridge chips -device ppb class dull: pcibus +device ppb: pcibus attach ppb at pci file dev/pci/ppb.c ppb @@ -68,7 +68,7 @@ attach cy at pci with cy_pci file dev/pci/cy_pci.c cy_pci # Intel EtherExpress PRO 10/100B -device fxp class ifnet: ether, ifnet, arp +device fxp: ether, ifnet, arp attach fxp at pci file dev/pci/if_fxp.c fxp @@ -77,6 +77,6 @@ attach ne at pci with ne_pci file dev/pci/if_ne_pci.c ne_pci # Texas Instruments ThunderLAN Chip. -device tl class ifnet: ether, ifnet, arp, i2c, i2c_eeprom, miibus +device tl: ether, ifnet, arp, i2c, i2c_eeprom, miibus attach tl at pci file dev/pci/if_tl.c tl diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia index 65076054d128..2a0429ed91a6 100644 --- a/sys/dev/pcmcia/files.pcmcia +++ b/sys/dev/pcmcia/files.pcmcia @@ -1,11 +1,11 @@ -# $NetBSD: files.pcmcia,v 1.6 1998/01/23 01:18:52 mycroft Exp $ +# $NetBSD: files.pcmcia,v 1.7 1998/02/16 22:12:49 thorpej Exp $ # # Config.new file and device description for machine-independent PCMCIA code. # Included by ports that need it. defopt PCMCIAVERBOSE -device pcmcia class dull {[function = -1], [irq = -1]} +device pcmcia {[function = -1], [irq = -1]} file dev/pcmcia/pcmcia.c pcmcia file dev/pcmcia/pcmcia_cis.c pcmcia @@ -30,7 +30,7 @@ attach com at pcmcia with com_pcmcia file dev/pcmcia/com_pcmcia.c com_pcmcia # Digital RoamAbout / Lucent WaveLAN PCMCIA card -device wl class ifnet: arp, ether, ifnet +device wl: arp, ether, ifnet attach wl at pcmcia with wl_pcmcia file dev/pcmcia/if_wl_pcmcia.c wl_pcmcia diff --git a/sys/dev/scsipi/files.scsipi b/sys/dev/scsipi/files.scsipi index 1fc901a7a80e..237b4f16bbbf 100644 --- a/sys/dev/scsipi/files.scsipi +++ b/sys/dev/scsipi/files.scsipi @@ -1,4 +1,4 @@ -# $NetBSD: files.scsipi,v 1.13 1998/01/15 02:21:35 cgd Exp $ +# $NetBSD: files.scsipi,v 1.14 1998/02/16 22:12:49 thorpej Exp $ # # Config file and device description for machine-independent SCSI code. # Included by ports that need it. Ports that use it must provide @@ -12,50 +12,50 @@ file dev/scsipi/scsipi_ioctl.c scsi | atapi file dev/scsipi/scsi_base.c scsi file dev/scsipi/atapi_base.c atapi -device scsibus class dull {target = -1, lun = -1} +device scsibus {target = -1, lun = -1} attach scsibus at scsi file dev/scsipi/scsiconf.c scsibus needs-flag -device atapibus class dull {drive = -1} +device atapibus {drive = -1} attach atapibus at atapi file dev/scsipi/atapiconf.c atapibus needs-flag -device cd class disk: disk +device cd: disk attach cd at scsibus with cd_scsibus attach cd at atapibus with cd_atapibus file dev/scsipi/cd_scsi.c cd_scsibus file dev/scsipi/cd_atapi.c cd_atapibus file dev/scsipi/cd.c cd | cd_scsibus | cd_atapibus needs-flag -device ch class dull: disk +device ch attach ch at scsibus file dev/scsipi/ch.c ch needs-flag -device se class ifnet: ifnet, ether, arp +device se: ifnet, ether, arp attach se at scsibus file dev/scsipi/if_se.c se needs-flag -device sd class disk: disk +device sd: disk attach sd at scsibus with sd_scsibus attach sd at atapibus with sd_atapibus file dev/scsipi/sd_scsi.c sd_scsibus file dev/scsipi/sd_atapi.c sd_atapibus file dev/scsipi/sd.c sd | sd_scsibus | sd_atapibus needs-flag -device st class tape: tape +device st: tape attach st at scsibus file dev/scsipi/st.c st needs-flag -device ss class dull: tape +device ss attach ss at scsibus file dev/scsipi/ss.c ss needs-flag file dev/scsipi/ss_mustek.c ss file dev/scsipi/ss_scanjet.c ss -device su class dull: disk +device su attach su at scsibus file dev/scsipi/su.c su needs-flag -device uk class dull: disk +device uk attach uk at scsibus file dev/scsipi/uk.c uk needs-flag diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc index c012697d9867..6b3bdb31d668 100644 --- a/sys/dev/tc/files.tc +++ b/sys/dev/tc/files.tc @@ -1,16 +1,16 @@ -# $NetBSD: files.tc,v 1.11 1998/01/12 09:51:30 thorpej Exp $ +# $NetBSD: files.tc,v 1.12 1998/02/16 22:12:49 thorpej Exp $ # # Config file and device description for machine-independent # TurboChannel code. Included by ports that need it. defopt TCVERBOSE -device tc class dull {[slot = -1], [offset = -1]} +device tc {[slot = -1], [offset = -1]} #attach tc at tcbus file dev/tc/tc.c tc needs-flag # The TurboChannel IOCTL ASIC -device ioasic class dull { offset = -1 } +device ioasic { offset = -1 } attach ioasic at tc # LANCE attachments. @@ -25,7 +25,7 @@ file dev/tc/if_le_tc.c le_tc # DEC DEFTA TC FDDI Controller -device fta class ifnet: pdq, fddi, ifnet, arp +device fta: pdq, fddi, ifnet, arp attach fta at tc file dev/tc/if_fta.c fta @@ -34,11 +34,10 @@ define stic file dev/tc/stic.c stic # DEC PMAG-C 2-D pixelstamp graphics board -device px class dull +device px attach px at tc: stic file dev/tc/px.c px # DEC PMAG-D/E/F 3-D pixelstamp+i860 8,24-plane,z-buffer graphics board -device pxg class dull: stic +device pxg: stic attach pxg at tc - diff --git a/sys/dev/vme/files.vme b/sys/dev/vme/files.vme index 0d6046b88c4e..e2f0cb29fe99 100644 --- a/sys/dev/vme/files.vme +++ b/sys/dev/vme/files.vme @@ -1,24 +1,24 @@ -# $NetBSD: files.vme,v 1.3 1998/01/12 09:54:57 thorpej Exp $ +# $NetBSD: files.vme,v 1.4 1998/02/16 22:12:50 thorpej Exp $ # # Config file and device description for machine-independent VME code. # Included by ports that need it. -device vme class dull {addr = -1, pri = -1, vec = -1} +device vme {addr = -1, pri = -1, vec = -1} file dev/vme/vme.c vme -device ie class ifnet: ifnet, ether, arp, i82586 +device ie: ifnet, ether, arp, i82586 attach ie at vme with ie_vme file dev/vme/if_ie_vme.c ie_vme -device xdc class dull {drive = -1} +device xdc {drive = -1} attach xdc at vme -device xd class disk: disk +device xd: disk attach xd at xdc file dev/vme/xd.c xd needs-flag -device xyc class dull {drive = -1} +device xyc {drive = -1} attach xyc at vme -device xy class disk: disk +device xy: disk attach xy at xyc file dev/vme/xy.c xy needs-flag