Only declare block major numbers for devices which can be the root device.

This commit is contained in:
thorpej 1999-06-07 20:31:27 +00:00
parent d76e7b8c6d
commit 2c35c7bd03
19 changed files with 21 additions and 70 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: files.alpha,v 1.101 1999/04/30 05:58:11 cgd Exp $ # $NetBSD: files.alpha,v 1.102 1999/06/07 20:31:27 thorpej Exp $
# #
# alpha-specific configuration info # alpha-specific configuration info
@ -66,7 +66,6 @@ include "dev/mii/files.mii"
# #
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major { st = 2 }
major { cd = 3 } major { cd = 3 }
major { sd = 8 } major { sd = 8 }

View File

@ -1,4 +1,4 @@
# $NetBSD: files.amiga,v 1.86 1999/04/19 21:22:57 kleink Exp $ # $NetBSD: files.amiga,v 1.87 1999/06/07 20:31:28 thorpej Exp $
# maxpartitions must be first item in files.${ARCH}.newconf # maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL! maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@ -237,7 +237,6 @@ file arch/amiga/dev/lpt_supio.c lpt_supio
include "../../../dev/scsipi/files.scsipi" include "../../../dev/scsipi/files.scsipi"
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 7} major {cd = 7}
# wd 33c93 contrllers # wd 33c93 contrllers
@ -395,7 +394,6 @@ file arch/amiga/amiga/cc.c
file arch/amiga/amiga/db_memrw.c ddb file arch/amiga/amiga/db_memrw.c ddb
file arch/amiga/dev/md_root.c memory_disk_hooks file arch/amiga/dev/md_root.c memory_disk_hooks
major {vnd = 6}
major {md = 15} # Memory disk (for mini-kernel) major {md = 15} # Memory disk (for mini-kernel)
# Compatibility modules # Compatibility modules

