Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Only declare block major numbers for devices which ...



details:   https://anonhg.NetBSD.org/src/rev/97f3f066d7e7
branches:  trunk
changeset: 473574:97f3f066d7e7
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jun 07 20:31:27 1999 +0000

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

diffstat:

 sys/arch/alpha/conf/files.alpha       |   3 +--
 sys/arch/amiga/conf/files.amiga       |   4 +---
 sys/arch/arm32/conf/files.arm32       |  16 +---------------
 sys/arch/atari/conf/files.atari       |   7 ++-----
 sys/arch/bebox/conf/files.bebox       |   6 +-----
 sys/arch/hp300/conf/files.hp300       |   6 +-----
 sys/arch/i386/conf/files.i386         |   5 +----
 sys/arch/mac68k/conf/files.mac68k     |   4 +---
 sys/arch/macppc/conf/files.macppc     |   3 +--
 sys/arch/mvme68k/conf/files.mvme68k   |   3 +--
 sys/arch/newsmips/conf/files.newsmips |   3 +--
 sys/arch/next68k/conf/files.next68k   |   4 +---
 sys/arch/pc532/conf/files.pc532       |   5 +----
 sys/arch/pmax/conf/files.pmax         |   3 +--
 sys/arch/sparc/conf/files.sparc       |   3 +--
 sys/arch/sparc64/conf/files.sparc64   |   3 +--
 sys/arch/sun3/conf/files.sun3         |   3 +--
 sys/arch/vax/conf/files.vax           |   4 +---
 sys/arch/x68k/conf/files.x68k         |   4 +---
 19 files changed, 20 insertions(+), 69 deletions(-)

diffs (truncated from 486 to 300 lines):

diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/alpha/conf/files.alpha   Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -66,7 +66,6 @@
 #
 
 include "dev/scsipi/files.scsipi"
-major { st = 2 }
 major { cd = 3 }
 major { sd = 8 }
 
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Mon Jun 07 20:31:27 1999 +0000
@@ -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 16                       # NOTE THAT AMIGA IS SPECIAL!
@@ -237,7 +237,6 @@
 
 include "../../../dev/scsipi/files.scsipi"
 major  {sd = 4}
-major  {st = 5}
 major  {cd = 7}
 
 # wd 33c93 contrllers
@@ -395,7 +394,6 @@
 file   arch/amiga/amiga/db_memrw.c     ddb
 file   arch/amiga/dev/md_root.c                memory_disk_hooks
 
-major  {vnd = 6}
 major  {md = 15}       # Memory disk (for mini-kernel)
 
 # Compatibility modules
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/arm32/conf/files.arm32
--- a/sys/arch/arm32/conf/files.arm32   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/arm32/conf/files.arm32   Mon Jun 07 20:31:27 1999 +0000
@@ -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
 #
@@ -35,7 +35,6 @@
 device cpu
 attach cpu at mainbus
 file   arch/arm32/mainbus/cpu.c                cpu needs-flag
-major  {cpu = 38}
 
 #
 # ISA and mixed ISA+EISA or ISA+PCI drivers
@@ -59,7 +58,6 @@
 file   arch/arm32/mainbus/wdc_pioc.c           wdc_pioc
 
 # Standard parallel driver
-major   {lpt = 8}
 attach  lpt at pioc with lpt_pioc
 file    arch/arm32/mainbus/lpt_pioc.c          lpt_pioc
 
@@ -111,8 +109,6 @@
 major   {fd = 17}
 
 # Standard serial driver
-major   {com = 12}
-
 attach com at pioc with com_pioc
 file    arch/arm32/mainbus/com_pioc.c          com_pioc
 
@@ -142,7 +138,6 @@
 # quadmouse device
 device  qms
 file    arch/arm32/dev/qms.c                   qms needs-flag
-major   {qms = 9}
 
 attach qms at iomd with qms_iomd
 file    arch/arm32/iomd/qms_iomd.c             qms_iomd
@@ -155,7 +150,6 @@
 device opms: tty
 file   arch/arm32/dev/pms.c                    opms & opms_iomd needs-flag
 file   arch/arm32/shark/pms.c                  opms & ofw needs-flag
-major  {opms = 40}
 
 attach opms at spckbd with opms
 attach opms at iomd with opms_iomd
@@ -164,7 +158,6 @@
 # Standard keyboard driver
 device kbd
 file   arch/arm32/dev/kbd.c                    kbd needs-flag
-major  {kbd = 11}
 
 attach kbd at iomd with kbd_iomd
 file   arch/arm32/iomd/kbd_iomd.c              kbd_iomd
@@ -196,12 +189,10 @@
 device beep
 attach beep at vidc
 file   arch/arm32/vidc/beep.c                  beep needs-flag
