From f85a693859748124e01cfb081f10ef11e0a3d1cb Mon Sep 17 00:00:00 2001 From: ragge Date: Mon, 1 Jul 1996 21:07:25 +0000 Subject: [PATCH] Update to match new MSCP device handling. Remove support for old config system. --- sys/arch/vax/conf/GENERIC | 32 ++++--- sys/arch/vax/conf/Makefile.vax | 13 +-- sys/arch/vax/conf/files.vax | 40 ++++----- sys/arch/vax/conf/mkoldconf.awk | 151 -------------------------------- 4 files changed, 37 insertions(+), 199 deletions(-) delete mode 100644 sys/arch/vax/conf/mkoldconf.awk diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index f312a953f2fb..1dba23889d57 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.13 1996/05/19 16:25:23 ragge Exp $ +# $NetBSD: GENERIC,v 1.14 1996/07/01 21:07:29 ragge Exp $ # # GENERIC VAX configuration file; all supported devices. # @@ -79,34 +79,32 @@ mba* at sbi? tr? # Massbus adapters hp* at mba? drive? # RM/RP disk drives # Disk controllers at Unibus -uda0 at uba? csr 0172150 -ra0 at uda0 drive 0 -ra1 at uda0 drive 1 -ra2 at uda0 drive 2 -ra3 at uda0 drive 3 - +uda0 at uba? csr 0172150 # UDA50/RQDX? uda1 at uba? csr 0160334 -ra4 at uda1 drive 0 -ra5 at uda1 drive 1 -ra6 at uda1 drive 2 -ra7 at uda1 drive 3 +mscpbus* at uda? + +# Tape drivers +#mtc0 at uba? csr 0174500 # TMSCP ctlr +#mscpbus* at mtc? + +# MSCP devices +ra* at mscpbus? drive? # MSCP disk +#mt* at mscpbus? drive? # MSCP tape + +# Unibus tapes +#ts0 at uba? csr 0172520 # TS11/TSV05 tape. # Ethernet cards de0 at uba? csr 0174510 # DELUA/DEUNA qe0 at uba? csr 0174440 # DEQNA/DELQA -# Tape drivers -tmscp0 at uba? csr 0174500 # TMSCP ctlr -tms0 at tmscp0 drive ? # TMSCP tape -ts0 at uba? csr 0172520 # TS11/TSV05 tape. - # Terminal lines dhu0 at uba? csr 0160440 # DHU-11 dz0 at uba? csr 0160100 # DZ-11 pseudo-device loop 1 pseudo-device pty 48 -pseudo-device bpfilter 8 +pseudo-device bpfilter 8 # Not supported by de or qe yet. pseudo-device sl 2 pseudo-device ppp 2 pseudo-device tun 2 diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index d0f04a78a8f0..e85a3bc84c47 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.vax,v 1.21 1996/05/11 16:13:17 mycroft Exp $ +# $NetBSD: Makefile.vax,v 1.22 1996/07/01 21:07:28 ragge Exp $ # Makefile for NetBSD # @@ -80,7 +80,7 @@ NORMAL_S_C= ${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= intvec.o subr.o lim.o \ +SYSTEM_OBJ= intvec.o subr.o \ param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ @@ -136,12 +136,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${VAX}/vax/intvec.s ${VAX}/vax/subr.s lim.c \ +SRCS= ${VAX}/vax/intvec.s ${VAX}/vax/subr.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} param.c mkdep ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s - mkdep -a ${CFLAGS} ${CPPFLAGS} lim.c mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -166,10 +165,4 @@ intvec.o: ${VAX}/vax/intvec.s subr.o: ${VAX}/vax/subr.s ${NORMAL_S} -lim.c: ioconf.c - ../../conf/mkoldconf.awk < ioconf.c > lim.c - -lim.o: lim.c - ${NORMAL_C_C} - %RULES diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index b9176eabbd55..d0d7cc379a8e 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.19 1996/05/19 16:25:29 ragge Exp $ +# $NetBSD: files.vax,v 1.20 1996/07/01 21:07:26 ragge Exp $ # # new style config file for vax architecture # @@ -13,12 +13,14 @@ attach backplane at root device sbi { tr=-1 } attach sbi at backplane + device bi { node=-1 } attach bi at backplane device cpu attach cpu at backplane with cpu_backplane attach cpu at bi with cpu_bi + device mem attach mem at backplane with mem_backplane attach mem at bi with mem_bi @@ -40,30 +42,27 @@ device ht attach ht at mba file arch/vax/mba/ht.c ht needs-flag +# MSCP device drivers +include "../mscp/files.mscp" +major {ra = 9} +major {mt = 16} + device uba { csr } attach uba at sbi, bi file arch/vax/uba/uba.c uba -device uda { drive=-1 } +device uda: mscp attach uda at uba -file arch/vax/uba/uda.c uda needs-count +file arch/vax/uba/uda.c uda + +device mtc: mscp +attach mtc at uba +file arch/vax/uba/mtc.c mtc device de:ifnet, ether attach de at uba file arch/vax/if/if_de.c de -device ra: disk -attach ra at uda -file arch/vax/vax/mscp.c ra needs-count -major {ra = 9} - -# TK50/TU81 at UBA -device tmscp {drive = -1} -attach tmscp at uba -device tms -attach tms at tmscp -file arch/vax/uba/tmscp.c tmscp needs-count - # DEQNA/DELQA used on Qbus device qe:ifnet, ether attach qe at uba @@ -88,6 +87,11 @@ file arch/vax/uba/dz.c dz needs-count # They are just included here to make some files happy ;) # +# KDB50 on BI +device kdb: mscp +attach kdb at bi +file arch/vax/bi/kdb.c kdb + # Ikonas framebuffer device ik attach ik at uba @@ -112,12 +116,6 @@ device mu attach mu at mba file arch/vax/mba/mt.c mu needs-count -# KDB50 on BI -device kdb { drive=-1 } -attach kdb at bi -file arch/vax/bi/kdb.c kdb needs-count - - # DMF32 on UBA device dmf attach dmf at uba diff --git a/sys/arch/vax/conf/mkoldconf.awk b/sys/arch/vax/conf/mkoldconf.awk deleted file mode 100644 index 81b2cb1e0d7f..000000000000 --- a/sys/arch/vax/conf/mkoldconf.awk +++ /dev/null @@ -1,151 +0,0 @@ -#!/usr/bin/awk -f -# -# $NetBSD: mkoldconf.awk,v 1.7 1996/03/17 22:56:31 ragge Exp $ -# - -/tms_cd/{ - tmsplats[ntms]=$3; - tmsaddr[ntms]=$6; - ntms++; -} - -/ts_cd/{ - tsplats[nts]=$3; - tsaddr[nts]=$6; - nts++; -} - -/ra_cd/{ - raplats[nra]=$3; - raaddr[nra]=$6; - nra++; -} - -{ - if(savenext==1){ - l=sprintf("%d",$3) - udanummer[l-1]=nuda-1 - savenext=0; - } -} - - -{ - if(tmssavenext==1){ - l=sprintf("%d",$3) - tmsnummer[l-1]=ntmscp-1 - tmssavenext=0; - } - if(tssavenext==1){ - l=sprintf("%d",$3) - tsnummer[l-1]=nts-1 - tssavenext=0; - } -} - -/tmscp_cd/{ - tmscpplats[ntmscp]=$3; - tmscpaddr[ntmscp]=$6; - ntmscp++; - tmssavenext=1; -} - -/uda_cd/{ - udaplats[nuda]=$3; - udaddr[nuda]=$6; - nuda++; - savenext=1; -} - - -/};/{ - k=0; - m=0; -} - -{ - if (k==1){ - for(i=1;i\n" -printf "#include \n" -printf "#include \n" -printf "#include \n" - -printf "#include \n" - -printf "int antal_ra=%d;\n",nra-1 -printf "int antal_uda=%d;\n",nuda-1 -printf "int antal_ts=%d;\n",nts-1 -printf "int antal_tms=%d;\n",ntms-1 -printf "int antal_tmscp=%d;\n",ntmscp-1 - -printf "extern struct uba_driver udadriver;\n" -if(nts) printf "extern struct uba_driver tsdriver;\n" -if(nts) printf "void tsintr();\n" -if(ntms) printf "extern struct uba_driver tmscpdriver;\n" -if(ntms) printf "void tmscpintr();\n" -printf "void udaintr();\n" -printf "int ra_cd=0, ra_ca=0, tms_cd=0, tms_ca=0;\n" -printf "#define C (caddr_t)\n" - -printf "struct uba_ctlr ubminit[]={\n" -for(i=1;i