Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch implement splraiseipl() for the following ports.
details: https://anonhg.NetBSD.org/src/rev/f70ddcea4511
branches: trunk
changeset: 586780:f70ddcea4511
user: yamt <yamt%NetBSD.org@localhost>
date: Sun Jan 01 14:24:33 2006 +0000
description:
implement splraiseipl() for the following ports.
evbarm, iyonix, cats, netwinder, acorn26
reviewed by Bill Studenmund.
diffstat:
sys/arch/acorn26/include/intr.h | 5 ++++-
sys/arch/arm/footbridge/footbridge_intr.h | 22 ++++++----------------
sys/arch/evbarm/include/intr.h | 19 +++++--------------
sys/arch/iyonix/include/intr.h | 19 +++++--------------
4 files changed, 20 insertions(+), 45 deletions(-)
diffs (168 lines):
diff -r 03be23e48041 -r f70ddcea4511 sys/arch/acorn26/include/intr.h
--- a/sys/arch/acorn26/include/intr.h Sun Jan 01 12:12:43 2006 +0000
+++ b/sys/arch/acorn26/include/intr.h Sun Jan 01 14:24:33 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2005/12/11 12:16:04 christos Exp $ */
+/* $NetBSD: intr.h,v 1.6 2006/01/01 14:24:33 yamt Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -56,6 +56,7 @@
#define IPL_STATCLOCK 10
#define IPL_SCHED 11
#define IPL_HIGH 12
+#define IPL_LOCK IPL_HIGH
#define NIPL IPL_HIGH + 1
#if defined(_KERNEL) && !defined(_LOCORE)
@@ -78,6 +79,8 @@
/* #define splsched() splhigh() */
#define spllock() splhigh()
+#define splraiseipl(x) (((x) == IPL_HIGH) ? splhigh() : raisespl(x))
+
#define spl0() lowerspl(IPL_NONE)
#define spllowersoftclock() lowerspl(IPL_SOFTCLOCK)
#define splx(s) lowerspl(s)
diff -r 03be23e48041 -r f70ddcea4511 sys/arch/arm/footbridge/footbridge_intr.h
--- a/sys/arch/arm/footbridge/footbridge_intr.h Sun Jan 01 12:12:43 2006 +0000
+++ b/sys/arch/arm/footbridge/footbridge_intr.h Sun Jan 01 14:24:33 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_intr.h,v 1.6 2005/12/24 20:06:52 perry Exp $ */
+/* $NetBSD: footbridge_intr.h,v 1.7 2006/01/01 14:24:33 yamt Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -52,11 +52,14 @@
#define IPL_NET 5 /* network */
#define IPL_SOFTSERIAL 6 /* serial software interrupts */
#define IPL_TTY 7 /* terminal */
+#define IPL_LPT IPL_TTY
#define IPL_VM 8 /* memory allocation */
#define IPL_AUDIO 9 /* audio */
#define IPL_CLOCK 10 /* clock */
#define IPL_STATCLOCK 11 /* statclock */
#define IPL_HIGH 12 /* everything */
+#define IPL_SCHED IPL_HIGH
+#define IPL_LOCK IPL_HIGH
#define IPL_SERIAL 13 /* serial */
#define NIPL 14
@@ -163,25 +166,12 @@
#include <machine/irqhandler.h>
#define splsoft() _splraise(IPL_SOFT)
-#define splsoftclock() _splraise(IPL_SOFTCLOCK)
-#define splsoftnet() _splraise(IPL_SOFTNET)
-#define splbio() _splraise(IPL_BIO)
-#define splnet() _splraise(IPL_NET)
-#define splsoftserial() _splraise(IPL_SOFTSERIAL)
-#define spltty() _splraise(IPL_TTY)
-#define spllpt() spltty()
-#define splvm() _splraise(IPL_VM)
-#define splaudio() _splraise(IPL_AUDIO)
-#define splclock() _splraise(IPL_CLOCK)
-#define splstatclock() _splraise(IPL_STATCLOCK)
-#define splhigh() _splraise(IPL_HIGH)
-#define splserial() _splraise(IPL_SERIAL)
+#define splraiseipl(x) _splraise(x)
#define spl0() (void)_spllower(IPL_NONE)
#define spllowersoftclock() (void)_spllower(IPL_SOFTCLOCK)
-#define splsched() splhigh()
-#define spllock() splhigh()
+#include <sys/spl.h>
/* Use generic software interrupt support. */
#include <arm/softintr.h>
diff -r 03be23e48041 -r f70ddcea4511 sys/arch/evbarm/include/intr.h
--- a/sys/arch/evbarm/include/intr.h Sun Jan 01 12:12:43 2006 +0000
+++ b/sys/arch/evbarm/include/intr.h Sun Jan 01 14:24:33 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.13 2005/12/24 20:06:59 perry Exp $ */
+/* $NetBSD: intr.h,v 1.14 2006/01/01 14:24:33 yamt Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -54,6 +54,8 @@
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
#define IPL_HIGH 12 /* everything */
+#define IPL_SCHED IPL_HIGH
+#define IPL_LOCK IPL_HIGH
#define IPL_SERIAL 13 /* serial device */
#define NIPL 14
@@ -146,24 +148,13 @@
#endif /* _LKM */
-#define splhigh() _splraise(IPL_HIGH)
#define splsoft() _splraise(IPL_SOFT)
-#define splsoftclock() _splraise(IPL_SOFTCLOCK)
-#define splsoftnet() _splraise(IPL_SOFTNET)
-#define splbio() _splraise(IPL_BIO)
-#define splnet() _splraise(IPL_NET)
-#define spltty() _splraise(IPL_TTY)
-#define splvm() _splraise(IPL_VM)
-#define splaudio() _splraise(IPL_AUDIO)
-#define splclock() _splraise(IPL_CLOCK)
-#define splstatclock() _splraise(IPL_STATCLOCK)
-#define splserial() _splraise(IPL_SERIAL)
+#define splraiseipl(x) _splraise(x)
#define spl0() _spllower(IPL_NONE)
#define spllowersoftclock() _spllower(IPL_SOFTCLOCK)
-#define splsched() splhigh()
-#define spllock() splhigh()
+#include <sys/spl.h>
/* Use generic software interrupt support. */
#include <arm/softintr.h>
diff -r 03be23e48041 -r f70ddcea4511 sys/arch/iyonix/include/intr.h
--- a/sys/arch/iyonix/include/intr.h Sun Jan 01 12:12:43 2006 +0000
+++ b/sys/arch/iyonix/include/intr.h Sun Jan 01 14:24:33 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3 2005/12/24 20:07:14 perry Exp $ */
+/* $NetBSD: intr.h,v 1.4 2006/01/01 14:24:33 yamt Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -54,6 +54,8 @@
#define IPL_CLOCK 10 /* clock interrupt */
#define IPL_STATCLOCK 11 /* statistics clock interrupt */
#define IPL_HIGH 12 /* everything */
+#define IPL_SCHED IPL_HIGH
+#define IPL_LOCK IPL_HIGH
#define IPL_SERIAL 13 /* serial device */
#define NIPL 14
@@ -132,24 +134,13 @@
#endif /* _LKM */
-#define splhigh() _splraise(IPL_HIGH)
#define splsoft() _splraise(IPL_SOFT)
-#define splsoftclock() _splraise(IPL_SOFTCLOCK)
-#define splsoftnet() _splraise(IPL_SOFTNET)
-#define splbio() _splraise(IPL_BIO)
-#define splnet() _splraise(IPL_NET)
-#define spltty() _splraise(IPL_TTY)
-#define splvm() _splraise(IPL_VM)
-#define splaudio() _splraise(IPL_AUDIO)
-#define splclock() _splraise(IPL_CLOCK)
-#define splstatclock() _splraise(IPL_STATCLOCK)
-#define splserial() _splraise(IPL_SERIAL)
+#define splraiseipl(x) _splraise(x)
#define spl0() _spllower(IPL_NONE)
#define spllowersoftclock() _spllower(IPL_SOFTCLOCK)
-#define splsched() splhigh()
-#define spllock() splhigh()
+#include <sys/spl.h>
/* Use generic software interrupt support. */
#include <arm/softintr.h>
Home |
Main Index |
Thread Index |
Old Index