Make all intr_mask value types uint32_t rather than int, u_int,

or unsigned etc.
This commit is contained in:
tsutsui 2005-01-22 08:43:02 +00:00
parent a510ad6a78
commit 7310abde32
13 changed files with 62 additions and 63 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: arc_trap.c,v 1.28 2005/01/22 07:35:33 tsutsui Exp $ */
/* $NetBSD: arc_trap.c,v 1.29 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */
/*
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arc_trap.c,v 1.28 2005/01/22 07:35:33 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: arc_trap.c,v 1.29 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -95,18 +95,18 @@ __KERNEL_RCSID(0, "$NetBSD: arc_trap.c,v 1.28 2005/01/22 07:35:33 tsutsui Exp $"
#include <arc/jazz/pica.h>
#include <arc/jazz/rd94.h>
int arc_hardware_intr(uint32_t, uint32_t, uint32_t, uint32_t);
uint32_t arc_hardware_intr(uint32_t, uint32_t, uint32_t, uint32_t);
#define MIPS_INT_LEVELS 8
struct {
int int_mask;
int (*int_hand)(u_int, struct clockframe *);
uint32_t int_mask;
uint32_t (*int_hand)(uint32_t, struct clockframe *);
} cpu_int_tab[MIPS_INT_LEVELS];
int cpu_int_mask; /* External cpu interrupt mask */
uint32_t cpu_int_mask; /* External cpu interrupt mask */
int
uint32_t
arc_hardware_intr(uint32_t status, uint32_t cause, uint32_t pc,
uint32_t ipending)
{
@ -137,7 +137,8 @@ arc_hardware_intr(uint32_t status, uint32_t cause, uint32_t pc,
* Events are checked in priority order.
*/
void
arc_set_intr(int mask, int (*int_hand)(u_int, struct clockframe *), int prio)
arc_set_intr(uint32_t mask, uint32_t (*int_hand)(uint32_t, struct clockframe *),
int prio)
{
if (prio > MIPS_INT_LEVELS)

View File

@ -1,4 +1,4 @@
/* $NetBSD: c_magnum.c,v 1.8 2005/01/22 07:56:28 tsutsui Exp $ */
/* $NetBSD: c_magnum.c,v 1.9 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v 1.8 2005/01/22 07:56:28 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v 1.9 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -101,13 +101,11 @@ __KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v 1.8 2005/01/22 07:56:28 tsutsui Exp $")
#include <arc/jazz/timer_jazziovar.h>
#include <arc/isa/isabrvar.h>
extern int cpu_int_mask;
/*
* chipset-dependent timer routine.
*/
int timer_magnum_intr(u_int, struct clockframe *);
uint32_t timer_magnum_intr(uint32_t, struct clockframe *);
void timer_magnum_init(int);
struct timer_jazzio_config timer_magnum_conf = {
@ -164,8 +162,8 @@ static const uint32_t magnum_ipl_sr_bits[_IPL_N] = {
MIPS_INT_MASK_5, /* IPL_{CLOCK,HIGH} */
};
int
timer_magnum_intr(u_int mask, struct clockframe *cf)
uint32_t
timer_magnum_intr(uint32_t mask, struct clockframe *cf)
{
int temp;
@ -233,8 +231,8 @@ jazzio_magnum_set_iointr_mask(int mask)
*/
void
c_magnum_set_intr(int mask, int (*int_hand)(u_int, struct clockframe *),
int prio)
c_magnum_set_intr(uint32_t mask,
uint32_t (*int_hand)(uint32_t, struct clockframe *), int prio)
{
arc_set_intr(mask, int_hand, prio);

View File

@ -1,4 +1,4 @@
/* $NetBSD: c_nec_jazz.c,v 1.7 2005/01/22 07:35:33 tsutsui Exp $ */
/* $NetBSD: c_nec_jazz.c,v 1.8 2005/01/22 08:43:02 tsutsui Exp $ */
/*-
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: c_nec_jazz.c,v 1.7 2005/01/22 07:35:33 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: c_nec_jazz.c,v 1.8 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,13 +47,11 @@ __KERNEL_RCSID(0, "$NetBSD: c_nec_jazz.c,v 1.7 2005/01/22 07:35:33 tsutsui Exp $
#include <arc/jazz/jazziovar.h>
#include <arc/jazz/timer_jazziovar.h>
extern int cpu_int_mask;
/*
* chipset-dependent timer routine.
*/
int timer_nec_jazz_intr(u_int, struct clockframe *);
uint32_t timer_nec_jazz_intr(uint32_t, struct clockframe *);
void timer_nec_jazz_init(int);
struct timer_jazzio_config timer_nec_jazz_conf = {
@ -63,8 +61,8 @@ struct timer_jazzio_config timer_nec_jazz_conf = {
};
/* handle jazzio bus clock interrupt */
int
timer_nec_jazz_intr(u_int mask, struct clockframe *cf)
uint32_t
timer_nec_jazz_intr(uint32_t mask, struct clockframe *cf)
{
int temp;
@ -111,8 +109,8 @@ struct pica_dev nec_rd94_cpu[] = {
};
void
c_nec_jazz_set_intr(int mask, int (*int_hand)(u_int, struct clockframe *),
int prio)
c_nec_jazz_set_intr(uint32_t mask,
uint32_t (*int_hand)(uint32_t, struct clockframe *), int prio)
{
arc_set_intr(mask, int_hand, prio);

View File

@ -1,4 +1,4 @@
/* $NetBSD: tyneisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: tyneisabr.c,v 1.7 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,v 1.7 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $"
/* Definition of the driver for autoconfig. */
int tyneisabrmatch(struct device *, struct cfdata *, void *);
void tyneisabrattach(struct device *, struct device *, void *);
int tyneisabr_iointr(unsigned mask, struct clockframe *cf);
uint32_t tyneisabr_iointr(uint32_t mask, struct clockframe *cf);
CFATTACH_DECL(tyneisabr, sizeof(struct isabr_softc),
tyneisabrmatch, tyneisabrattach, NULL, NULL);

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.12 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.13 2005/01/22 08:43:02 tsutsui Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -114,7 +114,8 @@ extern void _clrsoftintr(int);
#include <mips/softintr.h>
struct clockframe;
void arc_set_intr(int, int(*)(u_int, struct clockframe *), int);
void arc_set_intr(uint32_t, uint32_t (*)(uint32_t, struct clockframe *), int);
extern uint32_t cpu_int_mask;
#endif /* !_LOCORE */
#endif /* _KERNEL */

View File

@ -1,4 +1,4 @@
/* $NetBSD: platform.h,v 1.4 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: platform.h,v 1.5 2005/01/22 08:43:02 tsutsui Exp $ */
/* NetBSD: cpuconf.h,v 1.12 2000/06/08 03:10:06 thorpej Exp */
/*
@ -51,7 +51,8 @@ struct platform {
void (*init)(void);
void (*cons_init)(void);
void (*reset)(void);
void (*set_intr)(int, int (*)(u_int, struct clockframe *), int);
void (*set_intr)(uint32_t,
uint32_t (*)(uint32_t, struct clockframe *), int);
};
int ident_platform(void);
@ -86,13 +87,15 @@ extern char *c_jazz_eisa_mainbusdevs[];
void c_jazz_eisa_init(void);
void c_jazz_eisa_cons_init(void);
void c_magnum_set_intr(int, int (*)(u_int, struct clockframe *), int);
void c_magnum_set_intr(uint32_t, uint32_t (*)(uint32_t, struct clockframe *),
int);
void c_magnum_init(void);
void c_nec_eisa_init(void);
void c_nec_eisa_cons_init(void);
void c_nec_jazz_set_intr(int, int (*)(u_int, struct clockframe *), int);
void c_nec_jazz_set_intr(uint32_t, uint32_t (*)(uint32_t, struct clockframe *),
int);
void c_nec_jazz_init(void);
extern char *c_nec_pci_mainbusdevs[];

View File

@ -1,4 +1,4 @@
/* $NetBSD: arcsisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: arcsisabr.c,v 1.7 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,v 1.7 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,v 1.6 2005/01/22 07:35:34 tsutsui Exp $"
/* Definition of the driver for autoconfig. */
int arcsisabrmatch(struct device *, struct cfdata *, void *);
void arcsisabrattach(struct device *, struct device *, void *);
int arcsisabr_iointr(unsigned mask, struct clockframe *cf);
uint32_t arcsisabr_iointr(uint32_t mask, struct clockframe *cf);
CFATTACH_DECL(arcsisabr, sizeof(struct isabr_softc),
arcsisabrmatch, arcsisabrattach, NULL, NULL);

View File

@ -1,4 +1,4 @@
/* $NetBSD: isabrvar.h,v 1.2 2003/08/07 16:26:50 agc Exp $ */
/* $NetBSD: isabrvar.h,v 1.3 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -90,6 +90,4 @@ struct isabr_config {
extern struct isabr_config *isabr_conf;
void isabrattach(struct isabr_softc *);
int isabr_iointr(unsigned, struct clockframe *);
uint32_t isabr_iointr(uint32_t, struct clockframe *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: isabus.c,v 1.27 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: isabus.c,v 1.28 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.27 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.28 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -165,7 +165,7 @@ const struct evcnt *isabr_intr_evcnt(isa_chipset_tag_t, int);
void *isabr_intr_establish(isa_chipset_tag_t, int, int, int,
int (*)(void *), void *);
void isabr_intr_disestablish(isa_chipset_tag_t, void*);
int isabr_iointr(unsigned int, struct clockframe *);
uint32_t isabr_iointr(uint32_t, struct clockframe *);
void isabr_initicu(void);
void intr_calculatemasks(void);
int fakeintr(void *a);
@ -405,8 +405,8 @@ isabr_intr_disestablish(isa_chipset_tag_t ic, void *arg)
/*
* Process an interrupt from the ISA bus.
*/
int
isabr_iointr(unsigned mask, struct clockframe *cf)
uint32_t
isabr_iointr(uint32_t mask, struct clockframe *cf)
{
struct intrhand *ih;
int isa_vector;

View File

@ -1,4 +1,4 @@
/* $NetBSD: jazzio.c,v 1.13 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: jazzio.c,v 1.14 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.13 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.14 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -69,7 +69,7 @@ extern struct cfdriver jazzio_cd;
void jazzio_intr_establish(int, int (*)(void *), void *);
void jazzio_intr_disestablish(int);
int jazzio_intr(unsigned, struct clockframe *);
uint32_t jazzio_intr(uint32_t, struct clockframe *);
int jazzio_no_handler(void *);
/*
@ -215,8 +215,8 @@ jazzio_no_handler(void *arg)
/*
* Handle jazz i/o interrupt.
*/
int
jazzio_intr(unsigned mask, struct clockframe *cf)
uint32_t
jazzio_intr(uint32_t mask, struct clockframe *cf)
{
unsigned int vector;
struct jazzio_intrhand *jirp;

View File

@ -1,4 +1,4 @@
/* $NetBSD: jazzisabr.c,v 1.7 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: jazzisabr.c,v 1.8 2005/01/22 08:43:02 tsutsui Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,v 1.7 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,v 1.8 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,v 1.7 2005/01/22 07:35:34 tsutsui Exp $"
/* Definition of the driver for autoconfig. */
int jazzisabrmatch(struct device *, struct cfdata *, void *);
void jazzisabrattach(struct device *, struct device *, void *);
int jazzisabr_iointr(unsigned mask, struct clockframe *cf);
uint32_t jazzisabr_iointr(uint32_t, struct clockframe *);
CFATTACH_DECL(jazzisabr, sizeof(struct isabr_softc),
jazzisabrmatch, jazzisabrattach, NULL, NULL);

View File

@ -1,4 +1,4 @@
/* $NetBSD: timer_jazziovar.h,v 1.2 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: timer_jazziovar.h,v 1.3 2005/01/22 08:43:02 tsutsui Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,8 +37,8 @@
*/
struct timer_jazzio_config {
int tjc_intr_mask;
int (*tjc_intr)(u_int, struct clockframe *);
uint32_t tjc_intr_mask;
uint32_t (*tjc_intr)(uint32_t, struct clockframe *);
void (*tjc_init)(int);
};

View File

@ -1,4 +1,4 @@
/* $NetBSD: necpb.c,v 1.19 2005/01/22 07:35:34 tsutsui Exp $ */
/* $NetBSD: necpb.c,v 1.20 2005/01/22 08:43:02 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.19 2005/01/22 07:35:34 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.20 2005/01/22 08:43:02 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -113,7 +113,7 @@ void * necpb_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*func)(void *), void *);
void necpb_intr_disestablish(pci_chipset_tag_t, void *);
int necpb_intr(unsigned, struct clockframe *);
uint32_t necpb_intr(uint32_t, struct clockframe *);
CFATTACH_DECL(necpb, sizeof(struct necpb_softc),
@ -433,8 +433,8 @@ necpb_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
/*
* Handle PCI/EISA interrupt.
*/
int
necpb_intr(unsigned mask, struct clockframe *cf)
uint32_t
necpb_intr(uint32_t mask, struct clockframe *cf)
{
uint32_t vector, stat;
struct necpb_intrhand *p;