Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arc Make all intr_mask value types uint32_t rather ...
details: https://anonhg.NetBSD.org/src/rev/09d6545b9917
branches: trunk
changeset: 573216:09d6545b9917
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Jan 22 08:43:02 2005 +0000
description:
Make all intr_mask value types uint32_t rather than int, u_int,
or unsigned etc.
diffstat:
sys/arch/arc/arc/arc_trap.c | 17 +++++++++--------
sys/arch/arc/arc/c_magnum.c | 16 +++++++---------
sys/arch/arc/arc/c_nec_jazz.c | 16 +++++++---------
sys/arch/arc/dti/tyneisabr.c | 6 +++---
sys/arch/arc/include/intr.h | 5 +++--
sys/arch/arc/include/platform.h | 11 +++++++----
sys/arch/arc/isa/arcsisabr.c | 6 +++---
sys/arch/arc/isa/isabrvar.h | 6 ++----
sys/arch/arc/isa/isabus.c | 10 +++++-----
sys/arch/arc/jazz/jazzio.c | 10 +++++-----
sys/arch/arc/jazz/jazzisabr.c | 6 +++---
sys/arch/arc/jazz/timer_jazziovar.h | 6 +++---
sys/arch/arc/pci/necpb.c | 10 +++++-----
13 files changed, 62 insertions(+), 63 deletions(-)
diffs (truncated from 450 to 300 lines):
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/arc/arc_trap.c
--- a/sys/arch/arc/arc/arc_trap.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/arc/arc_trap.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
#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 @@
* 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)
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/arc/c_magnum.c
--- a/sys/arch/arc/arc/c_magnum.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/arc/c_magnum.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
#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 @@
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 @@
*/
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);
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/arc/c_nec_jazz.c
--- a/sys/arch/arc/arc/c_nec_jazz.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/arc/c_nec_jazz.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
#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 @@
};
/* 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 @@
};
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);
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/dti/tyneisabr.c
--- a/sys/arch/arc/dti/tyneisabr.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/dti/tyneisabr.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
/* 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);
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/include/intr.h
--- a/sys/arch/arc/include/intr.h Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/include/intr.h Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
#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 */
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/include/platform.h
--- a/sys/arch/arc/include/platform.h Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/include/platform.h Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
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 @@
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[];
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/isa/arcsisabr.c
--- a/sys/arch/arc/isa/arcsisabr.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/isa/arcsisabr.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
/* 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);
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/isa/isabrvar.h
--- a/sys/arch/arc/isa/isabrvar.h Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/isa/isabrvar.h Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
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 *);
diff -r 38fe832c8cec -r 09d6545b9917 sys/arch/arc/isa/isabus.c
--- a/sys/arch/arc/isa/isabus.c Sat Jan 22 07:56:28 2005 +0000
+++ b/sys/arch/arc/isa/isabus.c Sat Jan 22 08:43:02 2005 +0000
@@ -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 @@
*/
Home |
Main Index |
Thread Index |
Old Index