diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/pmax/conf/Makefile.pmax | 4 | ||||
| -rw-r--r-- | sys/arch/pmax/tc/if_le.c | 14 | ||||
| -rw-r--r-- | sys/arch/vax/conf/mkoldconf.awk | 56 |
3 files changed, 32 insertions, 42 deletions
diff --git a/sys/arch/pmax/conf/Makefile.pmax b/sys/arch/pmax/conf/Makefile.pmax index 834a013b9dc..ab80ee3a362 100644 --- a/sys/arch/pmax/conf/Makefile.pmax +++ b/sys/arch/pmax/conf/Makefile.pmax @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.pmax,v 1.17 1995/11/25 05:55:38 mellon Exp $ +# $NetBSD: Makefile.pmax,v 1.18 1995/12/17 09:09:42 jonathan Exp $ # @(#)Makefile.pmax 8.2 (Berkeley) 2/16/94 # @@ -56,7 +56,7 @@ LIBCOMPAT= ${COMPATLIB_PROF} TARGET_MACHINE = pmax TARGET_ARCH = mips -.if (${MACHINE_ARCH} != pmax) +.if (${MACHINE} != pmax) CC= /usr/local/mips-dec-netbsd/bin/gcc LD= /usr/local/mips-dec-netbsd/bin/ld AS= /usr/local/mips-dec-netbsd/bin/as diff --git a/sys/arch/pmax/tc/if_le.c b/sys/arch/pmax/tc/if_le.c index 544abb001c6..fdb7536506d 100644 --- a/sys/arch/pmax/tc/if_le.c +++ b/sys/arch/pmax/tc/if_le.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.3 1995/11/25 01:23:51 cgd Exp $ */ +/* $NetBSD: if_le.c,v 1.4 1995/12/17 04:46:00 jonathan Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -77,7 +77,6 @@ extern u_long asic_base; #include <pmax/tc/tc.h> #include <pmax/pmax/asic.h> #include <pmax/tc/if_levar.h> -#define LEINTR_UNIT 1 /* pmax interrupts take a unit as arg */ #else /* Alpha */ typedef u_int64 word_t; @@ -116,11 +115,8 @@ extern caddr_t le_iomem; int lematch __P((struct device *, void *, void *)); void leattach __P((struct device *, struct device *, void *)); -#ifdef LEINTR_UNIT -int leintr __P((int unit)); -#else int leintr __P((void *sc)); -#endif + struct cfdriver lecd = { NULL, "le", lematch, leattach, DV_IFNET, sizeof (struct le_softc) @@ -275,11 +271,9 @@ leattach(parent, self, aux) sc->sc_arpcom.ac_if.if_name = lecd.cd_name; leconfig(sc); -#ifdef LEINTR_UNIT - BUS_INTR_ESTABLISH(ca, leintr, self->dv_unit); -#else + BUS_INTR_ESTABLISH(ca, leintr, sc); -#endif + if (SYSTEM_HAS_ASIC()) { /* XXX YEECH!!! */ *(volatile u_int *)ASIC_REG_IMSK(asic_base) |= ASIC_INTR_LANCE; 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]) |