Module Name: src
Committed By: thorpej
Date: Sat Sep 19 01:24:31 UTC 2020
Modified Files:
src/sys/arch/alpha/alpha: genassym.cf interrupt.c
src/sys/arch/alpha/include: intr.h
Log Message:
Move softintr bits into <machine/intr.h> and define ALPHA_ALL_SOFTINTS
for locore.s
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/alpha/genassym.cf
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/alpha/alpha/interrupt.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/alpha/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/alpha/alpha/genassym.cf
diff -u src/sys/arch/alpha/alpha/genassym.cf:1.26 src/sys/arch/alpha/alpha/genassym.cf:1.27
--- src/sys/arch/alpha/alpha/genassym.cf:1.26 Wed Sep 16 04:07:32 2020
+++ src/sys/arch/alpha/alpha/genassym.cf Sat Sep 19 01:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.26 2020/09/16 04:07:32 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.27 2020/09/19 01:24:31 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -133,6 +133,9 @@ define ALPHA_PSL_IPL_SOFT_LO ALPHA_PSL_I
define ALPHA_PSL_IPL_SOFT_HI ALPHA_PSL_IPL_SOFT_HI
define ALPHA_PSL_IPL_HIGH ALPHA_PSL_IPL_HIGH
+# soft interrrupt definitions
+define ALPHA_ALL_SOFTINTS ALPHA_ALL_SOFTINTS
+
# pte bits
define ALPHA_PTE_VALID ALPHA_PTE_VALID
define ALPHA_PTE_ASM ALPHA_PTE_ASM
Index: src/sys/arch/alpha/alpha/interrupt.c
diff -u src/sys/arch/alpha/alpha/interrupt.c:1.86 src/sys/arch/alpha/alpha/interrupt.c:1.87
--- src/sys/arch/alpha/alpha/interrupt.c:1.86 Thu Sep 17 00:48:56 2020
+++ src/sys/arch/alpha/alpha/interrupt.c Sat Sep 19 01:24:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.86 2020/09/17 00:48:56 thorpej Exp $ */
+/* $NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.86 2020/09/17 00:48:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -454,16 +454,6 @@ badaddr_read(void *addr, size_t size, vo
* Fast soft interrupt support.
*/
-#define SOFTINT_CLOCK_MASK __BIT(SOFTINT_CLOCK)
-#define SOFTINT_BIO_MASK __BIT(SOFTINT_BIO)
-#define SOFTINT_NET_MASK __BIT(SOFTINT_NET)
-#define SOFTINT_SERIAL_MASK __BIT(SOFTINT_SERIAL)
-
-#define ALPHA_IPL1_SOFTINTS (SOFTINT_CLOCK_MASK | SOFTINT_BIO_MASK)
-#define ALPHA_IPL2_SOFTINTS (SOFTINT_NET_MASK | SOFTINT_SERIAL_MASK)
-
-#define ALPHA_ALL_SOFTINTS (ALPHA_IPL1_SOFTINTS | ALPHA_IPL2_SOFTINTS)
-
#define SOFTINT_TO_IPL(si) \
(ALPHA_PSL_IPL_SOFT_LO + ((ALPHA_IPL2_SOFTINTS >> (si)) & 1))
Index: src/sys/arch/alpha/include/intr.h
diff -u src/sys/arch/alpha/include/intr.h:1.77 src/sys/arch/alpha/include/intr.h:1.78
--- src/sys/arch/alpha/include/intr.h:1.77 Thu Sep 17 00:48:56 2020
+++ src/sys/arch/alpha/include/intr.h Sat Sep 19 01:24:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.77 2020/09/17 00:48:56 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.78 2020/09/19 01:24:31 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -118,6 +118,16 @@ struct scbvec {
#define IPL_SCHED ALPHA_PSL_IPL_CLOCK
#define IPL_HIGH ALPHA_PSL_IPL_HIGH
+#define SOFTINT_CLOCK_MASK __BIT(SOFTINT_CLOCK)
+#define SOFTINT_BIO_MASK __BIT(SOFTINT_BIO)
+#define SOFTINT_NET_MASK __BIT(SOFTINT_NET)
+#define SOFTINT_SERIAL_MASK __BIT(SOFTINT_SERIAL)
+
+#define ALPHA_IPL1_SOFTINTS (SOFTINT_CLOCK_MASK | SOFTINT_BIO_MASK)
+#define ALPHA_IPL2_SOFTINTS (SOFTINT_NET_MASK | SOFTINT_SERIAL_MASK)
+
+#define ALPHA_ALL_SOFTINTS (ALPHA_IPL1_SOFTINTS | ALPHA_IPL2_SOFTINTS)
+
typedef int ipl_t;
typedef struct {
uint8_t _psl;
