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

BEWARE: Interface change of register_intr() !

Browse Source 
Changed the fifth parameter to register_intr() from u_int mask into
u_int *maskptr in preparation for new features (shared interrupts and
removable devices, eg. for PCMCIA).
This commit is contained in:
Stefan Eßer 1994-10-25 23:06:16 +00:00
parent 9e4cb8b6dc
commit b56fdd903a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.31 1994/10/19 21:57:51 bde Exp $
* $Id: isa.c,v 1.32 1994/10/23 21:27:26 wollman Exp $
*/
/*
@ -476,7 +476,7 @@ config_isadev_c(isdp, mp, reconfig)
INTRMASK(*mp, isdp->id_irq);
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
isdp->id_ri_flags, isdp->id_intr,
mp ? *mp : 0, isdp->id_unit);
mp, isdp->id_unit);
INTREN(isdp->id_irq);
}
} else {
@ -929,17 +929,18 @@ isa_irq_pending(dvp)
}
int
register_intr(intr, device_id, flags, handler, mask, unit)
register_intr(intr, device_id, flags, handler, maskptr, unit)
int intr;
int device_id;
u_int flags;
inthand2_t *handler;
u_int mask;
u_int *maskptr;
int unit;
{
char *cp;
u_long ef;
int id;
u_int mask = (maskptr ? *maskptr : 0);
if ((u_int)intr >= ICU_LEN || intr == 2
|| (u_int)device_id >= NR_DEVICES)

9
sys/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.31 1994/10/19 21:57:51 bde Exp $
* $Id: isa.c,v 1.32 1994/10/23 21:27:26 wollman Exp $
*/
/*
@ -476,7 +476,7 @@ config_isadev_c(isdp, mp, reconfig)
INTRMASK(*mp, isdp->id_irq);
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
isdp->id_ri_flags, isdp->id_intr,
mp ? *mp : 0, isdp->id_unit);
mp, isdp->id_unit);
INTREN(isdp->id_irq);
}
} else {
@ -929,17 +929,18 @@ isa_irq_pending(dvp)
}
int
register_intr(intr, device_id, flags, handler, mask, unit)
register_intr(intr, device_id, flags, handler, maskptr, unit)
int intr;
int device_id;
u_int flags;
inthand2_t *handler;
u_int mask;
u_int *maskptr;
int unit;
{
char *cp;
u_long ef;
int id;
u_int mask = (maskptr ? *maskptr : 0);
if ((u_int)intr >= ICU_LEN || intr == 2
|| (u_int)device_id >= NR_DEVICES)

4
sys/i386/isa/isa_device.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91
* $Id: isa_device.h,v 1.14 1994/10/19 01:59:07 wollman Exp $
* $Id: isa_device.h,v 1.15 1994/10/23 21:27:27 wollman Exp $
*/
#ifndef _I386_ISA_ISA_DEVICE_H_
@ -132,7 +132,7 @@ void isa_dmastart __P((int, caddr_t, unsigned, unsigned));
int isa_irq_pending __P((struct isa_device *dvp));
int isa_nmi __P((int cd));
int register_intr __P((int intr, int device_id, u_int flags,
inthand2_t *handler, u_int mask, int unit));
inthand2_t *handler, u_int *maskptr, int unit));
int unregister_intr __P((int intr, inthand2_t *handler));
extern int isa_externalize(struct isa_device *, void *, size_t *);