summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2007-02-10 03:30:13 +0000
committertsutsui <tsutsui@NetBSD.org>2007-02-10 03:30:13 +0000
commitb501f9bf0793862dd683ff8ff32ec4e4b0ba6eb8 (patch)
treea1d706a0117b39a26f21415a8ae249853283431f /sys
parent8c2cbf1a115a5786ca7cb8ea8aa29d9867f4773a (diff)
Rename _IPL_SOFT* macro to SI_SOFT* to sync with other m68k ports.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hp300/hp300/softintr.c16
-rw-r--r--sys/arch/hp300/include/intr.h15
2 files changed, 16 insertions, 15 deletions
diff --git a/sys/arch/hp300/hp300/softintr.c b/sys/arch/hp300/hp300/softintr.c
index 728a60dc922..89e30842d7b 100644
--- a/sys/arch/hp300/hp300/softintr.c
+++ b/sys/arch/hp300/hp300/softintr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: softintr.c,v 1.10 2006/12/21 15:55:22 yamt Exp $ */
+/* $NetBSD: softintr.c,v 1.11 2007/02/10 03:30:13 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.10 2006/12/21 15:55:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.11 2007/02/10 03:30:13 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.10 2006/12/21 15:55:22 yamt Exp $");
struct hp300_soft_intrhand *softnet_intrhand;
volatile uint8_t ssir;
-static struct hp300_soft_intr hp300_soft_intrs[IPL_NSOFT];
+static struct hp300_soft_intr hp300_soft_intrs[SI_NQUEUES];
/*
* softintr_init()
@@ -71,7 +71,7 @@ static struct hp300_soft_intr hp300_soft_intrs[IPL_NSOFT];
void
softintr_init(void)
{
- static const char *softintr_names[] = IPL_SOFTNAMES;
+ static const char *softintr_names[] = SI_QUEUENAMES;
struct hp300_soft_intr *hsi;
int i;
@@ -136,16 +136,16 @@ ipl2si(ipl_t ipl)
switch (ipl) {
case IPL_SOFTNET:
- si = _IPL_SOFTNET;
+ si = SI_SOFTNET;
break;
case IPL_SOFTCLOCK:
- si = _IPL_SOFTCLOCK;
+ si = SI_SOFTCLOCK;
break;
case IPL_SOFTSERIAL:
- si = _IPL_SOFTSERIAL;
+ si = SI_SOFTSERIAL;
break;
default:
- si = _IPL_SOFT;
+ si = SI_SOFT;
break;
}
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 800e8adc593..439d03d33e3 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.16 2006/12/21 15:55:22 yamt Exp $ */
+/* $NetBSD: intr.h,v 1.17 2007/02/10 03:30:13 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -69,13 +69,14 @@
#define IPL_LOCK IPL_HIGH
#define NIPL 12
-#define _IPL_SOFTSERIAL 0 /* serial software interrupts */
-#define _IPL_SOFTNET 1 /* network software interrupts */
-#define _IPL_SOFTCLOCK 2 /* clock software interrupts */
-#define _IPL_SOFT 3 /* other software interrupts */
-#define IPL_NSOFT 4
+#define SI_SOFTSERIAL 0 /* serial software interrupts */
+#define SI_SOFTNET 1 /* network software interrupts */
+#define SI_SOFTCLOCK 2 /* clock software interrupts */
+#define SI_SOFT 3 /* other software interrupts */
-#define IPL_SOFTNAMES { \
+#define SI_NQUEUES 4
+
+#define SI_QUEUENAMES { \
"serial", \
"net", \
"clock", \