[src/trunk]: src/sys/arch/sparc/conf make the vme stuff compile again; I am n...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39d07bfae213
branches:  trunk
changeset: 474974:39d07bfae213
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jul 28 05:45:50 1999 +0000

description:
make the vme stuff compile again; I am not sure this is correct as I don't
have the hardware to test, but it has been broken for 3+ weeks now. Hi
Mr. Drochner!

diffstat:

 sys/arch/sparc/conf/GENERIC     |  32 ++++++++++++++++----------------
 sys/arch/sparc/conf/files.sparc |   4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diffs (101 lines):

diff -r dfa9edeedc31 -r 39d07bfae213 sys/arch/sparc/conf/GENERIC
--- a/sys/arch/sparc/conf/GENERIC       Wed Jul 28 05:37:54 1999 +0000
+++ b/sys/arch/sparc/conf/GENERIC       Wed Jul 28 05:45:50 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.86 1999/07/20 07:40:36 christos Exp $
+#      $NetBSD: GENERIC,v 1.87 1999/07/28 05:45:50 christos Exp $
 
 include "arch/sparc/conf/std.sparc"
 
@@ -177,10 +177,10 @@
 
 sbus0  at mainbus0                             # sun4c
 obio0  at mainbus0                             # sun4 and sun4m
-vme0   at mainbus0                             # sun4
+sparcvme0      at mainbus0                             # sun4
 iommu0 at mainbus0                             # sun4m
 sbus0  at iommu0                               # sun4m
-vme0   at iommu0                               # sun4m
+sparcvme0      at iommu0                               # sun4m
 
 ## SBus expander box
 xbox*  at sbus? slot ? offset ?
@@ -308,11 +308,11 @@
 ##     0x04            Allow disconnect/reselect
 ##
 ## E.g. the following would enable DMA, interrupts, and reselect:
-## si0 at vme0 addr 0x200000 level 3 vect 0x40 flags 0x07
+## si0 at sparcvme0 addr 0x200000 irq 3 vect 0x40 flags 0x07
 ##
 ## By default, DMA is enabled in the driver.
 
-si0    at vme0 addr 0x200000 pri 2 vec 0x40
+si0    at sparcvme0 addr 0x200000 irq 2 vect 0x40
 scsibus* at si?
 
 ## NCR5380-based "SCSI Weird" on-board SCSI interface found
@@ -341,16 +341,16 @@
 
 ## Xylogics 753 or 7053 VME SMD disk controllers and disks, found
 ## on sun4 systems.
-xdc0   at vme0 addr 0xee80 pri 3 vec 0x44
-xdc1   at vme0 addr 0xee90 pri 3 vec 0x45
-xdc2   at vme0 addr 0xeea0 pri 3 vec 0x46
-xdc3   at vme0 addr 0xeeb0 pri 3 vec 0x47
+xdc0   at sparcvme0 addr 0xee80 irq 3 vect 0x44
+xdc1   at sparcvme0 addr 0xee90 irq 3 vect 0x45
+xdc2   at sparcvme0 addr 0xeea0 irq 3 vect 0x46
+xdc3   at sparcvme0 addr 0xeeb0 irq 3 vect 0x47
 xd*    at xdc? drive ?
 
 ## Xylogics 451 or 451 VME SMD disk controllers and disks, found
 ## on sun4 systems.
-xyc0   at vme0 addr 0xee40 pri 3 vec 0x48
-xyc1   at vme0 addr 0xee48 pri 3 vec 0x49
+xyc0   at sparcvme0 addr 0xee40 irq 3 vect 0x48
+xyc1   at sparcvme0 addr 0xee48 irq 3 vect 0x49
 xy*    at xyc? drive ?
 
 
@@ -408,10 +408,10 @@
 ## or on a Multibus/VME card.
 ie0    at obio0 addr 0xf6000000 level 6                # sun4/200 on-board
 ie0    at obio0 addr 0x06000000 level 6                # sun4/100 on-board
-ie1    at vme0 addr 0xe88000 pri 3 vec 0x75            # VME
-ie2    at vme0 addr 0x31ff02 pri 3 vec 0x76            # VME
-ie3    at vme0 addr 0x35ff02 pri 3 vec 0x77            # VME
-ie4    at vme0 addr 0x2dff02 pri 3 vec 0x7c            # VME
+ie1    at sparcvme0 addr 0xe88000 irq 3 vect 0x75              # VME
+ie2    at sparcvme0 addr 0x31ff02 irq 3 vect 0x76              # VME
+ie3    at sparcvme0 addr 0x35ff02 irq 3 vect 0x77              # VME
+ie4    at sparcvme0 addr 0x2dff02 irq 3 vect 0x7c              # VME
 
 ## qec/be, qec/hme
 qec*   at sbus? slot ? offset ?
@@ -494,7 +494,7 @@
 bwtwo0         at obio0 addr 0x0b300000 level 4        # sun4/100 in P4 slot
 
 ## Sun "cgtwo" VME color framebuffer
-cgtwo0         at vme0 addr 0x400000 pri ? vec 0xa8
+cgtwo0         at sparcvme0 addr 0x400000 irq ? vect 0xa8
 
 ## Sun "cgthree" Sbus color framebuffer
 cgthree0       at sbus? slot ? offset ?
diff -r dfa9edeedc31 -r 39d07bfae213 sys/arch/sparc/conf/files.sparc
--- a/sys/arch/sparc/conf/files.sparc   Wed Jul 28 05:37:54 1999 +0000
+++ b/sys/arch/sparc/conf/files.sparc   Wed Jul 28 05:45:50 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sparc,v 1.78 1999/06/30 15:18:58 drochner Exp $
+#      $NetBSD: files.sparc,v 1.79 1999/07/28 05:45:50 christos Exp $
 
 # @(#)files.sparc      8.1 (Berkeley) 7/19/93
 # sparc-specific configuration info
@@ -19,7 +19,7 @@
 attach obio at mainbus
 
 include "dev/vme/files.vme"
-device sparcvme: vmebus
+device sparcvme: vme
 attach sparcvme at mainbus with vme_mainbus
 attach sparcvme at iommu with vme_iommu