Merge of NetBSD changes upto last week or so, with the exception of stand/

5 files changed, 162 insertions, 113 deletions

diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index fdd37d80573..73e3b99b287 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,4 +1,4 @@
-#	$OpenBSD: DRACO,v 1.9 1997/03/25 16:53:58 niklas Exp $
+#	$OpenBSD: DRACO,v 1.10 1997/09/18 13:39:38 niklas Exp $
 #	$NetBSD: DRACO,v 1.7 1996/12/20 19:18:16 veego Exp $
 
 #
@@ -135,11 +135,14 @@ mfcs1		at mfc0 unit 1		# MFC serial
 #mfcs3		at mfc1 unit 1
 #mfcp1		at mfc1 unit 0
 
-le0		at zbus0		# Lance ethernet.
+drbbc0		at mainbus0		# DraCo battery backed clock
+drsupio0	at mainbus0		# DraCo superio chip
+com*		at drsupio? port ?	# DraCo serial
+
+le*		at zbus0		# Lance ethernet.
 ed0		at zbus0		# dp8390 ethernet
 es0		at zbus0		# SMC 91C90 ethernet
 qn0		at zbus0		# quicknet ethernet
-ae0		at zbus0		# Ariadne ethernet
 bah*		at zbus0		# C= arcnet
 
 
@@ -160,5 +163,6 @@ pseudo-device	pty 16			# pseudo terminals
 pseudo-device	loop			# network loopback
 pseudo-device	bpfilter 2		# berkeley packet filters
 pseudo-device	tun 2
+pseudo-device	ppp 2
 
 config	bsd swap on generic
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 95ef1b75362..323ee03d096 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.20 1997/03/25 16:53:56 niklas Exp $
-#	$NetBSD: GENERIC,v 1.69 1997/01/17 14:29:42 is Exp $
+#	$OpenBSD: GENERIC,v 1.21 1997/09/18 13:39:39 niklas Exp $
+#	$NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $
 
 #
 # GENERIC AMIGA
@@ -16,17 +16,24 @@ maxusers	8
 # mainboards to support (in addition to Amiga)
 #
 option		DRACO
+option	 	BB060STUPIDROM	# You need this, if you have a non-DraCo
+				# 68060 with an OS ROM up to (at least) 
+				# V40 (OS3.1) and want to boot with the
+				# bootblock.
+				# You don't need this if you have a DraCo,
+				# have no 68060 or NEVER use the bootblock
 
 #
 # processors this kernel should support
 #
-option		"M68060"	# support for 060
-option		"M060SP"	# ...and MC68060 support package
-option		"M68040"	# support for 040
+option		M68060		# support for 060
+option		M060SP		# ...and MC68060 support package
+option		M68040		# support for 040
 option		FPSP		# MC68040 floating point support
-option		"M68030"	# support for 030
-option		"M68020"	# support for 020/851
+option		M68030		# support for 030
+option		M68020		# support for 020/851
 option		FPCOPROC	# Support for MC6888[12] (Required)
+option		FPU_EMULATE	# FPU emulation
 
 #
 # File systems
@@ -135,13 +142,23 @@ mfcs1		at mfc0 unit 1		# MFC serial
 #mfcs3		at mfc1 unit 1
 #mfcp1		at mfc1 unit 0
 
-le0		at zbus0		# Lance ethernet.
+drbbc0		at mainbus0		# DraCo battery backed clock
+drsupio0	at mainbus0		# DraCo superio chip
+com*		at drsupio? port ?	# DraCo serial
+
+a2kbbc0 	at mainbus0		# A2000 battery backed clock
+a34kbbc0	at mainbus0		# A3000/A4000 battery backed clock
+#aucc*		at mainbus0		# Amiga CC audio
+#audio*		at aucc?
+
+# Ethernet cards
+le*		at zbus0		# Lance ethernet.
 ed0		at zbus0		# dp8390 ethernet
 es0		at zbus0		# SMC 91C90 ethernet
 qn0		at zbus0		# quicknet ethernet
-ae0		at zbus0		# Ariadne ethernet
-bah0		at zbus0		# C= arcnet
 