View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm32,v 1.76 1999/03/01 10:01:52 mark Exp $ # $NetBSD: files.arm32,v 1.77 1999/06/07 20:31:29 thorpej Exp $
# #
# First try for arm-specific configuration info # First try for arm-specific configuration info
# #
@ -35,7 +35,6 @@ file arch/arm32/mainbus/mainbus_io_asm.S mainbus
device cpu device cpu
attach cpu at mainbus attach cpu at mainbus
file arch/arm32/mainbus/cpu.c cpu needs-flag file arch/arm32/mainbus/cpu.c cpu needs-flag
major {cpu = 38}
# #
# ISA and mixed ISA+EISA or ISA+PCI drivers # ISA and mixed ISA+EISA or ISA+PCI drivers
@ -59,7 +58,6 @@ attach wdc at pioc with wdc_pioc
file arch/arm32/mainbus/wdc_pioc.c wdc_pioc file arch/arm32/mainbus/wdc_pioc.c wdc_pioc
# Standard parallel driver # Standard parallel driver
major {lpt = 8}
attach lpt at pioc with lpt_pioc attach lpt at pioc with lpt_pioc
file arch/arm32/mainbus/lpt_pioc.c lpt_pioc file arch/arm32/mainbus/lpt_pioc.c lpt_pioc
@ -111,8 +109,6 @@ file arch/arm32/mainbus/fd.c fdc needs-flag
major {fd = 17} major {fd = 17}
# Standard serial driver # Standard serial driver
major {com = 12}
attach com at pioc with com_pioc attach com at pioc with com_pioc
file arch/arm32/mainbus/com_pioc.c com_pioc file arch/arm32/mainbus/com_pioc.c com_pioc
@ -142,7 +138,6 @@ file arch/arm32/iomd/iomd_clock.c iomd
# quadmouse device # quadmouse device
device qms device qms
file arch/arm32/dev/qms.c qms needs-flag file arch/arm32/dev/qms.c qms needs-flag
major {qms = 9}
attach qms at iomd with qms_iomd attach qms at iomd with qms_iomd
file arch/arm32/iomd/qms_iomd.c qms_iomd file arch/arm32/iomd/qms_iomd.c qms_iomd
@ -155,7 +150,6 @@ define spckbd { [irq = -1], [port = -1] }
device opms: tty device opms: tty
file arch/arm32/dev/pms.c opms & opms_iomd needs-flag file arch/arm32/dev/pms.c opms & opms_iomd needs-flag
file arch/arm32/shark/pms.c opms & ofw needs-flag file arch/arm32/shark/pms.c opms & ofw needs-flag
major {opms = 40}
attach opms at spckbd with opms attach opms at spckbd with opms
attach opms at iomd with opms_iomd attach opms at iomd with opms_iomd
@ -164,7 +158,6 @@ file arch/arm32/iomd/pms_iomd.c opms_iomd
# Standard keyboard driver # Standard keyboard driver
device kbd device kbd
file arch/arm32/dev/kbd.c kbd needs-flag file arch/arm32/dev/kbd.c kbd needs-flag
major {kbd = 11}
attach kbd at iomd with kbd_iomd attach kbd at iomd with kbd_iomd
file arch/arm32/iomd/kbd_iomd.c kbd_iomd file arch/arm32/iomd/kbd_iomd.c kbd_iomd
@ -196,12 +189,10 @@ file arch/arm32/vidc/vidc20.c vidc needs-count
device beep device beep
attach beep at vidc attach beep at vidc
file arch/arm32/vidc/beep.c beep needs-flag file arch/arm32/vidc/beep.c beep needs-flag
major {beep = 10}
device vidcaudio: audio device vidcaudio: audio
attach vidcaudio at vidc attach vidcaudio at vidc
file arch/arm32/vidc/vidcaudio.c vidcaudio needs-flag file arch/arm32/vidc/vidcaudio.c vidcaudio needs-flag
major {vidcaudio = 36}
device lmcaudio: audio device lmcaudio: audio
attach lmcaudio at vidc attach lmcaudio at vidc
@ -252,11 +243,7 @@ file arch/arm32/rc7500/if_es.c es & rc7500
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {sd = 24} major {sd = 24}
major {st = 25}
major {cd = 26} major {cd = 26}
major {ch = 27}
major {uk = 28}
major {ss = 29}
# Generic sbic (WD3393) driver # Generic sbic (WD3393) driver
define sbic define sbic
@ -325,7 +312,6 @@ file arch/arm32/podulebus/amps.c amps
device vidcvideo device vidcvideo
attach vidcvideo at vidc attach vidcvideo at vidc
file arch/arm32/vidc/console/vidcvideo.c vidcvideo needs-count file arch/arm32/vidc/console/vidcvideo.c vidcvideo needs-count
major {vidcvideo = 37}
device vt: tty device vt: tty
attach vt at vidc attach vt at vidc

View File

@ -1,5 +1,5 @@
# #
# $NetBSD: files.atari,v 1.62 1999/05/06 20:27:57 leo Exp $ # $NetBSD: files.atari,v 1.63 1999/06/07 20:31:29 thorpej Exp $
maxpartitions 16 maxpartitions 16
@ -155,12 +155,9 @@ major {wd = 14}
# ISA Plug 'n Play devices # ISA Plug 'n Play devices
file arch/atari/isa/isapnp_machdep.c isapnp file arch/atari/isa/isapnp_machdep.c isapnp
#
# XXX: Some scsi-devices must be at fixed major#
major {sd = 4}
major {st = 5}
major {cd = 6}
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {sd = 4}
major {cd = 6}
# ncr 5380 controller # ncr 5380 controller
device ncrscsi: scsi device ncrscsi: scsi

View File

@ -1,4 +1,4 @@
# $NetBSD: files.bebox,v 1.14 1998/11/18 09:05:18 sakamoto Exp $ # $NetBSD: files.bebox,v 1.15 1999/06/07 20:31:30 thorpej Exp $
# #
# First try for bebox specific configuration info # First try for bebox specific configuration info
# #
@ -17,14 +17,11 @@ file arch/bebox/bebox/machdep.c
# General files # General files
file dev/cons.c file dev/cons.c
major {vnd = 14}
# #
# Machine-independent SCSI drivers # Machine-independent SCSI drivers
# #
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 6} major {cd = 6}
# #
@ -73,7 +70,6 @@ file arch/bebox/pci/pcib.c pcib
include "dev/isa/files.isa" include "dev/isa/files.isa"
major {mcd = 7} major {mcd = 7}
#major {scd = 15} #major {scd = 15}
major {wt = 3}
file arch/bebox/isa/isa_machdep.c isa file arch/bebox/isa/isa_machdep.c isa
file arch/bebox/isa/isadma_machdep.c isa file arch/bebox/isa/isadma_machdep.c isa

