diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-24 17:26:26 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-24 17:26:26 +0000 |
| commit | 77fe2df75e23cea2c9d62e5b25a796c31a221234 (patch) | |
| tree | c1a0bcd07c4eba877c38dd63875dfffcb5535ac9 /sys/arch/amiga/dev/zssc.c | |
| parent | 6d636619d1bb24932306f0a341fa7ae66050828f (diff) | |
Use IPL_ constants instead of numeric values. Get rid of sicallbacks
in favour of the remapped IPL facility. Some argument type fixes as
well.
Diffstat (limited to 'sys/arch/amiga/dev/zssc.c')
| -rw-r--r-- | sys/arch/amiga/dev/zssc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amiga/dev/zssc.c b/sys/arch/amiga/dev/zssc.c index 36510a01ab1..16499b2790e 100644 --- a/sys/arch/amiga/dev/zssc.c +++ b/sys/arch/amiga/dev/zssc.c @@ -32,14 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)dma.c */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> +#include <machine/psl.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <amiga/amiga/custom.h> @@ -131,8 +130,7 @@ zsscattach(pdp, dp, auxp) sc->sc_isr.isr_arg = sc; sc->sc_isr.isr_ipl = 6; #if defined(IPL_REMAP_1) || defined(IPL_REMAP_2) - /* XXX Don't remap it yet, the driver uses a sicallback still. */ - sc->sc_isr.isr_mapped_ipl = 6; + sc->sc_isr.isr_mapped_ipl = IPL_BIO; #endif add_isr(&sc->sc_isr); @@ -191,7 +189,11 @@ zssc_dmaintr(sc) rp->siop_sien = 0; rp->siop_dien = 0; sc->sc_flags |= SIOP_INTDEFER | SIOP_INTSOFF; +#if defined(IPL_REMAP_1) || defined(IPL_REMAP_2) + siopintr(sc); +#else add_sicallback((sifunc_t)siopintr, sc, NULL); +#endif return(1); } |