+# Arcnet
+bah*		at zbus0		# C= arcnet
 
 # scsi stuff, all possible
 gvpbus*		at zbus0
@@ -155,13 +172,13 @@ otgsc0		at zbus0		# 12 gauge scsi
 zssc0		at zbus0		# Zeus scsi
 mgnsc0		at zbus0		# Magnum scsi
 wesc0		at zbus0		# Warp Engine scsi
-idesc0		at mainbus0		# A4000 & A1200 IDE
 afsc0		at zbus0		# A4091 scsi
 aftsc0		at mainbus0		# A4000T scsi
 flsc0		at zbus0		# FastlaneZ3 scsi
 bzsc0		at zbus0		# Blizzard 1230 I,II scsi
 bztzsc0		at zbus0		# Blizzard 2060 scsi
 empsc0		at zbus0		# Emplant scsi
+idesc0		at mainbus0		# A4000 & A1200 IDE
 drsc0		at mainbus0		# DraCo scsi
 
 scsibus*	at gtsc0
@@ -174,13 +191,13 @@ scsibus*	at otgsc0
 scsibus*	at zssc0
 scsibus*	at mgnsc0
 scsibus*	at wesc0
-scsibus*	at idesc0
 scsibus*	at afsc0
 scsibus*	at aftsc0
 scsibus*	at flsc0
 scsibus*	at bzsc0
 scsibus*	at bztzsc0
 scsibus*	at empsc0
+scsibus*	at idesc0
 scsibus*	at drsc0
 
 # each hard drive from low target to high
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index a67b578207f..9a48571df12 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.amiga,v 1.21 1997/09/15 02:40:25 deraadt Exp $
-#	$NetBSD: Makefile.amiga,v 1.52 1996/12/01 12:10:07 veego Exp $
+#	$OpenBSD: Makefile.amiga,v 1.22 1997/09/18 13:39:39 niklas Exp $
+#	$NetBSD: Makefile.amiga,v 1.60 1997/07/23 10:19:42 is Exp $
 
 # Makefile for OpenBSD
 #
@@ -35,8 +35,8 @@ S!=	cd ../../../..; pwd
 .endif
 AMIGA=	$S/arch/amiga
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Damiga
+INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmc68020 -Damiga
 
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format
@@ -83,13 +83,7 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
 .SUFFIXES: .o .g
 
@@ -128,17 +122,17 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${AMIGA}/amiga/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${AMIGA}/amiga/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+assym.h: ${AMIGA}/amiga/genassym.cf $S/kern/genassym.sh
+	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    < ${AMIGA}/amiga/genassym.cf > assym.h.tmp && \
+	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -148,9 +142,10 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 
-clean::
+clean:: cleankernel
+cleankernel:
 	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
-	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
+	    [Ee]rrs linterrs makelinks assym.h
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
@@ -162,11 +157,10 @@ tags:
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	    sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
+	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	    sort -u | comm -23 - dontlink | \
-	    sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' \
-	    > makelinks
+	  sort -u | comm -23 - dontlink | \
+	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 SRCS=	${AMIGA}/amiga/locore.s \
@@ -177,6 +171,10 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
+	  ${CPPFLAGS} < ${AMIGA}/amiga/genassym.cf
+	@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
+	@rm -f assym.dep
 
 # depend on root or device configuration
 autoconf.o conf.o: Makefile
@@ -185,7 +183,7 @@ autoconf.o conf.o: Makefile
 uipc_proto.o vfs_conf.o: Makefile 
 
 # depend on maxusers
-assym.h machdep.o: Makefile
+machdep.o: Makefile
 
 # depend on CPU configuration 
 amiga_init.o locore.o pmap.o sys_machdep.o bzsc.o flsc.o sbic.o sfas.o: Makefile
diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK
index b52bad2548f..5576e390593 100644
--- a/sys/arch/amiga/conf/RAMDISK
+++ b/sys/arch/amiga/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.2 1997/05/18 13:18:27 niklas Exp $
+#	$OpenBSD: RAMDISK,v 1.3 1997/09/18 13:39:40 niklas Exp $
 
 #
 # A ramdisk kernel
@@ -24,6 +24,7 @@ option		FPSP		# MC68040 floating point support
 option		"M68030"	# support for 030
 option		"M68020"	# support for 020/851
 option		FPCOPROC	# Support for MC6888[12] (Required)
