update from netbsd

1 files changed, 26 insertions, 30 deletions

diff --git a/sys/arch/vax/conf/mkoldconf.awk b/sys/arch/vax/conf/mkoldconf.awk
index 2212b4e2103..893e4eec395 100644
--- a/sys/arch/vax/conf/mkoldconf.awk
+++ b/sys/arch/vax/conf/mkoldconf.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: mkoldconf.awk,v 1.3 1995/03/29 22:50:51 ragge Exp $
+# $NetBSD: mkoldconf.awk,v 1.4 1995/12/16 15:05:03 ragge Exp $
 #
 
 /tmscd/{
@@ -9,24 +9,18 @@
 	ntms++;
 }
 
+/tscd/{
+	tsplats[nts]=$2;
+	tsaddr[nts]=$5;
+	nts++;
+}
+
 /racd/{
 	raplats[nra]=$2;
 	raaddr[nra]=$5;
 	nra++;
 }
 
-/decd/{
-	deplats[nde]=$2;
-	deaddr[nde]=$5;
-	nde++;
-}
-
-/qecd/{
-	qeplats[nqe]=$2;
-	qeaddr[nqe]=$5;
-	nqe++;
-}
-
 {
 	if(savenext==1){
 		l=sprintf("%d",$2)
@@ -42,6 +36,11 @@
 		tmsnummer[l-1]=ntmscp-1
 		tmssavenext=0;
 	}
+	if(tssavenext==1){
+		l=sprintf("%d",$2)
+		tsnummer[l-1]=nts-1
+		tssavenext=0;
+	}
 }
 
 /tmscpcd/{
@@ -100,20 +99,18 @@ printf "#include \"sys/map.h\"\n"
 printf "#include \"vax/uba/ubavar.h\"\n"
 
 printf "int antal_ra=%d;\n",nra-1
-printf "int antal_de=%d;\n",nde-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"
-printf "extern struct uba_driver dedriver;\n"
-printf "extern struct uba_driver qedriver;\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 "int tmscpintr();\n"
-printf "int deintr();\n"
-printf "int qeintr();\n"
-printf "int udaintr();\n"
-printf "int udacd=0, racd=0, tmscpcd=0, tmscd=0;\n"
+if(ntms) printf "void tmscpintr();\n"
+printf "void udaintr();\n"
+printf "int racd=0, tmscd=0;\n"
 printf "#define C (caddr_t)\n"
 
 printf "struct uba_ctlr ubminit[]={\n"
@@ -122,6 +119,11 @@ for(i=1;i<nuda;i++){
 	printf "	{ &udadriver, %d,0,0,udaintr,C %s},\n",
 		udaplats[i],loc[k+1]
 }
+for(i=1;i<nts;i++){
+	k=sprintf("%d",tsaddr[i])
+if(nts)printf "        { &tsdriver, %d,'?',0,tsintr,C %s},\n",
+	tsplats[i],loc[k+1]
+}
 for(i=1;i<ntmscp;i++){
 	k=sprintf("%d",tmscpaddr[i])
 if(ntms)printf "        { &tmscpdriver, %d,'?',0,tmscpintr,C %s},\n",
@@ -135,15 +137,9 @@ for(i=1;i<nra;i++){
 	printf "	{ &udadriver,%d,%d,0,%d,0,0,1,0},\n",raplats[i],
 		rr++/4,loc[k+1]
 }
-for(i=1;i<nde;i++){
-	k=sprintf("%d",deaddr[i])
-	printf "	{&dedriver,%d,-1,0,-1,deintr,C %s0,0},\n",deplats[i],
-		loc[k+1]
-}
-for(i=1;i<nqe;i++){
-	k=sprintf("%d",qeaddr[i])
-	printf "	{&qedriver,%d,-1,0,-1,qeintr,C %s0,0},\n",qeplats[i],
-		loc[k+1]
+for(i=1;i<nts;i++){
+	k=sprintf("%d",tsaddr[i])
+	printf "	{&tsdriver,%d,0,'?',0,0,C 0,1,0},\n",tsplats[i]
 }
 for(i=1;i<ntms;i++){
 	k=sprintf("%d",tmsaddr[i])