[src/trunk]: src/sys/arch/cesfic/include Move spl*() interfaces from from par...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/cesfic/include Move spl*() interfaces from from par...
From: kleink <kleink%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:18:00 +0000

details:   https://anonhg.NetBSD.org/src/rev/2b4983a668a7
branches:  trunk
changeset: 520593:2b4983a668a7
user:      kleink <kleink%NetBSD.org@localhost>
date:      Mon Jan 14 19:59:31 2002 +0000

description:
Move spl*() interfaces from from param.h to intr.h; for compatibility,
still let them available from param.h as well like all other platforms
currently do.

diffstat:

 sys/arch/cesfic/include/intr.h  |  94 ++++++++++++++++++++++++++++++++++++++++-
 sys/arch/cesfic/include/param.h |  46 +------------------
 2 files changed, 96 insertions(+), 44 deletions(-)

diffs (163 lines):

diff -r 9d67d6aeaf5a -r 2b4983a668a7 sys/arch/cesfic/include/intr.h
--- a/sys/arch/cesfic/include/intr.h    Mon Jan 14 19:37:30 2002 +0000
+++ b/sys/arch/cesfic/include/intr.h    Mon Jan 14 19:59:31 2002 +0000
@@ -1,1 +1,93 @@
-/* $NetBSD: intr.h,v 1.1 2001/05/14 18:23:12 drochner Exp $ */
+/*     $NetBSD: intr.h,v 1.2 2002/01/14 19:59:31 kleink Exp $  */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1982, 1986, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: machparam.h 1.16 92/12/20$
+ *
+ *     from: @(#)param.h       8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _CESFIC_INTR_H_
+#define _CESFIC_INTR_H_
+
+/*
+ * spl functions; all but spl0 are done in-line
+ */
+#include <machine/psl.h>
+
+#if defined(_KERNEL) && !defined(_LOCORE)
+/* spl0 requires checking for software interrupts */
+#define spl1()  _spl(PSL_S|PSL_IPL1)
+#define spl2()  _spl(PSL_S|PSL_IPL2)
+#define spl3()  _spl(PSL_S|PSL_IPL3)
+#define spl4()  _spl(PSL_S|PSL_IPL4)
+#define spl5()  _spl(PSL_S|PSL_IPL5)
+#define spl6()  _spl(PSL_S|PSL_IPL6)
+#define spl7()  _spl(PSL_S|PSL_IPL7)
+
+/*
+ * These four globals contain the appropriate PSL_S|PSL_IPL? values
+ * to raise interrupt priority to the requested level.
+ */
+extern unsigned short cesfic_bioipl;
+extern unsigned short cesfic_netipl;
+extern unsigned short cesfic_ttyipl;
+extern unsigned short cesfic_impipl;
+
+/* These spl calls are used by machine-independent code. */
+#define        spllowersoftclock() spl1()
+#define        splsoft()       splraise1()
+#define splsoftclock() splsoft()
+#define splsoftnet()   splsoft()
+#define splbio()       _splraise(cesfic_bioipl)
+#define splnet()       _splraise(cesfic_netipl)
+#define spltty()       _splraise(cesfic_ttyipl)
+#define splvm()                _splraise(cesfic_impipl)
+#define splclock()     spl6()
+#define splstatclock() spl6()
+#define splhigh()      spl7()
+#define splsched()     spl7()
+#define spllock()      spl7()
+
+/* watch out for side effects */
+#define splx(s)         (s & PSL_IPL ? _spl(s) : spl0())
+
+int    spl0 __P((void));
+#endif /* _KERNEL && !_LOCORE */
+
+#endif /* !_CESFIC_INTR_H_ */
diff -r 9d67d6aeaf5a -r 2b4983a668a7 sys/arch/cesfic/include/param.h
--- a/sys/arch/cesfic/include/param.h   Mon Jan 14 19:37:30 2002 +0000
+++ b/sys/arch/cesfic/include/param.h   Mon Jan 14 19:59:31 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.2 2001/05/16 18:49:51 drochner Exp $       */
+/*     $NetBSD: param.h,v 1.3 2002/01/14 19:59:31 kleink Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -82,53 +82,13 @@
 #define        NKMEMPAGES_MAX_DEFAULT  ((3 * 1024 * 1024) >> PAGE_SHIFT)
 
 /*
- * spl functions; all but spl0 are done in-line
- */
-#include <machine/psl.h>
-
-/* spl0 requires checking for software interrupts */
-#define spl1()  _spl(PSL_S|PSL_IPL1)
-#define spl2()  _spl(PSL_S|PSL_IPL2)
-#define spl3()  _spl(PSL_S|PSL_IPL3)
-#define spl4()  _spl(PSL_S|PSL_IPL4)
-#define spl5()  _spl(PSL_S|PSL_IPL5)
-#define spl6()  _spl(PSL_S|PSL_IPL6)
-#define spl7()  _spl(PSL_S|PSL_IPL7)
-
-#if defined(_KERNEL) && !defined(_LOCORE)
-/*
- * These four globals contain the appropriate PSL_S|PSL_IPL? values
- * to raise interrupt priority to the requested level.
+ * Interrupt glue.
  */
-extern unsigned short cesfic_bioipl;
-extern unsigned short cesfic_netipl;
-extern unsigned short cesfic_ttyipl;
-extern unsigned short cesfic_impipl;
-#endif /* _KERNEL && !_LOCORE */
-
-/* These spl calls are used by machine-independent code. */
-#define        spllowersoftclock() spl1()
-#define        splsoft()       splraise1()
-#define splsoftclock() splsoft()
-#define splsoftnet()   splsoft()
-#define splbio()       _splraise(cesfic_bioipl)
-#define splnet()       _splraise(cesfic_netipl)
-#define spltty()       _splraise(cesfic_ttyipl)
-#define splvm()                _splraise(cesfic_impipl)
-#define splclock()     spl6()
-#define splstatclock() spl6()
-#define splhigh()      spl7()
-#define splsched()     spl7()
-#define spllock()      spl7()
-
-/* watch out for side effects */
-#define splx(s)         (s & PSL_IPL ? _spl(s) : spl0())
+#include <machine/intr.h>
 
 #if defined(_KERNEL) && !defined(_LOCORE)
 #define        delay(us)       _delay((us) << 8)
 #define DELAY(us)      delay(us)
 
-int    spl0 __P((void));
 void   _delay __P((u_int));
 #endif /* _KERNEL && !_LOCORE */
-

Prev by Date: [src/trunk]: src/sys/arch/mips Define new macro to access FSR register and us...
Next by Date: [src/trunk]: src/sys/dev/pci Regen.
Previous by Thread: [src/trunk]: src/sys/arch/mips Define new macro to access FSR register and us...
Next by Thread: [src/trunk]: src/sys/dev/pci Regen.
Indexes:

Home | Main Index | Thread Index | Old Index