+option		FPU_EMULATE	# FPU emulation
 
 #
 # File systems
@@ -141,7 +142,6 @@ le0		at zbus0		# Lance ethernet.
 ed0		at zbus0		# dp8390 ethernet
 es0		at zbus0		# SMC 91C90 ethernet
 qn0		at zbus0		# quicknet ethernet
-ae0		at zbus0		# Ariadne ethernet
 bah0		at zbus0		# C= arcnet
 
 
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 80995864d7c..e05fec2244e 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,8 +1,9 @@
-#	$OpenBSD: files.amiga,v 1.21 1997/05/13 16:07:23 niklas Exp $
-#	$NetBSD: files.amiga,v 1.51 1996/12/16 16:17:31 is Exp $
+#	$OpenBSD: files.amiga,v 1.22 1997/09/18 13:39:40 niklas Exp $
+#	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
+
 
 # maxpartitions must be first item in files.${ARCH}
-maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
+maxpartitions 16
 
 maxusers 2 8 64
 
@@ -23,6 +24,17 @@ file	arch/amiga/dev/event.c		event
 device	clock
 attach	clock at mainbus
 file	arch/amiga/dev/clock.c
+file	dev/clock_subr.c
+
+# A2000 internal hwc
+device	a2kbbc
+attach	a2kbbc at mainbus
+file	arch/amiga/dev/a2kbbc.c		a2kbbc
+
+# A3000/4000 internal hwc
+device	a34kbbc
+attach	a34kbbc at mainbus
+file	arch/amiga/dev/a34kbbc.c	a34kbbc
 
 # keyboard
 device	kbd: event
@@ -39,11 +51,17 @@ device	par
 attach	par at mainbus
 file	arch/amiga/dev/par.c		par needs-count
 
+# audio
+device aucc: audio
+attach aucc at mainbus
+file   arch/amiga/dev/aucc.c		aucc needs-flag 
+
 # mouse
 device	ms: event
 attach	ms at mainbus
 file	arch/amiga/dev/ms.c		ms needs-flag
 
+# floppy
 device	fdc { unit = -1 }
 attach	fdc at mainbus
 
@@ -66,7 +84,7 @@ file	arch/amiga/dev/kf_8x8.c		ite
 file	arch/amiga/dev/kf_8x11.c	kfont_8x11
 file	arch/amiga/dev/kf_custom.c	kfont_custom
 
-# custom chips grf
+# custom chips grf (ite0 grf0)
 device	grfcc: grfbus
 attach	grfcc at mainbus
 file	arch/amiga/dev/grf_cc.c		grfcc needs-flag
@@ -83,52 +101,49 @@ file	arch/amiga/dev/grfabs.c		grfcc | view
 file	arch/amiga/dev/grfabs_cc.c	grfcc | view
 file	arch/amiga/dev/grfabs_ccglb.c	grfcc | view
 
-# retina grf
+# retina ZII grf (ite1 grf1)
 device	grfrt: grfbus
 attach	grfrt at zbus
 file	arch/amiga/dev/grf_rt.c		grfrt needs-flag
 file	arch/amiga/dev/ite_rt.c		grfrt & ite
 
-# cirrus grf
+# retina ZIII grf (it2 grf2)
+device	grfrh: grfbus
+attach	grfrh at zbus
+file	arch/amiga/dev/grf_rh.c		grfrh needs-flag
+file	arch/amiga/dev/ite_rh.c		grfrh & ite
+
+# cirrus grf (ite3 grf3)
 device	grfcl: grfbus
 attach	grfcl at zbus
 file	arch/amiga/dev/grf_cl.c		grfcl needs-flag
 file	arch/amiga/dev/ite_cl.c		grfcl & ite
 
-# CyberVison 64 grf
-device	grfcv: grfbus
-attach	grfcv at zbus
-file	arch/amiga/dev/grf_cv.c		grfcv needs-flag
-file	arch/amiga/dev/ite_cv.c		grfcv & ite
-
-# A2410 grf
+# A2410 grf (ite4 grf4)
 device	grful: grfbus
 attach	grful at zbus
 file	arch/amiga/dev/grf_ul.c		grful needs-flag
 file	arch/amiga/dev/ite_ul.c		grful & ite
 file	arch/amiga/dev/grf_ultms.g	grful
 
