Module Name: src
Committed By: skrll
Date: Fri Sep 24 08:07:40 UTC 2021
Modified Files:
src/sys/arch/arm/imx: imx31_intr.h imx51_intr.h
src/sys/arch/arm/marvell: mvsoc_intr.h
src/sys/arch/arm/omap: omap2_intr.h
src/sys/arch/epoc32/include: intr.h
Log Message:
Catch up with spl changes.
It's 2021 and ugly is in (with apologies to PWEI)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx31_intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_intr.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_intr.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/include/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/imx31_intr.h
diff -u src/sys/arch/arm/imx/imx31_intr.h:1.3 src/sys/arch/arm/imx/imx31_intr.h:1.4
--- src/sys/arch/arm/imx/imx31_intr.h:1.3 Mon Apr 28 20:23:14 2008
+++ src/sys/arch/arm/imx/imx31_intr.h Fri Sep 24 08:07:40 2021
@@ -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);
Index: src/sys/arch/arm/imx/imx51_intr.h
diff -u src/sys/arch/arm/imx/imx51_intr.h:1.1 src/sys/arch/arm/imx/imx51_intr.h:1.2
--- src/sys/arch/arm/imx/imx51_intr.h:1.1 Sat Nov 13 07:11:02 2010
+++ src/sys/arch/arm/imx/imx51_intr.h Fri Sep 24 08:07:40 2021
@@ -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 <[email protected]>
* 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 *);
Index: src/sys/arch/arm/marvell/mvsoc_intr.h
diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.6 src/sys/arch/arm/marvell/mvsoc_intr.h:1.7
--- src/sys/arch/arm/marvell/mvsoc_intr.h:1.6 Wed Jun 3 03:04:21 2015
+++ src/sys/arch/arm/marvell/mvsoc_intr.h Fri Sep 24 08:07:40 2021
@@ -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 @@ extern int (*find_pending_irqs)(void);
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 *
Index: src/sys/arch/arm/omap/omap2_intr.h
diff -u src/sys/arch/arm/omap/omap2_intr.h:1.9 src/sys/arch/arm/omap/omap2_intr.h:1.10
--- src/sys/arch/arm/omap/omap2_intr.h:1.9 Sat Jun 15 21:55:09 2013
+++ src/sys/arch/arm/omap/omap2_intr.h Fri Sep 24 08:07:40 2021
@@ -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 */
Index: src/sys/arch/epoc32/include/intr.h
diff -u src/sys/arch/epoc32/include/intr.h:1.3 src/sys/arch/epoc32/include/intr.h:1.4
--- src/sys/arch/epoc32/include/intr.h:1.3 Sat Jun 5 21:24:16 2021
+++ src/sys/arch/epoc32/include/intr.h Fri Sep 24 08:07:40 2021
@@ -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;
