Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Merge the gehenna-devsw branch into the trunk.
details: https://anonhg.NetBSD.org/src/rev/555201d54497
branches: trunk
changeset: 536076:555201d54497
user: gehenna <gehenna%NetBSD.org@localhost>
date: Fri Sep 06 13:18:43 2002 +0000
description:
Merge the gehenna-devsw branch into the trunk.
This merge changes the device switch tables from static array to
dynamically generated by config(8).
- All device switches is defined as a constant structure in device drivers.
- The new grammer ``device-major'' is introduced to ``files''.
device-major <prefix> char <num> [block <num>] [<rules>]
- All device major numbers must be listed up in port dependent majors.<arch>
by using this grammer.
- Added the new naming convention.
The name of the device switch must be <prefix>_[bc]devsw for auto-generation
of device switch tables.
- The backward compatibility of loading block/character device
switch by LKM framework is broken. This is necessary to convert
from block/character device major to device name in runtime and vice versa.
- The restriction to assign device major by LKM is completely removed.
We don't need to reserve LKM entries for dynamic loading of device switch.
- In compile time, device major numbers list is packed into the kernel and
the LKM framework will refer it to assign device major number dynamically.
diffstat:
sys/adosfs/advfsops.c | 7 +-
sys/altq/altq_conf.c | 11 +-
sys/altq/altq_conf.h | 6 +-
sys/altq/altqconf.h | 5 +-
sys/arch/acorn26/acorn26/conf.c | 184 +-------
sys/arch/acorn26/acorn26/mem.c | 32 +-
sys/arch/acorn26/conf/files.acorn26 | 10 +-
sys/arch/acorn26/conf/majors.acorn26 | 34 +
sys/arch/acorn26/ioc/arcpp.c | 22 +-
sys/arch/acorn32/acorn32/autoconf.c | 51 +-
sys/arch/acorn32/acorn32/conf.c | 395 +---------------
sys/arch/acorn32/conf/files.acorn32 | 12 +-
sys/arch/acorn32/conf/majors.acorn32 | 68 ++
sys/arch/acorn32/include/Makefile | 4 +-
sys/arch/acorn32/include/conf.h | 106 ----
sys/arch/acorn32/mainbus/fd.c | 44 +-
sys/arch/algor/algor/conf.c | 415 +----------------
sys/arch/algor/conf/files.algor | 15 +-
sys/arch/algor/conf/majors.algor | 67 ++
sys/arch/alpha/STYLE | 13 +-
sys/arch/alpha/a12/a12dc.c | 28 +-
sys/arch/alpha/alpha/api_up1000.c | 7 +-
sys/arch/alpha/alpha/autoconf.c | 7 +-
sys/arch/alpha/alpha/avalon_a12.c | 7 +-
sys/arch/alpha/alpha/conf.c | 405 +---------------
sys/arch/alpha/alpha/dec_1000a.c | 7 +-
sys/arch/alpha/alpha/dec_2000_300.c | 7 +-
sys/arch/alpha/alpha/dec_2100_a50.c | 7 +-
sys/arch/alpha/alpha/dec_2100_a500.c | 7 +-
sys/arch/alpha/alpha/dec_3000_300.c | 7 +-
sys/arch/alpha/alpha/dec_3000_500.c | 7 +-
sys/arch/alpha/alpha/dec_550.c | 7 +-
sys/arch/alpha/alpha/dec_6600.c | 7 +-
sys/arch/alpha/alpha/dec_alphabook1.c | 7 +-
sys/arch/alpha/alpha/dec_axppci_33.c | 7 +-
sys/arch/alpha/alpha/dec_eb164.c | 7 +-
sys/arch/alpha/alpha/dec_eb64plus.c | 7 +-
sys/arch/alpha/alpha/dec_eb66.c | 7 +-
sys/arch/alpha/alpha/dec_kn20aa.c | 7 +-
sys/arch/alpha/alpha/dec_kn300.c | 6 +-
sys/arch/alpha/alpha/dec_kn8ae.c | 7 +-
sys/arch/alpha/alpha/machdep.c | 31 +-
sys/arch/alpha/alpha/mainbus.c | 7 +-
sys/arch/alpha/alpha/mem.c | 33 +-
sys/arch/alpha/alpha/promcons.c | 33 +-
sys/arch/alpha/conf/files.alpha | 15 +-
sys/arch/alpha/conf/majors.alpha | 74 ++
sys/arch/alpha/include/Makefile | 4 +-
sys/arch/alpha/include/conf.h | 12 -
sys/arch/alpha/tc/scc.c | 31 +-
sys/arch/amiga/amiga/autoconf.c | 47 +-
sys/arch/amiga/amiga/conf.c | 288 +-----------
sys/arch/amiga/amiga/machdep.c | 18 +-
sys/arch/amiga/amiga/mem.c | 47 +-
sys/arch/amiga/conf/files.amiga | 11 +-
sys/arch/amiga/conf/majors.amiga | 55 ++
sys/arch/amiga/dev/aster.c | 5 +-
sys/arch/amiga/dev/drsupio.c | 5 +-
sys/arch/amiga/dev/fd.c | 44 +-
sys/arch/amiga/dev/grf.c | 78 +--
sys/arch/amiga/dev/grf_cc.c | 22 +-
sys/arch/amiga/dev/grf_rh.c | 14 +-
sys/arch/amiga/dev/grf_rt.c | 72 +--
sys/arch/amiga/dev/gvpio.c | 5 +-
sys/arch/amiga/dev/hyper.c | 5 +-
sys/arch/amiga/dev/ioblix_zbus.c | 5 +-
sys/arch/amiga/dev/ite.c | 28 +-
sys/arch/amiga/dev/ite_cc.c | 15 +-
sys/arch/amiga/dev/ite_rt.c | 38 +-
sys/arch/amiga/dev/itevar.h | 7 +-
sys/arch/amiga/dev/kbd.c | 20 +-
sys/arch/amiga/dev/mfc.c | 27 +-
sys/arch/amiga/dev/ms.c | 19 +-
sys/arch/amiga/dev/msc.c | 22 +-
sys/arch/amiga/dev/par.c | 19 +-
sys/arch/amiga/dev/ser.c | 46 +-
sys/arch/amiga/dev/view.c | 19 +-
sys/arch/amiga/dev/viewioctl.h | 3 +-
sys/arch/amiga/include/Makefile | 4 +-
sys/arch/amiga/include/conf.h | 71 --
sys/arch/amigappc/conf/files.amigappc | 10 +-
sys/arch/amigappc/include/Makefile | 4 +-
sys/arch/amigappc/include/conf.h | 67 --
sys/arch/arc/arc/conf.c | 300 +-----------
sys/arch/arc/conf/files.arc | 12 +-
sys/arch/arc/conf/majors.arc | 49 +
sys/arch/arc/dev/opms.c | 33 +-
sys/arch/arc/dev/pccons.c | 29 +-
sys/arch/arc/jazz/fd.c | 42 +-
sys/arch/arm/arm32/conf.c | 636 +------------------------
sys/arch/arm/arm32/cpu.c | 6 +-
sys/arch/arm/arm32/intr.c | 4 +-
sys/arch/arm/arm32/mem.c | 36 +-
sys/arch/arm/arm32/stubs.c | 20 +-
sys/arch/arm/conf/majors.arm32 | 100 +++
sys/arch/arm/footbridge/footbridge_com.c | 32 +-
sys/arch/arm/footbridge/isa/joy_timer.c | 3 +-
sys/arch/arm/include/conf.h | 130 -----
sys/arch/arm/iomd/beep.c | 16 +-
sys/arch/arm/iomd/console/console.c | 51 +-
sys/arch/arm/iomd/console/vidcconsole.c | 33 +-
sys/arch/arm/iomd/console/vidcrender.c | 3 +-
sys/arch/arm/iomd/iic.c | 62 +--
sys/arch/arm/iomd/kbd.c | 13 +-
sys/arch/arm/iomd/opms.c | 17 +-
sys/arch/arm/iomd/qms.c | 14 +-
sys/arch/arm/iomd/rpckbd.c | 3 +-
sys/arch/arm/iomd/rtc.c | 32 +-
sys/arch/arm/ixp12x0/ixp12x0_com.c | 32 +-
sys/arch/arm/mainbus/cpu_mainbus.c | 4 +-
sys/arch/arm/sa11x0/sa11x0_com.c | 25 +-
sys/arch/atari/atari/autoconf.c | 20 +-
sys/arch/atari/atari/conf.c | 343 +-------------
sys/arch/atari/atari/machdep.c | 24 +-
sys/arch/atari/atari/mem.c | 38 +-
sys/arch/atari/conf/files.atari | 14 +-
sys/arch/atari/conf/majors.atari | 54 ++
sys/arch/atari/dev/clock.c | 8 +-
sys/arch/atari/dev/fd.c | 41 +-
sys/arch/atari/dev/grf.c | 37 +-
sys/arch/atari/dev/grfvar.h | 8 +-
sys/arch/atari/dev/hdfd.c | 36 +-
sys/arch/atari/dev/ite.c | 30 +-
sys/arch/atari/dev/ite_cc.c | 25 +-
sys/arch/atari/dev/ite_et.c | 25 +-
sys/arch/atari/dev/itevar.h | 14 +-
sys/arch/atari/dev/kbd.c | 7 +-
sys/arch/atari/dev/lpt.c | 7 +-
sys/arch/atari/dev/md_root.c | 8 +-
sys/arch/atari/dev/ms.c | 7 +-
sys/arch/atari/dev/ser.c | 25 +-
sys/arch/atari/dev/view.c | 13 +-
sys/arch/atari/dev/viewvar.h | 8 +-
sys/arch/atari/dev/zs.c | 13 +-
sys/arch/atari/vme/et4000.c | 21 +-
sys/arch/atari/vme/leo.c | 43 +-
sys/arch/bebox/bebox/autoconf.c | 16 +-
sys/arch/bebox/bebox/conf.c | 332 +-------------
sys/arch/bebox/conf/files.bebox | 16 +-
sys/arch/bebox/conf/majors.bebox | 60 ++
sys/arch/bebox/include/Makefile | 4 +-
sys/arch/bebox/include/conf.h | 50 -
sys/arch/bebox/isa/joy_timer.c | 4 +-
sys/arch/bebox/isa/lms.c | 15 +-
sys/arch/bebox/isa/mms.c | 15 +-
sys/arch/bebox/isa/pccons.c | 23 +-
sys/arch/bebox/isa/spkr.c | 14 +-
sys/arch/bebox/isa/wd.c | 25 +-
sys/arch/cats/cats/autoconf.c | 51 +-
sys/arch/cats/conf/files.cats | 11 +-
sys/arch/cats/include/conf.h | 18 -
sys/arch/cesfic/cesfic/conf.c | 164 +------
sys/arch/cesfic/cesfic/machdep.c | 18 +-
sys/arch/cesfic/cesfic/mem.c | 29 +-
sys/arch/cesfic/conf/files.cesfic | 6 +-
sys/arch/cesfic/conf/majors.cesfic | 25 +
sys/arch/cesfic/dev/zs.c | 3 +-
sys/arch/cobalt/cobalt/conf.c | 192 +-------
sys/arch/cobalt/cobalt/console.c | 3 +-
sys/arch/cobalt/conf/files.cobalt | 9 +-
sys/arch/cobalt/conf/majors.cobalt | 40 +
sys/arch/cobalt/include/Makefile | 4 +-
sys/arch/cobalt/include/conf.h | 3 -
sys/arch/dreamcast/conf/files.dreamcast | 10 +-
sys/arch/dreamcast/conf/majors.dreamcast | 53 ++
sys/arch/dreamcast/dev/gdrom.c | 45 +-
sys/arch/dreamcast/dev/maple/maple.c | 15 +-
sys/arch/dreamcast/dev/pvr.c | 12 +-
sys/arch/dreamcast/dreamcast/conf.c | 304 +-----------
sys/arch/dreamcast/include/Makefile | 4 +-
sys/arch/dreamcast/include/conf.h | 37 -
sys/arch/evbarm/conf/files.evbarm | 11 +-
sys/arch/evbarm/dev/plcom.c | 25 +-
sys/arch/evbarm/include/conf.h | 17 -
sys/arch/evbmips/alchemy/conf.c | 19 -
sys/arch/evbmips/conf/files.evbmips | 4 +-
sys/arch/evbmips/conf/files.malta | 15 +-
sys/arch/evbmips/conf/files.pb1000 | 5 +-
sys/arch/evbmips/conf/majors.evbmips | 75 ++
sys/arch/evbmips/evbmips/conf_common.c | 527 +--------------------
sys/arch/evbmips/malta/conf.c | 19 -
sys/arch/evbsh3/conf/files.evbsh3 | 9 +-
sys/arch/evbsh3/conf/majors.evbsh3 | 47 +
sys/arch/evbsh3/evbsh3/conf.c | 274 +----------
sys/arch/evbsh3/include/Makefile | 4 +-
sys/arch/evbsh3/include/conf.h | 37 -
sys/arch/evbsh5/conf/files.evbsh5 | 4 +-
sys/arch/hp300/conf/files.hp300 | 10 +-
sys/arch/hp300/conf/majors.hp300 | 40 +
sys/arch/hp300/dev/ac.c | 20 +-
sys/arch/hp300/dev/apci.c | 39 +-
sys/arch/hp300/dev/ct.c | 35 +-
sys/arch/hp300/dev/dca.c | 51 +-
sys/arch/hp300/dev/dcm.c | 42 +-
sys/arch/hp300/dev/grf.c | 18 +-
sys/arch/hp300/dev/hil.c | 26 +-
sys/arch/hp300/dev/ite.c | 51 +-
sys/arch/hp300/dev/itevar.h | 3 +-
sys/arch/hp300/dev/mt.c | 34 +-
sys/arch/hp300/dev/ppi.c | 18 +-
sys/arch/hp300/dev/rd.c | 25 +-
sys/arch/hp300/dev/sd.c | 38 +-
sys/arch/hp300/dev/st.c | 42 +-
sys/arch/hp300/hp300/conf.c | 261 +----------
sys/arch/hp300/hp300/machdep.c | 20 +-
sys/arch/hp300/hp300/mem.c | 31 +-
sys/arch/hp700/conf/files.hp700 | 12 +-
sys/arch/hp700/conf/majors.hp700 | 40 +
sys/arch/hp700/dev/mem.c | 33 +-
sys/arch/hp700/dev/pdc.c | 18 +-
sys/arch/hp700/hp700/autoconf.c | 11 +-
sys/arch/hp700/hp700/conf.c | 297 +-----------
sys/arch/hp700/hp700/machdep.c | 18 +-
sys/arch/hp700/include/Makefile | 4 +-
sys/arch/hp700/include/conf.h | 53 --
sys/arch/hpcarm/conf/files.hpcarm | 8 +-
sys/arch/hpcarm/hpcarm/autoconf.c | 51 +-
sys/arch/hpcarm/hpcarm/stubs.c | 20 +-
sys/arch/hpcarm/include/conf.h | 14 -
sys/arch/hpcmips/conf/files.hpcmips | 10 +-
sys/arch/hpcmips/conf/majors.hpcmips | 55 ++
sys/arch/hpcmips/dev/apm/apmdev.c | 14 +-
sys/arch/hpcmips/dev/ucbsnd.c | 17 +-
sys/arch/hpcmips/hpcmips/autoconf.c | 53 +-
sys/arch/hpcmips/hpcmips/conf.c | 306 +-----------
sys/arch/hpcmips/tx/txcom.c | 22 +-
sys/arch/hpcsh/conf/files.hpcsh | 9 +-
sys/arch/hpcsh/conf/majors.hpcsh | 41 +
sys/arch/hpcsh/dev/hd64461/hd64461uart.c | 8 +-
sys/arch/hpcsh/dev/hd64461/hd64461video.c | 10 +-
sys/arch/hpcsh/dev/hd64465/hd64465uart.c | 8 +-
sys/arch/hpcsh/hpcsh/autoconf.c | 49 +-
sys/arch/hpcsh/hpcsh/conf.c | 243 +---------
sys/arch/hpcsh/include/Makefile | 4 +-
sys/arch/hpcsh/include/conf.h | 37 -
sys/arch/i386/conf/files.i386 | 19 +-
sys/arch/i386/conf/majors.i386 | 93 +++
sys/arch/i386/i386/apm.c | 16 +-
sys/arch/i386/i386/autoconf.c | 36 +-
sys/arch/i386/i386/conf.c | 477 +------------------
sys/arch/i386/i386/machdep.c | 28 +-
sys/arch/i386/i386/mem.c | 29 +-
sys/arch/i386/include/Makefile | 4 +-
sys/arch/i386/include/conf.h | 52 --
sys/arch/i386/isa/joy_timer.c | 6 +-
sys/arch/i386/isa/olms.c | 17 +-
sys/arch/i386/isa/omms.c | 17 +-
sys/arch/i386/isa/pccons.c | 25 +-
sys/arch/luna68k/conf/files.luna68k | 10 +-
sys/arch/luna68k/conf/majors.luna68k | 37 +
sys/arch/luna68k/dev/siotty.c | 22 +-
sys/arch/luna68k/luna68k/conf.c | 232 +---------
sys/arch/luna68k/luna68k/machdep.c | 20 +-
sys/arch/luna68k/luna68k/mem.c | 32 +-
sys/arch/mac68k/conf/files.mac68k | 14 +-
sys/arch/mac68k/conf/majors.mac68k | 49 +
sys/arch/mac68k/dev/adbvar.h | 8 +-
sys/arch/mac68k/dev/aed.c | 27 +-
sys/arch/mac68k/dev/aedvar.h | 8 +-
sys/arch/mac68k/dev/grf_compat.c | 31 +-
sys/arch/mac68k/dev/ite_compat.c | 44 +-
sys/arch/mac68k/dev/maccons.c | 15 +-
sys/arch/mac68k/dev/zs.c | 13 +-
sys/arch/mac68k/dev/zs_kgdb.c | 5 +-
sys/arch/mac68k/mac68k/autoconf.c | 16 +-
sys/arch/mac68k/mac68k/conf.c | 284 +-----------
sys/arch/mac68k/mac68k/machdep.c | 18 +-
sys/arch/mac68k/mac68k/mem.c | 29 +-
sys/arch/mac68k/obio/asc.c | 18 +-
sys/arch/mac68k/obio/ascvar.h | 10 +-
sys/arch/mac68k/obio/iwm_fd.c | 51 +-
sys/arch/mac68k/obio/iwm_fdvar.h | 18 +-
sys/arch/macppc/conf/files.macppc | 15 +-
sys/arch/macppc/conf/majors.macppc | 68 ++
sys/arch/macppc/dev/aed.c | 27 +-
sys/arch/macppc/dev/aedvar.h | 8 +-
sys/arch/macppc/dev/apm.c | 16 +-
sys/arch/macppc/dev/nvram.c | 43 +-
sys/arch/macppc/dev/ofcons.c | 33 +-
sys/arch/macppc/dev/z8530tty.c | 21 +-
sys/arch/macppc/dev/zs.c | 6 +-
sys/arch/macppc/dev/zs_kgdb.c | 5 +-
sys/arch/macppc/macppc/conf.c | 334 +-------------
sys/arch/mips/alchemy/dev/aucom.c | 30 +-
sys/arch/mips/mips/mem.c | 43 +-
sys/arch/mips/mips/mips_machdep.c | 29 +-
sys/arch/mips/sibyte/dev/sbjcn.c | 23 +-
sys/arch/mips/sibyte/dev/sbscn.c | 24 +-
sys/arch/mipsco/conf/files.mipsco | 8 +-
sys/arch/mipsco/conf/majors.mipsco | 41 +
sys/arch/mipsco/include/Makefile | 4 +-
sys/arch/mipsco/include/conf.h | 19 -
sys/arch/mipsco/mipsco/conf.c | 285 +-----------
sys/arch/mipsco/mipsco/machdep.c | 8 +-
sys/arch/mipsco/obio/i82072.c | 38 +-
sys/arch/mipsco/obio/zs.c | 7 +-
sys/arch/mipsco/obio/zs_kgdb.c | 5 +-
sys/arch/mmeye/conf/files.mmeye | 9 +-
sys/arch/mmeye/conf/majors.mmeye | 44 +
sys/arch/mmeye/include/Makefile | 4 +-
sys/arch/mmeye/include/conf.h | 37 -
sys/arch/mmeye/mmeye/conf.c | 271 +----------
sys/arch/mvme68k/conf/files.mvme68k | 11 +-
sys/arch/mvme68k/conf/majors.mvme68k | 38 +
sys/arch/mvme68k/dev/zs.c | 4 +-
sys/arch/mvme68k/dev/zs_pcc.c | 6 +-
sys/arch/mvme68k/dev/zs_pcctwo.c | 6 +-
sys/arch/mvme68k/mvme68k/conf.c | 247 +---------
sys/arch/mvme68k/mvme68k/machdep.c | 19 +-
sys/arch/mvme68k/mvme68k/mem.c | 29 +-
sys/arch/mvmeppc/conf/files.mvmeppc | 14 +-
sys/arch/mvmeppc/conf/majors.mvmeppc | 48 +
sys/arch/mvmeppc/mvmeppc/autoconf.c | 17 +-
sys/arch/mvmeppc/mvmeppc/conf.c | 334 +-------------
sys/arch/netwinder/conf/files.netwinder | 11 +-
sys/arch/netwinder/include/conf.h | 12 -
sys/arch/news68k/conf/files.news68k | 14 +-
sys/arch/news68k/conf/majors.news68k | 44 +
sys/arch/news68k/dev/zs.c | 6 +-
sys/arch/news68k/news68k/conf.c | 356 +-------------
sys/arch/news68k/news68k/machdep.c | 18 +-
sys/arch/news68k/news68k/mem.c | 29 +-
sys/arch/newsmips/apbus/zs_ap.c | 7 +-
sys/arch/newsmips/conf/files.newsmips | 12 +-
sys/arch/newsmips/conf/majors.newsmips | 43 +
sys/arch/newsmips/dev/zs.c | 3 +-
sys/arch/newsmips/dev/zs_hb.c | 7 +-
sys/arch/newsmips/include/Makefile | 4 +-
sys/arch/newsmips/include/conf.h | 21 -
sys/arch/newsmips/newsmips/conf.c | 279 +----------
sys/arch/next68k/conf/files.next68k | 10 +-
sys/arch/next68k/conf/majors.next68k | 44 +
sys/arch/next68k/dev/zs.c | 14 +-
sys/arch/next68k/dev/zs_kgdb.c | 5 +-
sys/arch/next68k/next68k/conf.c | 260 +----------
sys/arch/next68k/next68k/machdep.c | 18 +-
sys/arch/next68k/next68k/mem.c | 29 +-
sys/arch/ofppc/conf/files.ofppc | 15 +-
sys/arch/ofppc/conf/majors.ofppc | 26 +
sys/arch/ofppc/ofppc/conf.c | 167 +------
sys/arch/pc532/conf/files.pc532 | 10 +-
sys/arch/pc532/conf/majors.pc532 | 35 +
sys/arch/pc532/dev/lpt.c | 14 +-
sys/arch/pc532/dev/scn.c | 36 +-
sys/arch/pc532/include/Makefile | 4 +-
sys/arch/pc532/include/conf.h | 51 --
sys/arch/pc532/pc532/conf.c | 177 +------
sys/arch/pc532/pc532/machdep.c | 27 +-
sys/arch/pc532/pc532/mainbus.c | 4 +-
sys/arch/pc532/pc532/mem.c | 28 +-
sys/arch/playstation2/conf/files.playstation2 | 9 +-
sys/arch/playstation2/conf/majors.playstation2 | 44 +
sys/arch/playstation2/include/conf.h | 3 -
sys/arch/playstation2/playstation2/conf.c | 256 +----------
sys/arch/pmax/conf/files.pmax | 11 +-
sys/arch/pmax/conf/majors.pmax | 52 ++
sys/arch/pmax/dev/dc.c | 48 +-
sys/arch/pmax/dev/dtop.c | 19 +-
sys/arch/pmax/dev/fb.c | 31 +-
sys/arch/pmax/dev/fb_usrreq.c | 15 +-
sys/arch/pmax/dev/px.c | 16 +-
sys/arch/pmax/dev/qvss_compat.c | 4 +-
sys/arch/pmax/dev/rcons.c | 51 +-
sys/arch/pmax/dev/xcfb.c | 5 +-
sys/arch/pmax/include/Makefile | 4 +-
sys/arch/pmax/include/conf.h | 31 -
sys/arch/pmax/pmax/conf.c | 401 +---------------
sys/arch/pmax/pmax/cons.h | 53 --
sys/arch/pmax/tc/scc.c | 45 +-
sys/arch/pmppc/conf/files.pmppc | 7 +-
sys/arch/pmppc/conf/majors.pmppc | 52 ++
sys/arch/pmppc/include/Makefile | 4 +-
sys/arch/pmppc/include/conf.h | 50 -
sys/arch/pmppc/pmppc/autoconf.c | 17 +-
sys/arch/pmppc/pmppc/conf.c | 313 +------------
sys/arch/powerpc/powerpc/mem.c | 28 +-
sys/arch/powerpc/powerpc/ofw_machdep.c | 23 +-
sys/arch/powerpc/powerpc/powerpc_machdep.c | 12 +-
sys/arch/prep/conf/files.prep | 15 +-
sys/arch/prep/conf/majors.prep | 64 ++
sys/arch/prep/include/Makefile | 4 +-
sys/arch/prep/include/conf.h | 50 -
sys/arch/prep/isa/joy_timer.c | 3 +-
sys/arch/prep/prep/autoconf.c | 17 +-
sys/arch/prep/prep/conf.c | 361 +--------------
sys/arch/sandpoint/conf/files.sandpoint | 16 +-
sys/arch/sandpoint/conf/majors.sandpoint | 56 ++
sys/arch/sandpoint/include/Makefile | 4 +-
sys/arch/sandpoint/include/conf.h | 50 -
sys/arch/sandpoint/sandpoint/autoconf.c | 17 +-
sys/arch/sandpoint/sandpoint/conf.c | 330 +------------
sys/arch/sbmips/conf/files.sbmips | 14 +-
sys/arch/sbmips/include/conf.h | 3 -
sys/arch/sbmips/sbmips/conf.c | 16 +-
sys/arch/sgimips/conf/files.sgimips | 11 +-
sys/arch/sgimips/conf/majors.sgimips | 53 ++
sys/arch/sgimips/dev/zs.c | 14 +-
sys/arch/sgimips/dev/zs_kgdb.c | 5 +-
sys/arch/sgimips/include/Makefile | 4 +-
sys/arch/sgimips/include/conf.h | 7 -
sys/arch/sgimips/include/irix_machdep.h | 3 -
sys/arch/sgimips/sgimips/conf.c | 272 +----------
sys/arch/sh3/dev/sci.c | 20 +-
sys/arch/sh3/dev/scif.c | 20 +-
sys/arch/sh3/dev/wdog.c | 13 +-
sys/arch/sh3/sh3/mem.c | 26 +-
sys/arch/sh5/conf/files.sh5 | 7 +-
sys/arch/sh5/conf/majors.sh5 | 45 +
sys/arch/sh5/dev/scif.c | 25 +-
sys/arch/sh5/sh5/conf.c | 267 +----------
sys/arch/sh5/sh5/mem.c | 35 +-
sys/arch/shark/conf/files.shark | 11 +-
sys/arch/shark/conf/majors.shark | 58 ++
sys/arch/shark/include/conf.h | 115 ----
sys/arch/shark/isa/joy_timer.c | 3 +-
sys/arch/shark/ofw/ofrom.c | 33 +-
sys/arch/shark/shark/autoconf.c | 51 +-
sys/arch/shark/shark/conf.c | 365 +--------------
sys/arch/shark/shark/opms.c | 15 +-
sys/arch/shark/shark/pccons.c | 67 +-
sys/arch/shark/shark/profile.c | 11 +-
sys/arch/shark/shark/scr.c | 230 +--------
sys/arch/sparc/conf/files.sparc | 14 +-
sys/arch/sparc/conf/majors.sparc | 88 +++
sys/arch/sparc/dev/bwtwo_obio.c | 3 +-
sys/arch/sparc/dev/cgeight.c | 39 +-
sys/arch/sparc/dev/cgfour.c | 37 +-
sys/arch/sparc/dev/cgfourteen.c | 28 +-
sys/arch/sparc/dev/cgsix_obio.c | 3 +-
sys/arch/sparc/dev/cgtwo.c | 37 +-
sys/arch/sparc/dev/fd.c | 41 +-
sys/arch/sparc/dev/kd.c | 30 +-
sys/arch/sparc/dev/tctrl.c | 14 +-
sys/arch/sparc/dev/zs.c | 4 +-
sys/arch/sparc/dev/zs_kgdb.c | 5 +-
sys/arch/sparc/include/Makefile | 4 +-
sys/arch/sparc/include/conf.h | 101 ---
sys/arch/sparc/sparc/conf.c | 416 +----------------
sys/arch/sparc/sparc/machdep.c | 19 +-
sys/arch/sparc/sparc/mem.c | 39 +-
sys/arch/sparc/sparc/openprom.c | 21 +-
sys/arch/sparc64/conf/files.sparc64 | 13 +-
sys/arch/sparc64/conf/majors.sparc64 | 78 +++
sys/arch/sparc64/dev/com_ebus.c | 9 +-
sys/arch/sparc64/dev/consinit.c | 8 +-
sys/arch/sparc64/dev/fb.c | 13 +-
sys/arch/sparc64/dev/kd.c | 32 +-
sys/arch/sparc64/dev/pcons.c | 24 +-
sys/arch/sparc64/dev/sab.c | 24 +-
sys/arch/sparc64/dev/zs.c | 4 +-
sys/arch/sparc64/include/Makefile | 4 +-
sys/arch/sparc64/include/conf.h | 94 ---
sys/arch/sparc64/sparc64/conf.c | 416 +----------------
sys/arch/sparc64/sparc64/machdep.c | 19 +-
sys/arch/sparc64/sparc64/mem.c | 39 +-
sys/arch/sparc64/sparc64/openprom.c | 21 +-
sys/arch/sun2/conf/files.sun2 | 9 +-
sys/arch/sun2/conf/majors.sun2 | 55 ++
sys/arch/sun2/dev/bwtwo_any.c | 3 +-
sys/arch/sun2/dev/consinit.c | 17 +-
sys/arch/sun2/dev/kd.c | 32 +-
sys/arch/sun2/dev/pcons.c | 23 +-
sys/arch/sun2/dev/zs.c | 4 +-
sys/arch/sun2/dev/zs_kgdb.c | 5 +-
sys/arch/sun2/include/conf.h | 76 --
sys/arch/sun2/sun2/conf.c | 381 +--------------
sys/arch/sun2/sun2/machdep.c | 16 +-
sys/arch/sun2/sun2/mem.c | 30 +-
sys/arch/sun3/conf/files.sun3 | 9 +-
sys/arch/sun3/conf/majors.sun3 | 60 ++
sys/arch/sun3/dev/bw2.c | 25 +-
sys/arch/sun3/dev/cg2.c | 25 +-
sys/arch/sun3/dev/cg4.c | 25 +-
sys/arch/sun3/dev/fb.c | 12 +-
sys/arch/sun3/dev/fd.c | 43 +-
sys/arch/sun3/dev/kd.c | 30 +-
sys/arch/sun3/dev/xd.c | 24 +-
sys/arch/sun3/dev/xy.c | 24 +-
sys/arch/sun3/dev/zs.c | 7 +-
sys/arch/sun3/dev/zs_kgdb.c | 5 +-
sys/arch/sun3/sun3/conf.c | 397 +---------------
sys/arch/sun3/sun3/machdep.c | 16 +-
sys/arch/sun3/sun3/mem.c | 30 +-
sys/arch/sun3/sun3x/machdep.c | 16 +-
sys/arch/sun3/sun3x/mem.c | 30 +-
sys/arch/vax/conf/files.vax | 17 +-
sys/arch/vax/conf/majors.vax | 80 +++
sys/arch/vax/include/cpu.h | 3 +-
sys/arch/vax/mba/hp.c | 27 +-
sys/arch/vax/uba/qv.c | 40 +-
sys/arch/vax/uba/ts.c | 32 +-
sys/arch/vax/vax/cfl.c | 21 +-
sys/arch/vax/vax/conf.c | 522 +--------------------
sys/arch/vax/vax/crl.c | 20 +-
sys/arch/vax/vax/crx.c | 14 +-
sys/arch/vax/vax/ctu.c | 36 +-
sys/arch/vax/vax/gencons.c | 23 +-
sys/arch/vax/vax/machdep.c | 18 +-
sys/arch/vax/vax/mem.c | 29 +-
sys/arch/vax/vsa/dz_ibus.c | 7 +-
sys/arch/vax/vsa/dz_vsbus.c | 14 +-
sys/arch/vax/vsa/hdc9224.c | 37 +-
sys/arch/vax/vsa/smg.c | 7 +-
sys/arch/walnut/conf/files.walnut | 11 +-
sys/arch/walnut/conf/majors.walnut | 55 ++
sys/arch/walnut/walnut/conf.c | 287 +-----------
sys/arch/x68k/conf/files.x68k | 11 +-
sys/arch/x68k/conf/majors.x68k | 52 ++
sys/arch/x68k/dev/com.c | 27 +-
sys/arch/x68k/dev/fd.c | 43 +-
sys/arch/x68k/dev/grf.c | 14 +-
sys/arch/x68k/dev/ite.c | 25 +-
sys/arch/x68k/dev/itevar.h | 7 +-
sys/arch/x68k/dev/kbd.c | 28 +-
sys/arch/x68k/dev/ms.c | 26 +-
sys/arch/x68k/dev/opmbell.c | 12 +-
sys/arch/x68k/dev/par.c | 14 +-
sys/arch/x68k/dev/pow.c | 13 +-
sys/arch/x68k/dev/sram.c | 32 +-
sys/arch/x68k/dev/zs.c | 12 +-
sys/arch/x68k/x68k/autoconf.c | 13 +-
sys/arch/x68k/x68k/conf.c | 279 +----------
sys/arch/x68k/x68k/machdep.c | 19 +-
sys/arch/x68k/x68k/mem.c | 31 +-
sys/arch/x86_64/conf/files.x86_64 | 17 +-
sys/arch/x86_64/conf/majors.x86_64 | 77 +++
sys/arch/x86_64/include/Makefile | 4 +-
sys/arch/x86_64/include/conf.h | 50 -
sys/arch/x86_64/isa/pccons.c | 23 +-
sys/arch/x86_64/x86_64/autoconf.c | 25 +-
sys/arch/x86_64/x86_64/conf.c | 431 +----------------
sys/arch/x86_64/x86_64/machdep.c | 26 +-
sys/arch/x86_64/x86_64/mem.c | 31 +-
sys/coda/coda_psdev.c | 18 +-
sys/coda/coda_psdev.h | 40 -
sys/coda/coda_vfsops.c | 13 +-
sys/compat/irix/irix_fcntl.c | 9 +-
sys/compat/irix/irix_ioctl.c | 10 +-
sys/compat/irix/irix_kmem.c | 15 +-
sys/compat/irix/irix_kmem.h | 6 +-
sys/compat/irix/irix_usema.c | 21 +-
sys/compat/irix/irix_usema.h | 10 +-
sys/compat/linux/arch/i386/linux_machdep.c | 10 +-
sys/compat/linux/arch/i386/linux_machdep.h | 3 +-
sys/compat/linux/arch/powerpc/linux_machdep.h | 3 +-
sys/compat/linux/common/linux_file.c | 16 +-
sys/compat/linux/common/linux_ioctl.c | 12 +-
sys/compat/sunos/sunos_misc.c | 6 +-
sys/compat/sunos32/sunos32_misc.c | 6 +-
sys/compat/svr4/svr4_net.c | 11 +-
sys/compat/ultrix/ultrix_misc.c | 7 +-
sys/conf/Makefile.kern.inc | 4 +-
sys/conf/files | 3 +-
sys/dev/arcbios/arcbios.c | 10 +-
sys/dev/arcbios/arcbios_tty.c | 19 +-
sys/dev/ata/wd.c | 35 +-
sys/dev/audio.c | 20 +-
sys/dev/bluetooth/bthci.c | 17 +-
sys/dev/ccd.c | 23 +-
sys/dev/clockctl.c | 29 +-
sys/dev/cons.c | 60 +-
sys/dev/cons.h | 22 +-
sys/dev/dec/dz.c | 19 +-
sys/dev/dmover/dmover_io.c | 12 +-
sys/dev/hpc/bicons.c | 11 +-
sys/dev/hpc/biconsdev.c | 27 +-
sys/dev/hpc/btnmgr.c | 19 +-
sys/dev/i2o/dpti.c | 19 +-
sys/dev/i2o/iop.c | 15 +-
sys/dev/ic/cd18xx.c | 18 +-
sys/dev/ic/clmpcc.c | 20 +-
sys/dev/ic/com.c | 29 +-
sys/dev/ic/cy.c | 20 +-
sys/dev/ic/joy.c | 19 +-
sys/dev/ic/lpt.c | 17 +-
sys/dev/ic/mlx.c | 13 +-
sys/dev/ic/rrunner.c | 63 +-
sys/dev/ic/z8530sc.h | 4 +-
sys/dev/ic/z8530tty.c | 23 +-
sys/dev/ir/cir.c | 18 +-
sys/dev/ir/irframe.c | 18 +-
sys/dev/ir/irframe_tty.c | 9 +-
sys/dev/isa/fd.c | 45 +-
sys/dev/isa/mcd.c | 28 +-
sys/dev/isa/satlink.c | 25 +-
sys/dev/isa/spkr.c | 16 +-
sys/dev/isa/wt.c | 24 +-
sys/dev/kttcp.c | 25 +-
sys/dev/ld.c | 30 +-
sys/dev/mca/ed_mca.c | 27 +-
sys/dev/md.c | 40 +-
sys/dev/midi.c | 20 +-
sys/dev/mm.c | 6 +-
sys/dev/mscp/mscp_disk.c | 92 ++-
sys/dev/mscp/mscp_tape.c | 37 +-
sys/dev/mvme/clmpcc_pcctwo.c | 12 +-
sys/dev/mvme/lpt_mvme.c | 18 +-
sys/dev/ofw/ofcons.c | 29 +-
sys/dev/ofw/ofdisk.c | 27 +-
sys/dev/ofw/ofrtc.c | 21 +-
sys/dev/ofw/openfirmio.c | 24 +-
sys/dev/ofw/openfirmio.h | 8 +-
sys/dev/pci/agp.c | 15 +-
sys/dev/pci/bktr/bktr_os.c | 19 +-
sys/dev/pci/cz.c | 39 +-
sys/dev/pci/mly.c | 15 +-
sys/dev/pci/pci_usrreq.c | 20 +-
sys/dev/pcmcia/fdc_pcmcia.c | 5 +-
sys/dev/qbus/dhu.c | 23 +-
sys/dev/qbus/dl.c | 21 +-
sys/dev/qbus/qd.c | 30 +-
sys/dev/qbus/rl.c | 29 +-
sys/dev/qbus/ts.c | 24 +-
sys/dev/radio.c | 20 +-
sys/dev/raidframe/rf_netbsdkintf.c | 56 +-
sys/dev/rnd.c | 28 +-
sys/dev/sbus/bpp.c | 27 +-
sys/dev/sbus/bwtwo_sbus.c | 5 +-
sys/dev/sbus/magma.c | 74 +-
sys/dev/sbus/magmareg.h | 3 +-
sys/dev/sbus/p9100.c | 32 +-
sys/dev/sbus/sio16.c | 5 +-
sys/dev/sbus/tcx.c | 31 +-
sys/dev/scsipi/cd.c | 30 +-
sys/dev/scsipi/ch.c | 15 +-
sys/dev/scsipi/if_se.c | 15 +-
sys/dev/scsipi/scsiconf.c | 15 +-
sys/dev/scsipi/sd.c | 30 +-
sys/dev/scsipi/ses.c | 15 +-
sys/dev/scsipi/ss.c | 18 +-
sys/dev/scsipi/st.c | 29 +-
sys/dev/scsipi/uk.c | 17 +-
sys/dev/sequencer.c | 31 +-
sys/dev/sun/bwtwo.c | 39 +-
sys/dev/sun/cgsix.c | 31 +-
sys/dev/sun/cgthree.c | 40 +-
sys/dev/sun/fb.c | 16 +-
sys/dev/sun/kbd.c | 28 +-
sys/dev/sun/ms.c | 28 +-
sys/dev/sun/sunkbd.c | 17 +-
sys/dev/sun/sunms.c | 17 +-
sys/dev/sysmon/sysmon.c | 13 +-
sys/dev/tc/stic.c | 17 +-
sys/dev/tc/zs_ioasic.c | 14 +-
sys/dev/usb/ucom.c | 22 +-
sys/dev/usb/ugen.c | 22 +-
sys/dev/usb/uhid.c | 20 +-
sys/dev/usb/ulpt.c | 20 +-
sys/dev/usb/urio.c | 22 +-
sys/dev/usb/usb.c | 15 +-
sys/dev/usb/uscanner.c | 22 +-
sys/dev/vme/xd.c | 25 +-
sys/dev/vme/xy.c | 25 +-
sys/dev/vnd.c | 22 +-
sys/dev/wscons/wsdisplay.c | 29 +-
sys/dev/wscons/wskbd.c | 21 +-
sys/dev/wscons/wsmouse.c | 19 +-
sys/dev/wscons/wsmux.c | 15 +-
sys/dev/wsfont/wsfontdev.c | 14 +-
sys/filecorefs/filecore_vfsops.c | 7 +-
sys/isofs/cd9660/cd9660_vfsops.c | 7 +-
sys/kern/kern_descrip.c | 11 +-
sys/kern/kern_lkm.c | 119 +----
sys/kern/kern_subr.c | 39 +-
sys/kern/kern_systrace.c | 15 +-
sys/kern/subr_devsw.c | 455 +++++++++++++++++
sys/kern/subr_log.c | 15 +-
sys/kern/tty.c | 22 +-
sys/kern/tty_conf.c | 16 +-
sys/kern/tty_pty.c | 48 +-
sys/kern/tty_tty.c | 15 +-
sys/kern/vfs_bio.c | 18 +-
sys/kern/vfs_subr.c | 8 +-
sys/lkm/arch/mac68k/iwm/iwm_mod.c | 200 +------
sys/lkm/arch/mac68k/iwm/iwm_mod.h | 56 --
sys/lkm/vfs/coda/lkminit_vfs.c | 24 +-
sys/miscfs/fdesc/fdesc_vnops.c | 24 +-
sys/miscfs/kernfs/kernfs_vfsops.c | 13 +-
sys/miscfs/specfs/spec_vnops.c | 115 +++-
sys/msdosfs/msdosfs_vfsops.c | 7 +-
sys/net/bpf.c | 21 +-
sys/net/if_tun.c | 16 +-
sys/net/ppp_tty.c | 16 +-
sys/netinet/ip_fil.c | 12 +-
sys/netisdn/i4b_ctl.c | 11 +-
sys/netisdn/i4b_i4bdrv.c | 11 +-
sys/netisdn/i4b_rbch.c | 11 +-
sys/netisdn/i4b_tel.c | 10 +-
sys/netisdn/i4b_trace.c | 11 +-
sys/netsmb/smb_dev.c | 14 +-
sys/ntfs/ntfs_vfsops.c | 7 +-
sys/sys/conf.h | 580 ++--------------------
sys/sys/lkm.h | 36 +-
sys/sys/systm.h | 13 +-
sys/ufs/ext2fs/ext2fs_vfsops.c | 7 +-
sys/ufs/ffs/ffs_vfsops.c | 7 +-
sys/ufs/lfs/lfs_vfsops.c | 7 +-
sys/uvm/uvm_device.c | 22 +-
sys/uvm/uvm_mmap.c | 6 +-
sys/uvm/uvm_swap.c | 27 +-
sys/uvm/uvm_vnode.c | 26 +-
usr.sbin/config/Makefile | 6 +-
usr.sbin/config/defs.h | 25 +-
usr.sbin/config/files.c | 84 +++-
usr.sbin/config/gram.y | 17 +-
usr.sbin/config/main.c | 14 +-
usr.sbin/config/mkdevsw.c | 236 +++++++++
usr.sbin/config/mkioconf.c | 33 +-
usr.sbin/config/scan.l | 5 +-
usr.sbin/config/sem.c | 56 +-
usr.sbin/config/sem.h | 3 +-
711 files changed, 9416 insertions(+), 23095 deletions(-)
diffs (truncated from 51360 to 300 lines):
diff -r 84c761fd580b -r 555201d54497 sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c Fri Sep 06 12:00:40 2002 +0000
+++ b/sys/adosfs/advfsops.c Fri Sep 06 13:18:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.53 2002/07/30 07:40:07 soren Exp $ */
+/* $NetBSD: advfsops.c,v 1.54 2002/09/06 13:18:43 gehenna Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.53 2002/07/30 07:40:07 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.54 2002/09/06 13:18:43 gehenna Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -53,6 +53,7 @@
#include <sys/ioctl.h>
#include <sys/queue.h>
#include <sys/buf.h>
+#include <sys/conf.h>
#include <adosfs/adosfs.h>
void adosfs_init __P((void));
@@ -134,7 +135,7 @@
vrele(devvp);
return (ENOTBLK);
}
- if (major(devvp->v_rdev) >= nblkdev) {
+ if (bdevsw_lookup(devvp->v_rdev) == NULL) {
vrele(devvp);
return (ENXIO);
}
diff -r 84c761fd580b -r 555201d54497 sys/altq/altq_conf.c
--- a/sys/altq/altq_conf.c Fri Sep 06 12:00:40 2002 +0000
+++ b/sys/altq/altq_conf.c Fri Sep 06 13:18:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_conf.c,v 1.6 2002/03/05 04:12:57 itojun Exp $ */
+/* $NetBSD: altq_conf.c,v 1.7 2002/09/06 13:18:43 gehenna Exp $ */
/* $KAME: altq_conf.c,v 1.13 2002/01/29 10:16:01 kjc Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.6 2002/03/05 04:12:57 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.7 2002/09/06 13:18:43 gehenna Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -195,6 +195,13 @@
#endif
#endif
+#if defined(__NetBSD__)
+const struct cdevsw altq_cdevsw = {
+ altqopen, altqclose, noread, nowrite, altqioctl,
+ nostop, notty, nopoll, nommap, D_DULL
+};
+#endif
+
#if !defined(__NetBSD__) && !defined(__OpenBSD__)
static
#endif
diff -r 84c761fd580b -r 555201d54497 sys/altq/altq_conf.h
--- a/sys/altq/altq_conf.h Fri Sep 06 12:00:40 2002 +0000
+++ b/sys/altq/altq_conf.h Fri Sep 06 13:18:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_conf.h,v 1.3 2001/01/29 20:02:48 itojun Exp $ */
+/* $NetBSD: altq_conf.h,v 1.4 2002/09/06 13:18:43 gehenna Exp $ */
/* $KAME: altq_conf.h,v 1.6 2001/01/29 19:59:09 itojun Exp $ */
/*
@@ -55,13 +55,13 @@
typedef int d_open_t __P((dev_t, int, int, struct proc *));
typedef int d_close_t __P((dev_t, int, int, struct proc *));
typedef int d_ioctl_t __P((dev_t, u_long, caddr_t, int, struct proc *));
+#endif /* __NetBSD__ || __OpenBSD__ */
+#if defined(__OpenBSD__)
#define noopen (dev_type_open((*))) enodev
#define noclose (dev_type_close((*))) enodev
#define noioctl (dev_type_ioctl((*))) enodev
-#endif /* __NetBSD__ || __OpenBSD__ */
-#if defined(__OpenBSD__)
int altqopen __P((dev_t, int, int, struct proc *));
int altqclose __P((dev_t, int, int, struct proc *));
int altqioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
diff -r 84c761fd580b -r 555201d54497 sys/altq/altqconf.h
--- a/sys/altq/altqconf.h Fri Sep 06 12:00:40 2002 +0000
+++ b/sys/altq/altqconf.h Fri Sep 06 13:18:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altqconf.h,v 1.2 2001/05/30 11:57:16 mrg Exp $ */
+/* $NetBSD: altqconf.h,v 1.3 2002/09/06 13:18:43 gehenna Exp $ */
#if defined(_KERNEL_OPT)
#include "opt_altq_enabled.h"
@@ -11,7 +11,4 @@
#define NALTQ 0
#endif
-cdev_decl(altq);
-
-#define cdev_altq_init(x,y) cdev__oci_init(x,y)
#endif /* _KERNEL_OPT */
diff -r 84c761fd580b -r 555201d54497 sys/arch/acorn26/acorn26/conf.c
--- a/sys/arch/acorn26/acorn26/conf.c Fri Sep 06 12:00:40 2002 +0000
+++ b/sys/arch/acorn26/acorn26/conf.c Fri Sep 06 13:18:43 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.4 2002/07/19 16:38:15 thorpej Exp $ */
+/* $NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -29,130 +29,14 @@
* conf.c -- Device switch tables and related gumf.
*/
-#include "opt_systrace.h"
#include <sys/param.h>
-__RCSID("$NetBSD: conf.c,v 1.4 2002/07/19 16:38:15 thorpej Exp $");
+__RCSID("$NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $");
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
#include <sys/conf.h>
-#include <sys/vnode.h>
#include <dev/cons.h>
-#define mmread mmrw
-#define mmwrite mmrw
-cdev_decl(mm);
-bdev_decl(sw);
-cdev_decl(sw);
-#include "pty.h"
-#include "md.h"
-#include "vnd.h"
-#include "ccd.h"
-#include "wd.h"
-bdev_decl(wd);
-cdev_decl(wd);
-#include "sd.h"
-#include "cd.h"
-#include "bpfilter.h"
-#include "tun.h"
#include "rs.h"
-#include "wsdisplay.h"
-cdev_decl(wsdisplay);
-#include "wskbd.h"
-cdev_decl(wskbd);
-#include "wsmouse.h"
-cdev_decl(wsmouse);
-#include "wsmux.h"
-cdev_decl(wsmux);
-#include "com.h"
-cdev_decl(com);
-#include "lpt.h"
-cdev_decl(lpt);
-#include "arcpp.h"
-cdev_decl(arcpp);
-#include "ipfilter.h"
-cdev_decl(ipl);
-#include "rnd.h"
-cdev_decl(rnd);
-#include "vcoda.h"
-cdev_decl(vc_nb_);
-#include "raid.h"
-cdev_decl(raid);
-bdev_decl(raid);
-cons_decl(rs);
-#include "clockctl.h"
-cdev_decl(clockctl);
-
-struct bdevsw bdevsw[] = {
- bdev_swap_init(1, sw), /* 0: swap pseudo-device */
- bdev_disk_init(NMD, md), /* 1: memory "disk" */
- bdev_disk_init(NVND, vnd), /* 2: vnode "disk" */
- bdev_disk_init(NCCD, ccd), /* 3: concatenated disks */
- bdev_disk_init(NWD, wd), /* 4: IDE disks */
- bdev_disk_init(NSD, sd), /* 5: SCSI disks */
- bdev_disk_init(NCD, cd), /* 6: SCSI CD-ROMs */
- bdev_disk_init(NRAID, raid), /* 7: RAIDframe disk driver */
-};
-
-int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
-
-struct cdevsw cdevsw[] = {
- /* First seven are standard across most ports */
- cdev_cn_init(1, cn), /* 0: /dev/console */
- cdev_ctty_init(1, ctty), /* 1: /dev/tty */
- cdev_mm_init(1, mm), /* 2: /dev/{null,mem,kmem,zero} */
- cdev_swap_init(1, sw), /* 3: /dev/drum */
- cdev_tty_init(NPTY, pts), /* 4: pseudo-tty slave */
- cdev_ptc_init(NPTY, ptc), /* 5: pseudo-tty master */
- cdev_log_init(1, log), /* 6: /dev/klog */
- cdev_fd_init(1, filedesc), /* 7: file descriptors */
- cdev_disk_init(NMD, md), /* 8: memory "disk" */
- cdev_disk_init(NVND, vnd), /* 9: vnode "disk" */
- cdev_disk_init(NCCD, ccd), /* 10: concatenated disks */
- cdev_mouse_init(NWSKBD, wskbd), /* 11: keyboards */
- cdev_mouse_init(NWSMOUSE, wsmouse),
- /* 12: mice */
- cdev_mouse_init(NWSMUX, wsmux), /* 13: keyboard/mouse multiplexor */
- cdev_wsdisplay_init(NWSDISPLAY, wsdisplay),
- /* 14: console display */
- cdev_disk_init(NWD, wd), /* 15: IDE disks */
- cdev_disk_init(NSD, sd), /* 16: SCSI disks */
- cdev_disk_init(NCD, cd), /* 17: SCSI CD-ROMs */
- cdev_bpftun_init(NBPFILTER, bpf),/*18: Berkeley packet filter */
- cdev_bpftun_init(NTUN,tun), /* 19: network tunnel */
- cdev_tty_init(NCOM, com), /* 20: ns8250 etc serial */
- cdev_lpt_init(NLPT, lpt), /* 21: PC-style parallel */
- cdev_lpt_init(NARCPP, arcpp), /* 22: Arc-style parallel */
- cdev_ipf_init(NIPFILTER,ipl), /* 23: ip-filter device */
- cdev_rnd_init(NRND,rnd), /* 24: random source pseudo-device */
- cdev_vc_nb_init(NVCODA,vc_nb_), /* 25: coda file system psdev */
- cdev_disk_init(NRAID,raid), /* 26: RAIDframe disk driver */
- cdev_clockctl_init(NCLOCKCTL, clockctl),/* 27: clockctl pseudo device */
-#ifdef SYSTRACE
- cdev_clonemisc_init(1, systrace),/* 28: system call tracing */
-#else
- cdev_notdef(), /* 28: system call tracing */
-#endif
-};
-
-int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
-
-
-int mem_no = 2; /* major device number of memory special file */
-
-/*
- * Swapdev is a fake device implemented
- * in sw.c used only internally to get to swstrategy.
- * It cannot be provided to the users, because the
- * swstrategy routine munches the b_dev and b_blkno entries
- * before calling the appropriate driver. This would horribly
- * confuse, e.g. the hashing routines. Instead, /dev/drum is
- * provided as a character (raw) device.
- */
-dev_t swapdev = makedev(0, 0);
/*
* Returns true if dev is /dev/mem or /dev/kmem.
@@ -164,70 +48,6 @@
return (major(dev) == mem_no && minor(dev) < 2);
}
-/*
- * Returns true if dev is /dev/zero.
- */
-int
-iszerodev(dev)
- dev_t dev;
-{
- return (major(dev) == mem_no && minor(dev) == 3);
-}
-
-
-static int chrtoblktbl[] = {
-/* XXXX This needs to be dynamic for LKMs. */
- /*VCHR*/ /*VBLK*/
- /* 0 */ NODEV,
- /* 1 */ NODEV,
- /* 2 */ NODEV,
- /* 3 */ NODEV,
- /* 4 */ NODEV,
- /* 5 */ NODEV,
- /* 6 */ NODEV,
- /* 7 */ NODEV,
- /* 8 */ 1, /* md */
- /* 9 */ 2, /* vnd */
- /* 10 */ 3, /* ccd */
- /* 11 */ NODEV,
- /* 12 */ NODEV,
- /* 13 */ NODEV,
- /* 14 */ NODEV,
- /* 15 */ 4, /* wd */
- /* 16 */ 5, /* sd */
- /* 17 */ 6, /* cd */
- /* 18 */ NODEV,
- /* 19 */ NODEV,
- /* 20 */ NODEV,
- /* 21 */ NODEV,
- /* 22 */ NODEV,
- /* 23 */ NODEV,
- /* 24 */ NODEV,
- /* 25 */ NODEV,
- /* 26 */ 7, /* raid */
- /* 27 */ NODEV,
- /* 28 */ NODEV,
-};
-
-/*
Home |
Main Index |
Thread Index |
Old Index