-# retina ZIII grf
-device	grfrh: grfbus
-attach	grfrh at zbus
-file	arch/amiga/dev/grf_rh.c		grfrh needs-flag
-file	arch/amiga/dev/ite_rh.c		grfrh & ite
+# CyberVison 64 grf (ite5 grf5)
+device	grfcv: grfbus
+attach	grfcv at zbus
+file	arch/amiga/dev/grf_cv.c		grfcv needs-flag
+file	arch/amiga/dev/ite_cv.c		grfcv & ite
 
-# Tseng grf
+# Tseng grf (ite6 grf6)
 device	grfet: grfbus
 attach	grfet at zbus
 file	arch/amiga/dev/grf_et.c		grfet needs-flag
 file	arch/amiga/dev/ite_et.c		grfet & ite
 
-# handle gvp's odd autoconf info..
-device	gvpbus {}
-attach	gvpbus at zbus
-file	arch/amiga/dev/gvpbus.c		gvpbus
-
 # device defined in sys/conf/files
+# A2065, Ameristar, Ariadne ethernet cards
 attach	le at zbus with le_zbus
 file	arch/amiga/dev/if_le.c		le_zbus needs-flag
 
+# Hydra ethernet card
 device	ed:	ifnet, ether
 attach	ed at zbus with ed_zbus
 file	arch/amiga/dev/if_ed.c		ed_zbus needs-flag
@@ -138,18 +153,16 @@ device	bah: ifnet, arc
 attach	bah at zbus with bah_zbus
 file	arch/amiga/dev/if_bah.c		bah_zbus needs-flag
 
+# CEI A4066 EthernetPLUS
 device	es:	ifnet, ether
 attach	es at zbus
 file	arch/amiga/dev/if_es.c		es needs-flag
 
+# Quicknet ethernet card
 device	qn:	ifnet, ether
 attach	qn at zbus
 file	arch/amiga/dev/if_qn.c		qn needs-flag
 
-device	ae:	ifnet, ether
-attach	ae at zbus
-file	arch/amiga/dev/if_ae.c		ae needs-count
-
 # A2232 msc serial ports
 device	msc:	tty
 attach	msc at zbus
@@ -165,22 +178,24 @@ device	mfcp
 attach	mfcp at mfc
 file	arch/amiga/dev/mfc.c		mfcs | mfcp needs-count
 
-# DraCo internal com port
-device	drcom: tty
-attach	drcom at mainbus
-file	arch/amiga/dev/drcom.c		drcom needs-count
-  
+# DraCo superio chip
+define	supio {port = -1}
+
+device	drsupio: supio
+attach	drsupio at mainbus
+file	arch/amiga/dev/drsupio.c	drsupio
+
 include "../../../scsi/files.scsi"
 
+# handle gvp's odd autoconf info..
+device	gvpbus {}
+attach	gvpbus at zbus
+file	arch/amiga/dev/gvpbus.c		gvpbus
+
 # wd 33c93 controllers
 define	sbic 
 file	arch/amiga/dev/sbic.c		sbic
 
-# C= A2091
-device atzsc: scsi, sbic
-attach atzsc at zbus
-file	arch/amiga/dev/atzsc.c		atzsc needs-flag
-
 # GVP series II
 device	gtsc: scsi, sbic
 attach	gtsc at gvpbus
@@ -191,6 +206,35 @@ device	ahsc: scsi, sbic
 attach	ahsc at mainbus
 file	arch/amiga/dev/ahsc.c		ahsc needs-flag
 