View File

@ -1,4 +1,4 @@
# $NetBSD: files.hp300,v 1.39 1999/04/19 21:22:58 kleink Exp $ # $NetBSD: files.hp300,v 1.40 1999/06/07 20:31:30 thorpej Exp $
# #
# hp300-specific configuration info # hp300-specific configuration info
@ -136,12 +136,10 @@ file arch/hp300/dev/hpib.c hpibbus
device ct: tape device ct: tape
attach ct at hpibbus attach ct at hpibbus
file arch/hp300/dev/ct.c ct needs-flag file arch/hp300/dev/ct.c ct needs-flag
major {ct = 0}
device mt: tape device mt: tape
attach mt at hpibbus attach mt at hpibbus
file arch/hp300/dev/mt.c mt needs-flag file arch/hp300/dev/mt.c mt needs-flag
major {mt = 1}
device rd: disk device rd: disk
attach rd at hpibbus attach rd at hpibbus
@ -205,8 +203,6 @@ file arch/hp300/dev/md_root.c memory_disk_hooks
file dev/cons.c file dev/cons.c
file dev/cninit.c file dev/cninit.c
major {vnd = 6}
# #
# HP-UX binary compatibility # HP-UX binary compatibility
# #

View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.132 1999/03/23 20:07:39 bad Exp $ # $NetBSD: files.i386,v 1.133 1999/06/07 20:31:30 thorpej Exp $
# #
# new style config file for i386 architecture # new style config file for i386 architecture
# #
@ -56,7 +56,6 @@ file arch/i386/i386/sys_machdep.c
file arch/i386/i386/trap.c file arch/i386/i386/trap.c
file arch/i386/i386/vm_machdep.c file arch/i386/i386/vm_machdep.c
file dev/cons.c file dev/cons.c
major {vnd = 14}
# #
# Machine-independent SCSI drivers # Machine-independent SCSI drivers
@ -64,7 +63,6 @@ major {vnd = 14}
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 6} major {cd = 6}
# #
@ -128,7 +126,6 @@ file arch/i386/pci/pcib.c pcib
include "dev/isa/files.isa" include "dev/isa/files.isa"
major {mcd = 7} major {mcd = 7}
#major {scd = 15} #major {scd = 15}
major {wt = 3}
# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT # XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files. # XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.

View File

@ -1,4 +1,4 @@
# $NetBSD: files.mac68k,v 1.89 1999/04/19 21:22:59 kleink Exp $ # $NetBSD: files.mac68k,v 1.90 1999/06/07 20:31:31 thorpej Exp $
# mac68k-specific configuration info # mac68k-specific configuration info
@ -160,9 +160,7 @@ file dev/cninit.c
file arch/mac68k/dev/md_root.c memory_disk_hooks file arch/mac68k/dev/md_root.c memory_disk_hooks
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 6} major {cd = 6}
major {vnd = 8}
major {md = 13} major {md = 13}
# Compatibility modules # Compatibility modules

View File

@ -1,4 +1,4 @@
# $NetBSD: files.macppc,v 1.19 1999/04/16 21:15:29 thorpej Exp $ # $NetBSD: files.macppc,v 1.20 1999/06/07 20:31:31 thorpej Exp $
# #
# macppc-specific configuration info # macppc-specific configuration info
@ -30,7 +30,6 @@ major {md = 9}
# #
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 6} major {cd = 6}
# #

View File

