diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-01-12 15:13:47 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-01-12 15:13:47 +0000 |
| commit | e661b0e07a7f4c778ac8e9b5eb341a7ad9795c2b (patch) | |
| tree | 6158c02b8e503faa614ccff77b3cca01e9b912e4 /sys/arch/hp300/dev/scsi.c | |
| parent | d470dc6647ff9a7e3f6d00b205d12ab7428cc092 (diff) | |
Mostly sync to NetBSD-current of 011196. Compiles, links, boots to single
user.
KNOWN NOT WORKING:
* DIO-II devices
* Dynamic executables
NOT EVEN TRIED:
* New config support
Diffstat (limited to 'sys/arch/hp300/dev/scsi.c')
| -rw-r--r-- | sys/arch/hp300/dev/scsi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c index 942e4a51fe6..ba9d7c0f1a8 100644 --- a/sys/arch/hp300/dev/scsi.c +++ b/sys/arch/hp300/dev/scsi.c @@ -1,4 +1,5 @@ -/* $NetBSD: scsi.c,v 1.10 1996/05/18 23:57:03 thorpej Exp $ */ +/* $OpenBSD: scsi.c,v 1.5 1997/01/12 15:13:01 downsj Exp $ */ +/* $NetBSD: scsi.c,v 1.13 1996/12/09 03:16:26 thorpej Exp $ */ /* * Copyright (c) 1990, 1993 @@ -68,7 +69,6 @@ #define SCSI_DATA_WAIT 10000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 50000 /* wait per step (both) during init */ -extern void isrlink(); extern void _insque(); extern void _remque(); @@ -262,7 +262,8 @@ scsiattach(hc) hs->sc_sq.dq_forw = hs->sc_sq.dq_back = &hs->sc_sq; /* Establish the interrupt handler. */ - isrlink(scsiintr, hs, hc->hp_ipl, ISRPRI_BIO); + (void) isrlink(scsiintr, hs, hc->hp_ipl, ISRPRI_BIO); + dmacomputeipl(); /* Reset the controller. */ scsireset(hc->hp_unit); |