[src/trunk]: src/sys/arch/vax More files that were changed.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72b0eebb8f22
branches:  trunk
changeset: 481169:72b0eebb8f22
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jan 24 02:54:01 2000 +0000

description:
More files that were changed.

diffstat:

 sys/arch/vax/boot/boot/autoconf.c |   5 +++--
 sys/arch/vax/conf/files.vax       |   4 +---
 sys/arch/vax/if/if_le_vsbus.c     |  13 +++----------
 sys/arch/vax/if/if_ze.c           |  14 ++------------
 4 files changed, 9 insertions(+), 27 deletions(-)

diffs (131 lines):

diff -r 2d11a3bf9504 -r 72b0eebb8f22 sys/arch/vax/boot/boot/autoconf.c
--- a/sys/arch/vax/boot/boot/autoconf.c Mon Jan 24 02:47:51 2000 +0000
+++ b/sys/arch/vax/boot/boot/autoconf.c Mon Jan 24 02:54:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.5 1999/08/23 19:09:27 ragge Exp $ */
+/*     $NetBSD: autoconf.c,v 1.6 2000/01/24 02:54:01 matt Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -174,6 +174,7 @@
 void scb_stray(), rtimer();
 struct ivec_dsp **scb;
 struct ivec_dsp *scb_vec;
+extern struct ivec_dsp idsptch;
 
 /*
  * Init the SCB and set up a handler for all vectors in the lower space,
@@ -198,7 +199,7 @@
        for (i = 0; i < 128; i++) {
                scb[i] = &scb_vec[i];
                (int)scb[i] |= 1;       /* Only interrupt stack */
-               memcpy(&scb_vec[i], &idsptch, sizeof(struct ivec_dsp));
+               scb_vec[i] = idsptch;
                scb_vec[i].hoppaddr = scb_stray;
        }
        scb_vec[0xc0/4].hoppaddr = rtimer;
diff -r 2d11a3bf9504 -r 72b0eebb8f22 sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Mon Jan 24 02:47:51 2000 +0000
+++ b/sys/arch/vax/conf/files.vax       Mon Jan 24 02:54:01 2000 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.62 2000/01/17 04:55:28 matt Exp $
+#       $NetBSD: files.vax,v 1.63 2000/01/24 02:54:02 matt Exp $
 #
 # new style config file for vax architecture
 #
@@ -16,8 +16,6 @@
 device mem
 device mba { drive = -1 }
 
-#defopt        opt_newintr.h   NEWIDSPTCH
-
 defopt VAX780                          # VAX-11/780 & 785
 defopt VAX750                          # VAX-11/750
 defopt VAX730                          # VAX-11/730
diff -r 2d11a3bf9504 -r 72b0eebb8f22 sys/arch/vax/if/if_le_vsbus.c
--- a/sys/arch/vax/if/if_le_vsbus.c     Mon Jan 24 02:47:51 2000 +0000
+++ b/sys/arch/vax/if/if_le_vsbus.c     Mon Jan 24 02:54:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_vsbus.c,v 1.2 1999/08/27 20:05:08 ragge Exp $    */
+/*     $NetBSD: if_le_vsbus.c,v 1.3 2000/01/24 02:54:03 matt Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -97,6 +97,7 @@
 
 #include <machine/cpu.h>
 #include <machine/sid.h>
+#include <machine/scb.h>
 #include <machine/bus.h>
 #include <machine/rpb.h>
 #include <machine/vsbus.h>
@@ -118,7 +119,6 @@
 void   le_vsbus_attach __P((struct device *, struct device *, void *));
 static void    lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t));
 static u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t));
-static void    leintr __P((int));
 
 struct cfattach le_vsbus_ca = {
        sizeof(struct le_softc), le_vsbus_match, le_vsbus_attach
@@ -168,7 +168,6 @@
 
        /* Wait for initialization to finish. */
        DELAY(100000);
-       va->va_ivec = leintr;
 
        /* Should have interrupted by now */
        if (*rdp & LE_C0_IDON)
@@ -200,6 +199,7 @@
        sc->sc_am7990.lsc.sc_wrcsr = lewrcsr;
        sc->sc_am7990.lsc.sc_nocarrier = NULL;
 
+       scb_vecalloc(va->va_cvec, (void (*)(void *)) am7990_intr, sc, SCB_ISTACK);
         /*
          * Allocate a (DMA-safe) block for all descriptors and buffers.
          */
@@ -249,10 +249,3 @@
        if (B_TYPE(bootdev) == BDEV_LE)
                booted_from = self;
 }
-
-void
-leintr(unit)
-       int unit;
-{
-       am7990_intr(le_cd.cd_devs[unit]);
-}
diff -r 2d11a3bf9504 -r 72b0eebb8f22 sys/arch/vax/if/if_ze.c
--- a/sys/arch/vax/if/if_ze.c   Mon Jan 24 02:47:51 2000 +0000
+++ b/sys/arch/vax/if/if_ze.c   Mon Jan 24 02:54:01 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_ze.c,v 1.2 1999/08/27 20:05:08 ragge Exp $ */
+/*      $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -65,7 +65,6 @@
 
 static int     zematch __P((struct device *, struct cfdata *, void *));
 static void    zeattach __P((struct device *, struct device *, void *));
-static void    zeintr __P((int));
 
 struct cfattach ze_ibus_ca = {
        sizeof(struct ze_softc), zematch, zeattach
@@ -121,16 +120,7 @@
                sc->sc_enaddr[i] = (ea[i] >> 8) & 0377;
        vax_unmap_physmem((vaddr_t)ea, 1);
 
-       scb_vecalloc(SGECVEC, zeintr, sc->sc_dev.dv_unit, SCB_ISTACK);
+       scb_vecalloc(SGECVEC, (void (*)(void *)) sgec_intr, sc, SCB_ISTACK);
 
        sgec_attach(sc);
 }
-
-void
-zeintr(unit)
-       int     unit;
-{
-       struct ze_softc *sc = ze_cd.cd_devs[unit];
-
-       sgec_intr(sc);
-}