@ -1,4 +1,4 @@
# $NetBSD: files.mvme68k,v 1.26 1999/04/19 21:23:00 kleink Exp $ # $NetBSD: files.mvme68k,v 1.27 1999/06/07 20:31:32 thorpej Exp $
# config file for mvme68k # config file for mvme68k
@ -79,7 +79,6 @@ file arch/mvme68k/dev/vme_two.c vmetwo
include "../../../dev/scsipi/files.scsipi" include "../../../dev/scsipi/files.scsipi"
major { vnd = 6 }
major { sd = 7 } major { sd = 7 }
major { md = 9 } major { md = 9 }
major { cd = 18 } major { cd = 18 }

View File

@ -1,4 +1,4 @@
# $NetBSD: files.newsmips,v 1.3 1998/07/21 17:36:03 drochner Exp $ # $NetBSD: files.newsmips,v 1.4 1999/06/07 20:31:32 thorpej Exp $
# NEWS-specific configuration info # NEWS-specific configuration info
# maxpartitions must be first item in files.${ARCH}. # maxpartitions must be first item in files.${ARCH}.
@ -93,7 +93,6 @@ include "dev/scsipi/files.scsipi"
major { sd = 0 } major { sd = 0 }
major { fd = 1 } major { fd = 1 }
major { cd = 16 } major { cd = 16 }
major { st = 17 }
device sc: scsi device sc: scsi
file arch/newsmips/dev/scsi_1185.c sc needs-count file arch/newsmips/dev/scsi_1185.c sc needs-count

View File

@ -1,4 +1,4 @@
# $NetBSD: files.next68k,v 1.12 1999/04/24 17:55:10 dbj Exp $ # $NetBSD: files.next68k,v 1.13 1999/06/07 20:31:33 thorpej Exp $
# next68k-specific configuration info # next68k-specific configuration info
@ -89,9 +89,7 @@ file arch/next68k/dev/esp.c esp needs-flag
# Memory disk for boot tape # Memory disk for boot tape
file arch/next68k/dev/md_root.c memory_disk_hooks file arch/next68k/dev/md_root.c memory_disk_hooks
major {sd = 4} major {sd = 4}
major {st = 5}
major {cd = 6} major {cd = 6}
major {vnd = 8}
major {md = 13} major {md = 13}

View File

@ -1,4 +1,4 @@
# $NetBSD: files.pc532,v 1.38 1998/09/30 20:16:17 matthias Exp $ # $NetBSD: files.pc532,v 1.39 1999/06/07 20:31:33 thorpej Exp $
# #
# new style config file for pc532 architecture # new style config file for pc532 architecture
# #
@ -12,8 +12,6 @@ device mainbus {[addr = -1], [irq = -1]}
attach mainbus at root attach mainbus at root
file arch/pc532/pc532/mainbus.c file arch/pc532/pc532/mainbus.c
major {vnd = 5}
# Memory Disk for install floppy # Memory Disk for install floppy
file arch/pc532/dev/md_root.c memory_disk_hooks file arch/pc532/dev/md_root.c memory_disk_hooks
major {md = 3} major {md = 3}
@ -35,7 +33,6 @@ file arch/pc532/dev/lpt.c lpt needs-flag
include "../../../dev/scsipi/files.scsipi" include "../../../dev/scsipi/files.scsipi"
major {sd = 0} major {sd = 0}
major {st = 2}
major {cd = 4} major {cd = 4}
device ncr: scsi, ncr5380sbc device ncr: scsi, ncr5380sbc

View File

@ -1,4 +1,4 @@
# $NetBSD: files.pmax,v 1.66 1999/05/21 01:10:49 nisimura Exp $ # $NetBSD: files.pmax,v 1.67 1999/06/07 20:31:33 thorpej Exp $
# DECstation-specific configuration info # DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}. # maxpartitions must be first item in files.${ARCH}.
@ -108,7 +108,6 @@ file arch/pmax/ibus/mcclock_ibus.c mcclock_ibus
# #
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
#major { st = 10 }
#major { cd = 3 } #major { cd = 3 }
#major { sd = 21 } #major { sd = 21 }
major { tz = 10 } major { tz = 10 }

View File

