d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the generic "btintr" function's name to "bt_intr" - the same as

Browse Source 
all the other bt_XXX() functions in i386/scsi/bt*.

This the important effect of forcing a link error if the user is
still using the old "vector btintr" which is dangerously wrong
after Justin's updates to the driver.

The correct isa vector line for the bt driver is "vector bt_isa_intr".
Justin mentioned this in the commit message and updated LINT and
GENERIC.  This change is to enforce that.. :-)
This commit is contained in:
Peter Wemm 1995-12-14 14:19:19 +00:00
parent b030a30523
commit 60f17fcd9f
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/i386/eisa/bt74x.c
View File

@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id$
* $Id: bt74x.c,v 1.1 1995/12/12 08:47:11 gibbs Exp $
*/
#include "eisa.h"
@ -220,7 +220,7 @@ bt_eisa_attach(e_dev)
return -1;
}
if(eisa_reg_intr(e_dev, irq, btintr, (void *)bt, &bio_imask,
if(eisa_reg_intr(e_dev, irq, bt_intr, (void *)bt, &bio_imask,
/*shared ==*/level_intr)) {
bt_free(bt);
return -1;
@ -238,7 +238,7 @@ bt_eisa_attach(e_dev)
* if we can't intialize correctly, so its safe
* to release the irq.
*/
eisa_release_intr(e_dev, irq, btintr);
eisa_release_intr(e_dev, irq, bt_intr);
return -1;
}
@ -249,7 +249,7 @@ bt_eisa_attach(e_dev)
if(eisa_enable_intr(e_dev, irq)) {
bt_free(bt);
eisa_release_intr(e_dev, irq, btintr);
eisa_release_intr(e_dev, irq, bt_intr);
return -1;
}

4
sys/i386/isa/bt5xx-445.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.43 1995/11/04 17:07:08 bde Exp $
* $Id: bt5xx-445.c,v 1.1 1995/12/12 08:50:54 gibbs Exp $
*/
/*
@ -143,5 +143,5 @@ bt_isa_intr(unit)
int unit;
{
struct bt_data* arg = btdata[unit];
btintr((void *)arg);
bt_intr((void *)arg);
}

10
sys/i386/scsi/bt.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt.c,v 1.1 1995/12/12 08:57:21 gibbs Exp $
* $Id: bt.c,v 1.2 1995/12/13 14:32:59 bde Exp $
*/
/*
@ -538,7 +538,7 @@ bt_adapter_info(unit)
* Catch an interrupt from the adaptor
*/
void
btintr(arg)
bt_intr(arg)
void *arg;
{
BT_MBI *wmbi;
@ -552,7 +552,7 @@ btintr(arg)
bt = (struct bt_data *)arg;
#ifdef UTEST
printf("btintr ");
printf("bt_intr ");
#endif
/*
* First acknowlege the interrupt, Then if it's
@ -1429,7 +1429,7 @@ bt_poll(bt, xs, ccb)
*/
stat = inb(BT_INTR_PORT);
if (stat & BT_ANY_INTR) {
btintr((void *)bt);
bt_intr((void *)bt);
}
if (xs->flags & ITSDONE) {
break;
@ -1457,7 +1457,7 @@ bt_poll(bt, xs, ccb)
*/
stat = inb(BT_INTR_PORT);
if (stat & BT_ANY_INTR) {
btintr((void *)bt);
bt_intr((void *)bt);
}
if (xs->flags & ITSDONE) {
break;

4
sys/i386/scsi/btreg.h
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.43 1995/11/04 17:07:08 bde Exp $
* $Id: btreg.h,v 1.1 1995/12/12 08:57:22 gibbs Exp $
*/
#ifndef _BTREG_H_
@ -142,7 +142,7 @@ extern u_long bt_unit;
struct bt_data *bt_alloc __P((int unit, u_long iobase));
void bt_free __P((struct bt_data *bt));
void btintr __P((void *arg));
void bt_intr __P((void *arg));
int bt_init __P((struct bt_data *bt));
int bt_attach __P((struct bt_data *bt));

4
sys/pci/bt9xx.c
View File

@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: bt9xx.c,v 1.1 1995/12/12 08:58:04 gibbs Exp $
* $Id: bt9xx.c,v 1.2 1995/12/14 09:53:56 phk Exp $
*/
#include <pci.h>
@ -122,7 +122,7 @@ static int
bt_pci_intr(arg)
void *arg;
{
btintr(arg);
bt_intr(arg);
return (1); /*
* XXX: Always say we handle the interrupt.
* won't work with edge-triggered ints.