diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
| commit | a3b5edea3991a5af513f92dd86991d7b1a561a54 (patch) | |
| tree | f051a33605fa9c2bde1756be0816999893544828 /sys/arch/hp300/dev/scsi.c | |
| parent | a66e6c132dfc5477c6359bf03ab2bd43b9779756 (diff) | |
Sync with changes from NetBSD, up to 970705.
This includes all of the new frodo drivers, from Michael Smith, hacked up
by Jason R. Thorpe; other changes, mostly configuration and/or m68k
abstraction related, from Thorpe. A few others of my own.
This compiles and runs, have not yet tested Domain kbd or apci ports.
Diffstat (limited to 'sys/arch/hp300/dev/scsi.c')
| -rw-r--r-- | sys/arch/hp300/dev/scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c index 9197142c940..98bd898d591 100644 --- a/sys/arch/hp300/dev/scsi.c +++ b/sys/arch/hp300/dev/scsi.c @@ -1,5 +1,5 @@ -/* $OpenBSD: scsi.c,v 1.9 1997/07/02 12:21:46 downsj Exp $ */ -/* $NetBSD: scsi.c,v 1.19 1997/04/14 02:33:22 thorpej Exp $ */ +/* $OpenBSD: scsi.c,v 1.10 1997/07/06 08:01:55 downsj Exp $ */ +/* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */ /* * Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved. @@ -55,6 +55,7 @@ #include <machine/autoconf.h> #include <machine/cpu.h> #include <machine/intr.h> +#include <machine/hp300spu.h> #include <hp300/dev/dioreg.h> #include <hp300/dev/diovar.h> @@ -318,8 +319,7 @@ scsiattach(parent, self, aux) hs->sc_regs = hd; /* Establish the interrupt handler. */ - (void) intr_establish(scsiintr, hs, ipl, IPL_BIO); - dmacomputeipl(); + (void) dio_intr_establish(scsiintr, hs, ipl, IPL_BIO); /* Reset the controller. */ scsireset(unit); |