[src/trunk]: src/sys/arch Catch up with spl changes.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a3f7430bf9f
branches:  trunk
changeset: 1023714:4a3f7430bf9f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Sep 24 08:07:40 2021 +0000

description:
Catch up with spl changes.

It's 2021 and ugly is in (with apologies to PWEI)

diffstat:

 sys/arch/arm/imx/imx31_intr.h     |  9 +++++----
 sys/arch/arm/imx/imx51_intr.h     |  9 +++++----
 sys/arch/arm/marvell/mvsoc_intr.h |  6 +++++-
 sys/arch/arm/omap/omap2_intr.h    |  6 +++++-
 sys/arch/epoc32/include/intr.h    |  6 +++++-
 5 files changed, 25 insertions(+), 11 deletions(-)

diffs (110 lines):

diff -r d35306c07301 -r 4a3f7430bf9f sys/arch/arm/imx/imx31_intr.h
--- a/sys/arch/arm/imx/imx31_intr.h     Fri Sep 24 08:04:15 2021 +0000
+++ b/sys/arch/arm/imx/imx31_intr.h     Fri Sep 24 08:07:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx31_intr.h,v 1.3 2008/04/28 20:23:14 martin Exp $    */
+/*     $NetBSD: imx31_intr.h,v 1.4 2021/09/24 08:07:40 skrll Exp $     */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -121,11 +121,12 @@
 
 #define        PIC_MAXMAXSOURCES       (64+3*32+128)
 
+#define        _splraise       pic_splraise
+#define        _spllower       pic_spllower
+#define        splx            pic_splx
+
 #include <arm/pic/picvar.h>
 
-int    _splraise(int);
-int    _spllower(int);
-void   splx(int);
 const char *
        intr_typename(int);
 
diff -r d35306c07301 -r 4a3f7430bf9f sys/arch/arm/imx/imx51_intr.h
--- a/sys/arch/arm/imx/imx51_intr.h     Fri Sep 24 08:04:15 2021 +0000
+++ b/sys/arch/arm/imx/imx51_intr.h     Fri Sep 24 08:07:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_intr.h,v 1.1 2010/11/13 07:11:02 bsh Exp $       */
+/*     $NetBSD: imx51_intr.h,v 1.2 2021/09/24 08:07:40 skrll Exp $     */
 /*-
  * Copyright (c) 2009 SHIMIZU Ryo <ryo%nerv.org@localhost>
  * All rights reserved.
@@ -290,11 +290,12 @@
 #define        PIC_MAXSOURCES          128
 #define        PIC_MAXMAXSOURCES       (PIC_MAXSOURCES+128)
 
+#define        _splraise       pic_splraise
+#define        _spllower       pic_spllower
+#define        splx            pic_splx
+
 #include <arm/pic/picvar.h>
 
-int _splraise(int);
-int _spllower(int);
-void splx(int);
 const char *intr_typename(int);
 
 void imx51_irq_handler(void *);
diff -r d35306c07301 -r 4a3f7430bf9f sys/arch/arm/marvell/mvsoc_intr.h
--- a/sys/arch/arm/marvell/mvsoc_intr.h Fri Sep 24 08:04:15 2021 +0000
+++ b/sys/arch/arm/marvell/mvsoc_intr.h Fri Sep 24 08:07:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsoc_intr.h,v 1.6 2015/06/03 03:04:21 hsuenaga Exp $  */
+/*     $NetBSD: mvsoc_intr.h,v 1.7 2021/09/24 08:07:40 skrll Exp $     */
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -45,6 +45,10 @@
 
 void mvsoc_irq_handler(void *);
 
+#define        _splraise       pic_splraise
+#define        _spllower       pic_spllower
+#define        splx            pic_splx
+
 #include <arm/pic/picvar.h>
 
 static __inline void *
diff -r d35306c07301 -r 4a3f7430bf9f sys/arch/arm/omap/omap2_intr.h
--- a/sys/arch/arm/omap/omap2_intr.h    Fri Sep 24 08:04:15 2021 +0000
+++ b/sys/arch/arm/omap/omap2_intr.h    Fri Sep 24 08:07:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_intr.h,v 1.9 2013/06/15 21:55:09 matt Exp $ */
+/*     $NetBSD: omap2_intr.h,v 1.10 2021/09/24 08:07:40 skrll Exp $ */
 
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
@@ -49,6 +49,10 @@
 
 #ifndef _LOCORE
 
+#define        _splraise       pic_splraise
+#define        _spllower       pic_spllower
+#define        splx            pic_splx
+
 #include <arm/pic/picvar.h>
 
 #endif /* ! _LOCORE */
diff -r d35306c07301 -r 4a3f7430bf9f sys/arch/epoc32/include/intr.h
--- a/sys/arch/epoc32/include/intr.h    Fri Sep 24 08:04:15 2021 +0000
+++ b/sys/arch/epoc32/include/intr.h    Fri Sep 24 08:07:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.3 2021/06/05 21:24:16 christos Exp $        */
+/*     $NetBSD: intr.h,v 1.4 2021/09/24 08:07:40 skrll Exp $   */
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -69,6 +69,10 @@
 #define PIC_MAXSOURCES         16
 #define PIC_MAXMAXSOURCES      16
 
+#define        _splraise       pic_splraise
+#define        _spllower       pic_spllower
+#define        splx            pic_splx
+
 #include <arm/pic/picvar.h>
 
 typedef uint8_t ipl_t;