diff options
| author | se <se@FreeBSD.org> | 1996-01-23 21:48:28 +0000 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 1996-01-23 21:48:28 +0000 |
| commit | 9516aa2cafa23657dcba24410ae70f85a607f592 (patch) | |
| tree | 0c05d619dce00b4358e22aba692e8f11615d00c7 /sys/i386/scsi | |
| parent | 1d9e7dac5c0c9137300b85bf72dbd842b1e65eaa (diff) | |
| download | FreeBSD-src-9516aa2cafa23657dcba24410ae70f85a607f592.zip FreeBSD-src-9516aa2cafa23657dcba24410ae70f85a607f592.tar.gz | |
Make PCI interrupt handlers return void like everybody else does.
Reviewed by: davidg
Diffstat (limited to 'sys/i386/scsi')
| -rw-r--r-- | sys/i386/scsi/aic7xxx.c | 24 | ||||
| -rw-r--r-- | sys/i386/scsi/aic7xxx.h | 5 |
2 files changed, 10 insertions, 19 deletions
diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index 4f74956..2832197 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -24,7 +24,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aic7xxx.c,v 1.52 1996/01/05 16:13:44 gibbs Exp $ + * $Id: aic7xxx.c,v 1.53 1996/01/07 19:24:31 gibbs Exp $ */ /* * TODO: @@ -497,8 +497,8 @@ void ahc_add_waiting_scb (iobase, scb, where) /* * Catch an interrupt from the adaptor */ -int -ahcintr(arg) +void +ahc_intr(arg) void *arg; { int intstat; @@ -515,7 +515,7 @@ ahcintr(arg) * someone who is sharing my interrupt */ if (!(intstat & INT_PEND)) - return 0; + return; if (intstat & BRKADRINT) { /* We upset the sequencer :-( */ @@ -811,7 +811,7 @@ ahcintr(arg) */ outb(RETURN_1 + iobase, 0); if (!scb || !(scb->flags & SCB_ACTIVE)) { - printf("ahc%d:%c:%d: ahcintr - referenced scb " + printf("ahc%d:%c:%d: ahc_intr - referenced scb " "not valid during seqint 0x%x scb(%d)\n", ahc->unit, channel, target, intstat, scb_index); @@ -1012,7 +1012,7 @@ ahcintr(arg) outb(MSG_LEN + iobase, 1); } else - panic("ahcintr: AWAITING_MSG for an SCB that" + panic("ahc_intr: AWAITING_MSG for an SCB that" "does not have a waiting message"); break; } @@ -1052,7 +1052,7 @@ ahcintr(arg) #endif } else - panic("ahcintr: Immediate complete for " + panic("ahc_intr: Immediate complete for " "unknown operation."); break; } @@ -1092,7 +1092,7 @@ clear: scb = ahc->scbarray[scb_index]; if (!scb || !(scb->flags & SCB_ACTIVE)) { - printf("ahc%d: ahcintr - referenced scb not " + printf("ahc%d: ahc_intr - referenced scb not " "valid during scsiint 0x%x scb(%d)\n", ahc->unit, status, scb_index); outb(CLRSINT1 + iobase, status); @@ -1234,14 +1234,6 @@ cmdcomplete: } while (inb(QOUTCNT + iobase)); } - return 1; -} - -void -ahc_eisa_intr(arg) - void *arg; -{ - ahcintr(arg); } /* diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h index c5a36ec..9b3dc2e 100644 --- a/sys/i386/scsi/aic7xxx.h +++ b/sys/i386/scsi/aic7xxx.h @@ -20,7 +20,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: aic7xxx.h,v 1.17 1996/01/03 06:32:12 gibbs Exp $ + * $Id: aic7xxx.h,v 1.18 1996/01/07 19:24:33 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -206,7 +206,6 @@ struct ahc_data *ahc_alloc __P((int unit, u_long io_base, ahc_type type, ahc_fla void ahc_free __P((struct ahc_data *)); int ahc_init __P((struct ahc_data *)); int ahc_attach __P((struct ahc_data *)); -void ahc_eisa_intr __P((void *arg)); -int ahcintr __P((void *arg)); +void ahc_intr __P((void *arg)); #endif /* _AIC7XXX_H_ */ |
