[src/netbsd-1-5]: src/sys/dev/ic Pullup from trunk: 1.5

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

details:   https://anonhg.NetBSD.org/src/rev/981eb775c88d
branches:  netbsd-1-5
changeset: 488649:981eb775c88d
user:      scw <scw%NetBSD.org@localhost>
date:      Sat Jul 22 15:28:47 2000 +0000

description:
Pullup from trunk: 1.5
Approved by: thorpej

Make use of generic soft interrupts, when available.

diffstat:

 sys/dev/ic/clmpccvar.h |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 60ce916008f3 -r 981eb775c88d sys/dev/ic/clmpccvar.h
--- a/sys/dev/ic/clmpccvar.h    Sat Jul 22 15:28:19 2000 +0000
+++ b/sys/dev/ic/clmpccvar.h    Sat Jul 22 15:28:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clmpccvar.h,v 1.4 2000/03/19 10:38:43 scw Exp $ */
+/*     $NetBSD: clmpccvar.h,v 1.4.4.1 2000/07/22 15:28:47 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -115,8 +115,13 @@
 #define CLMPCC_BYTESWAP_LOW    0x00    /* *byteswap pin is low */
 #define CLMPCC_BYTESWAP_HIGH   0x03    /* *byteswap pin is high */
 
+#ifndef __GENERIC_SOFT_INTERRUPTS
        /* Called to request a soft interrupt callback to clmpcc_softintr */
        void            (*sc_softhook) __P((struct clmpcc_softc *));
+       volatile int    sc_soft_running;
+#else
+       void            *sc_softintr_cookie;
+#endif
 
        /* Called when an interrupt has to be acknowledged in polled mode. */
        void            (*sc_iackhook) __P((struct clmpcc_softc *, int));
@@ -124,7 +129,6 @@
        /*
         * No user-serviceable parts below
         */
-       volatile int    sc_soft_running;
        struct clmpcc_chan sc_chans[CLMPCC_NUM_CHANS];
 };