[src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup from trunk: 1.4

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

details:   https://anonhg.NetBSD.org/src/rev/25e5d719fefa
branches:  netbsd-1-5
changeset: 488652:25e5d719fefa
user:      scw <scw%NetBSD.org@localhost>
date:      Sat Jul 22 15:48:06 2000 +0000

description:
Pullup from trunk: 1.4
Approved by: thorpej

Implement generic soft interrupts for mvme68k.

diffstat:

 sys/arch/mvme68k/dev/clmpcc_pcctwo.c |  18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diffs (62 lines):

diff -r b187468e0930 -r 25e5d719fefa sys/arch/mvme68k/dev/clmpcc_pcctwo.c
--- a/sys/arch/mvme68k/dev/clmpcc_pcctwo.c      Sat Jul 22 15:47:40 2000 +0000
+++ b/sys/arch/mvme68k/dev/clmpcc_pcctwo.c      Sat Jul 22 15:48:06 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clmpcc_pcctwo.c,v 1.3 2000/03/18 22:33:02 scw Exp $ */
+/*     $NetBSD: clmpcc_pcctwo.c,v 1.3.4.1 2000/07/22 15:48:06 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -56,6 +56,7 @@
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
+#include <machine/intr.h>
 
 #include <dev/ic/clmpccvar.h>
 
@@ -68,11 +69,8 @@
 int clmpcc_pcctwo_match __P((struct device *, struct cfdata *, void *));
 void clmpcc_pcctwo_attach __P((struct device *, struct device *, void *));
 void clmpcc_pcctwo_iackhook __P((struct clmpcc_softc *, int));
-void clmpcc_pcctwo_softhook __P((struct clmpcc_softc *));
 void clmpcc_pcctwo_consiackhook __P((struct clmpcc_softc *, int));
 
-static u_long clmpcc_pcctwo_sir;
-
 struct cfattach clmpcc_pcctwo_ca = {
        sizeof(struct clmpcc_softc), clmpcc_pcctwo_match, clmpcc_pcctwo_attach
 };
@@ -129,7 +127,6 @@
        sc->sc_byteswap = CLMPCC_BYTESWAP_LOW;
        sc->sc_swaprtsdtr = 1;
        sc->sc_iackhook = clmpcc_pcctwo_iackhook;
-       sc->sc_softhook = clmpcc_pcctwo_softhook;
        sc->sc_vector_base = PCCTWO_SCC_VECBASE;
        sc->sc_rpilr = 0x03;
        sc->sc_tpilr = 0x02;
@@ -138,9 +135,6 @@
        /* Do common parts of CD2401 configuration. */
        clmpcc_attach(sc);
 
-       /* Allocate a software interrupt cookie */
-       clmpcc_pcctwo_sir = allocate_sir(clmpcc_softintr, sc);
-
        /* Hook the interrupts */
        pcctwointr_establish(PCCTWOV_SCC_RX, clmpcc_rxintr, level, sc);
        pcctwointr_establish(PCCTWOV_SCC_RX_EXCEP, clmpcc_rxintr, level, sc);
@@ -155,14 +149,6 @@
 }
 
 void
-clmpcc_pcctwo_softhook(sc)
-       struct clmpcc_softc *sc;
-{
-
-       setsoftint(clmpcc_pcctwo_sir);
-}
-
-void
 clmpcc_pcctwo_iackhook(sc, which)
        struct clmpcc_softc *sc;
        int which;