Mostly sync to NetBSD-current 970804.

GENERIC currently compiles and runs; some devices (isp) are not complete and
not yet enabled.

1 files changed, 47 insertions, 16 deletions

diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 15dd29e1559..2615ba65760 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,5 @@
-#	$NetBSD: files.sparc,v 1.23 1996/05/21 19:06:26 pk Exp $
+#	$OpenBSD: files.sparc,v 1.12 1997/08/08 08:24:35 downsj Exp $
+#	$NetBSD: files.sparc,v 1.40 1997/07/07 21:53:43 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
 # sparc-specific configuration info
@@ -13,15 +14,19 @@ attach mainbus at root
 
 device obio { [addr = -1], [level = -1] }
 attach obio at mainbus
+
+device iommu {}
+attach iommu at mainbus
+file	arch/sparc/sparc/iommu.c		iommu
+
+device vme {}
+attach vme at iommu
+
 device vmel { [addr = -1], [level = -1], [vect = -1] }
-attach vmel at mainbus
+attach vmel at mainbus, vme
 device vmes { [addr = -1], [level = -1], [vect = -1] }
-attach vmes at mainbus
-file	arch/sparc/dev/obio.c		obio | vmel | vmes
-
-device audio
-attach audio at mainbus, obio
-file	arch/sparc/dev/amd7930.c		audio
+attach vmes at mainbus, vme
+file	arch/sparc/dev/obio.c		obio | vmel | vmes | vme
 
 device auxreg
 attach auxreg at mainbus, obio
@@ -63,10 +68,6 @@ attach fd at fdc
 file	arch/sparc/dev/fd.c			fdc | fd needs-flag
 file	arch/sparc/sparc/bsd_fdintr.s		fdc
 
-device iommu {}
-attach iommu at mainbus
-file	arch/sparc/sparc/iommu.c		iommu
-
 device sbus { slot = -1, offset = -1 }
 attach sbus at mainbus, iommu
 file	arch/sparc/dev/sbus.c			sbus
@@ -92,11 +93,19 @@ attach dma at sbus, obio
 device ledma {}
 attach ledma at sbus
 file	arch/sparc/dev/dma.c		dma | ledma
+device lebuffer {}
+attach lebuffer at sbus
+file	arch/sparc/dev/lebuffer.c	lebuffer
 
-device esp: scsi
+device esp: scsi, ncr53c9x
 attach esp at sbus, dma, obio
 file	arch/sparc/dev/esp.c		esp
 
+device audio
+attach audio at mainbus, obio, sbus
+file	arch/sparc/dev/amd7930.c	audio
+file	arch/sparc/sparc/amd7930intr.s	audio
+
 # Brooktree DAC attribute
 define bt_dac
 
@@ -124,10 +133,18 @@ device cgeight: bt_dac
 attach cgeight at obio
 file	arch/sparc/dev/cgeight.c	cgeight needs-flag
 
+device tcx: bt_dac
+attach tcx at sbus
+file	arch/sparc/dev/tcx.c		tcx needs-flag
+
+device cgfourteen
+attach cgfourteen at obio
+file	arch/sparc/dev/cgfourteen.c	cgfourteen needs-flag
+
 file	arch/sparc/dev/bt_subr.c	bt_dac
 
 # device definition in sys/conf/files
-attach le at sbus, ledma, obio
+attach le at sbus, ledma, lebuffer, obio
 file	arch/sparc/dev/if_le.c		le
 
 device ie: ifnet, ether
@@ -154,10 +171,24 @@ device sw: scsi, ncr5380sbc
 attach sw at obio
 file	arch/sparc/dev/si.c		si | sw
 
+# Efficient Networks, Inc. ATM interface
+# device declaration in sys/conf/files
+#attach	en at sbus with en_sbus
+#file	arch/sparc/dev/if_en_sbus.c	en_sbus
+
+# Qlogic ISP 10x0 (Sbus) family
+# device declaration in sys/conf/files
+#attach isp at sbus with isp_sbus
+#file	arch/sparc/dev/isp_sbus.c	isp_sbus
+
 pseudo-device	kbd
 
+#
+# Generic Sun stuff
+#
+include "../../../dev/sun/files.sun"
+
 file	arch/sparc/dev/cons.c
-file	arch/sparc/dev/event.c
 file	arch/sparc/dev/fb.c
 file	arch/sparc/dev/ms.c
 file	arch/sparc/dev/kbd.c		kbd
@@ -175,9 +206,9 @@ file	arch/sparc/fpu/fpu_subr.c
 # N.B.: optimizer breaks pmap.c and/or cache.c somehow -- have not
 # identified the exact problem yet.  NOOPT_C suffices for now.
 file	arch/sparc/sparc/autoconf.c
-file	arch/sparc/sparc/amd7930intr.s	audio
 file	arch/sparc/sparc/cache.c
 file	arch/sparc/sparc/conf.c
+file	arch/sparc/sparc/emul.c
 file	arch/sparc/sparc/in_cksum.c
 file	arch/sparc/sparc/intr.c
 file	arch/sparc/sparc/kgdb_stub.c