+# C= A2091
+device atzsc: scsi, sbic
+attach atzsc at zbus
+file	arch/amiga/dev/atzsc.c		atzsc needs-flag
+
+# ncr 5380 controllers
+define	sci
+file	arch/amiga/dev/sci.c		sci
+
+# Supra Wordsync II
+device	wstsc: scsi, sci
+attach	wstsc at zbus
+file	arch/amiga/dev/wstsc.c		wstsc needs-flag
+
+# IVS 
+device	ivsc: scsi, sci
+attach	ivsc at zbus
+file	arch/amiga/dev/ivsc.c		ivsc needs-flag
+
+# MLH
+device	mlhsc: scsi, sci
+attach	mlhsc at zbus
+file	arch/amiga/dev/mlhsc.c		mlhsc needs-flag
+
+# CSA twelve gauge.
+device	otgsc: scsi, sci
+attach	otgsc at zbus
+file	arch/amiga/dev/otgsc.c		otgsc needs-flag
+
 # ncr 57c710 controllers
 define	siop
 file	arch/amiga/dev/siop.c		siop
@@ -205,17 +249,11 @@ device	mgnsc: scsi, siop
 attach	mgnsc at zbus
 file	arch/amiga/dev/mgnsc.c		mgnsc needs-flag
 
-# MacroSystems Warp Engine
+# MacroSystems USA Warp Engine
 device	wesc: scsi, siop
 attach	wesc at zbus
 file	arch/amiga/dev/wesc.c		wesc needs-flag
 
-
-# MacroSystem DraCo internal
-device	drsc: scsi, siop
-attach	drsc at mainbus
-file  arch/amiga/dev/drsc.c           drsc needs-flag
-
 # C= A4091
 device	afsc: scsi, siop
 attach	afsc at zbus
@@ -223,35 +261,6 @@ device	aftsc: scsi, siop
 attach	aftsc at mainbus
 file	arch/amiga/dev/afsc.c		afsc | aftsc needs-flag
 
-# ncr 5380 controllers
-define	sci
-file	arch/amiga/dev/sci.c		sci
-
-# Supra Wordsync II
-device	wstsc: scsi, sci
-attach	wstsc at zbus
-file	arch/amiga/dev/wstsc.c		wstsc needs-flag
-
-# IVS 
-device	ivsc: scsi, sci
-attach	ivsc at zbus
-file	arch/amiga/dev/ivsc.c		ivsc needs-flag
-
-# CSA twelve gauge.
-device	otgsc: scsi, sci
-attach	otgsc at zbus
-file	arch/amiga/dev/otgsc.c		otgsc needs-flag
-
-# MLH
-device	mlhsc: scsi, sci
-attach	mlhsc at zbus
-file	arch/amiga/dev/mlhsc.c		mlhsc needs-flag
-
-# EMPLANT
-device	empsc: scsi, sci
-attach	empsc at zbus
-file	arch/amiga/dev/empsc.c		empsc needs-flag
-
 # Emulex ESP216 & FAS216 controllers
 define	sfas
 file	arch/amiga/dev/sfas.c		sfas
@@ -271,11 +280,26 @@ device	bztzsc: scsi, sfas
 attach	bztzsc at zbus
 file	arch/amiga/dev/bztzsc.c		bztzsc needs-flag
 
+# EMPLANT
+device	empsc: scsi, sci
+attach	empsc at zbus
+file	arch/amiga/dev/empsc.c		empsc needs-flag
+
 # Amiga 4000/1200 IDE masquerading as SCSI
 device	idesc: scsi
 attach	idesc at mainbus
 file	arch/amiga/dev/idesc.c		idesc needs-flag
 
+# MacroSystem DraCo internal
+device	drsc: scsi, siop
+attach	drsc at mainbus
+file  arch/amiga/dev/drsc.c           drsc needs-flag
+
+# MacroSystem DraCo internal DS2404 hwc
+device	drbbc
+attach	drbbc at mainbus
+file	arch/amiga/dev/drbbc.c		drbbc
+
 #
 # Machine-independent ATAPI drivers
 #
@@ -310,7 +334,13 @@ device	isaed: ifnet, ether
 attach	isaed at isa with isaed_isa
 file	arch/amiga/isa/if_isaed.c	isaed & isaed_isa needs-flag
 
+# DraCo serial port
+attach	com at supio with com_supio
+file	arch/amiga/dev/com_supio.c	com_supio
+  
 # list of standard files...
+include	"arch/m68k/fpe/files.fpe"
+
 file	dev/cons.c			ite | ser
 file	dev/cninit.c			ite | ser
 file	arch/amiga/amiga/amiga_init.c