-major  {beep = 10}
 
 device vidcaudio: audio
 attach vidcaudio at vidc
 file   arch/arm32/vidc/vidcaudio.c             vidcaudio needs-flag
-major  {vidcaudio = 36}
 
 device lmcaudio: audio
 attach lmcaudio at vidc
@@ -252,11 +243,7 @@
 
 include "dev/scsipi/files.scsipi"
 major   {sd = 24}
-major   {st = 25}
 major   {cd = 26}
-major   {ch = 27}
-major  {uk = 28}
-major  {ss = 29}
 
 # Generic sbic (WD3393) driver
 define sbic
@@ -325,7 +312,6 @@
 device  vidcvideo
 attach vidcvideo at vidc
 file    arch/arm32/vidc/console/vidcvideo.c    vidcvideo needs-count
-major  {vidcvideo = 37}
 device  vt: tty
 attach vt at vidc
 
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/atari/conf/files.atari
--- a/sys/arch/atari/conf/files.atari   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/atari/conf/files.atari   Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -155,12 +155,9 @@
 # ISA Plug 'n Play devices
 file   arch/atari/isa/isapnp_machdep.c isapnp
 
-#
-# XXX: Some scsi-devices must be at fixed major#
+include "dev/scsipi/files.scsipi"
 major   {sd = 4}
-major   {st = 5}
 major   {cd = 6}
-include "dev/scsipi/files.scsipi"
 
 # ncr 5380 controller
 device ncrscsi: scsi
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/bebox/conf/files.bebox
--- a/sys/arch/bebox/conf/files.bebox   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/bebox/conf/files.bebox   Mon Jun 07 20:31:27 1999 +0000
@@ -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
 #
@@ -17,14 +17,11 @@
 # General files
 file   dev/cons.c
 
-major  {vnd = 14}
-
 #
 # Machine-independent SCSI drivers
 #
 include "dev/scsipi/files.scsipi"
 major  {sd = 4}
-major  {st = 5}
 major  {cd = 6}
 
 #
@@ -73,7 +70,6 @@
 include "dev/isa/files.isa"
 major  {mcd = 7}
 #major {scd = 15}
-major  {wt = 3}
 
 file   arch/bebox/isa/isa_machdep.c    isa
 file   arch/bebox/isa/isadma_machdep.c isa
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300   Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/hp300/conf/files.hp300   Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -136,12 +136,10 @@
 device ct: tape
 attach ct at hpibbus
 file   arch/hp300/dev/ct.c             ct needs-flag
-major  {ct = 0}
 
 device mt: tape
 attach mt at hpibbus
 file   arch/hp300/dev/mt.c             mt needs-flag
-major  {mt = 1}
 
 device rd: disk
 attach rd at hpibbus
@@ -205,8 +203,6 @@
 file   dev/cons.c
 file   dev/cninit.c
 
-major  {vnd = 6}
-
 #
 # HP-UX binary compatibility
 #
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/i386/conf/files.i386     Mon Jun 07 20:31:27 1999 +0000
@@ -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
 #
@@ -56,7 +56,6 @@
 file   arch/i386/i386/trap.c
 file   arch/i386/i386/vm_machdep.c
 file   dev/cons.c
-major  {vnd = 14}
 
 #
 # Machine-independent SCSI drivers
@@ -64,7 +63,6 @@
 
 include "dev/scsipi/files.scsipi"
 major  {sd = 4}
-major  {st = 5}
 major  {cd = 6}
 
 #
@@ -128,7 +126,6 @@
 include "dev/isa/files.isa"
 major  {mcd = 7}
 #major {scd = 15}
-major  {wt = 3}
 
 # 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.
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/mac68k/conf/files.mac68k
--- a/sys/arch/mac68k/conf/files.mac68k Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/mac68k/conf/files.mac68k Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -160,9 +160,7 @@
 file   arch/mac68k/dev/md_root.c       memory_disk_hooks
 
 major  {sd = 4}
-major  {st = 5}
 major  {cd = 6}
-major  {vnd = 8}
 major  {md = 13}
 
 # Compatibility modules
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/macppc/conf/files.macppc Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -30,7 +30,6 @@
 #
 include "dev/scsipi/files.scsipi"
 major {sd = 4}
-major {st = 5}
 major {cd = 6}
 
 #
diff -r 73b857263046 -r 97f3f066d7e7 sys/arch/mvme68k/conf/files.mvme68k
--- a/sys/arch/mvme68k/conf/files.mvme68k       Mon Jun 07 20:16:08 1999 +0000
+++ b/sys/arch/mvme68k/conf/files.mvme68k       Mon Jun 07 20:31:27 1999 +0000
@@ -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
 
@@ -79,7 +79,6 @@
 



Home | Main Index | Thread Index | Old Index