@ -1,4 +1,4 @@
# $NetBSD: files.sparc,v 1.75 1999/05/14 06:42:02 mrg Exp $ # $NetBSD: files.sparc,v 1.76 1999/06/07 20:31:34 thorpej Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93 # @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info # sparc-specific configuration info
@ -121,7 +121,6 @@ major { cd = 18 }
major { fd = 16 } major { fd = 16 }
major { md = 5 } major { md = 5 }
major { sd = 7 } major { sd = 7 }
major { vnd = 8 }
major { xd = 10 } major { xd = 10 }
major { xy = 3 } major { xy = 3 }

View File

@ -1,4 +1,4 @@
# $NetBSD: files.sparc64,v 1.22 1999/06/05 16:55:19 eeh Exp $ # $NetBSD: files.sparc64,v 1.23 1999/06/07 20:31:34 thorpej Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info # sparc64-specific configuration info
@ -141,7 +141,6 @@ major { cd = 18 }
major { fd = 16 } major { fd = 16 }
major { md = 5 } major { md = 5 }
major { sd = 7 } major { sd = 7 }
major { vnd = 8 }
major { wd = 12 } major { wd = 12 }
# Brooktree DAC attribute # Brooktree DAC attribute

View File

@ -1,4 +1,4 @@
# $NetBSD: files.sun3,v 1.53 1999/05/14 06:42:02 mrg Exp $ # $NetBSD: files.sun3,v 1.54 1999/06/07 20:31:34 thorpej Exp $
# #
# sun3-specific configuration info # sun3-specific configuration info
@ -271,7 +271,6 @@ include "compat/ossaudio/files.ossaudio"
# Major numbers for root/swap device configuration # Major numbers for root/swap device configuration
major {xy=3} # Xylogics 450 and 451 major {xy=3} # Xylogics 450 and 451
major {vnd=5} # vnode pseudo-device
major {sd=7} # SCSI disk major {sd=7} # SCSI disk
major {xd=10} # Xylogics 7053 major {xd=10} # Xylogics 7053
major {md=13} # Memory disk (for mini-kernel) major {md=13} # Memory disk (for mini-kernel)

View File

@ -1,4 +1,4 @@
# $NetBSD: files.vax,v 1.51 1999/05/24 20:10:31 ragge Exp $ # $NetBSD: files.vax,v 1.52 1999/06/07 20:31:35 thorpej Exp $
# #
# new style config file for vax architecture # new style config file for vax architecture
# #
@ -60,7 +60,6 @@ major {md = 23}
# MSCP device drivers # MSCP device drivers
include "arch/vax/mscp/files.mscp" include "arch/vax/mscp/files.mscp"
major {ra = 9} major {ra = 9}
major {mt = 16}
# KDB50 on BI # KDB50 on BI
device kdb: mscp device kdb: mscp
@ -138,7 +137,6 @@ major {ry = 24}
# #
include "../../../dev/scsipi/files.scsipi" include "../../../dev/scsipi/files.scsipi"
major { sd = 20 } major { sd = 20 }
major { st = 21 }
major { cd = 22 } major { cd = 22 }
# builtin NCR5380 SCSI-controller on VAXstation # builtin NCR5380 SCSI-controller on VAXstation

View File

@ -1,4 +1,4 @@
# $NetBSD: files.x68k,v 1.25 1999/04/19 21:23:02 kleink Exp $ # $NetBSD: files.x68k,v 1.26 1999/06/07 20:31:35 thorpej Exp $
# #
# new style config file for x68k architecture # new style config file for x68k architecture
# #
@ -42,7 +42,6 @@ file arch/x68k/x68k/bus.c
file dev/cons.c file dev/cons.c
file dev/cninit.c file dev/cninit.c
major {vnd = 6}
# Emulation modules # Emulation modules
# 6888x emulator (FPU_EMULATE) # 6888x emulator (FPU_EMULATE)
@ -146,7 +145,6 @@ file arch/x68k/dev/fd.c fd needs-flag
include "dev/scsipi/files.scsipi" include "dev/scsipi/files.scsipi"
major {cd = 7} major {cd = 7}
major {sd = 4} major {sd = 4}
major {st = 5}
device scsirom {} device scsirom {}
attach scsirom at intio attach scsirom at intio