Module Name: src
Committed By: thorpej
Date: Fri Jan 19 03:09:05 UTC 2024
Modified Files:
src/sys/arch/cesfic/include: intr.h
src/sys/arch/hp300/include: intr.h
src/sys/arch/luna68k/include: intr.h
src/sys/arch/m68k/include: intr.h
src/sys/arch/mvme68k/include: intr.h
src/sys/arch/news68k/include: intr.h
src/sys/arch/next68k/include: intr.h
src/sys/arch/sun68k/include: intr.h
Log Message:
Add _KERNEL guards around most of the definitions in these files.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/include/intr.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/hp300/include/intr.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/include/intr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/include/intr.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mvme68k/include/intr.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/news68k/include/intr.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/include/intr.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun68k/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/cesfic/include/intr.h
diff -u src/sys/arch/cesfic/include/intr.h:1.17 src/sys/arch/cesfic/include/intr.h:1.18
--- src/sys/arch/cesfic/include/intr.h:1.17 Mon Jan 15 19:11:31 2024
+++ src/sys/arch/cesfic/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.17 2024/01/15 19:11:31 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.18 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LUNA68K_INTR_H_
#define _LUNA68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "lev1", "lev2", "lev3", "lev4", "lev5", "clock", "nmi" }
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
#endif /* _LUNA68K_INTR_H */
Index: src/sys/arch/hp300/include/intr.h
diff -u src/sys/arch/hp300/include/intr.h:1.38 src/sys/arch/hp300/include/intr.h:1.39
--- src/sys/arch/hp300/include/intr.h:1.38 Tue Jan 16 07:07:00 2024
+++ src/sys/arch/hp300/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.38 2024/01/16 07:07:00 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.39 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _HP300_INTR_H_
#define _HP300_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -58,8 +60,12 @@
#endif
#endif
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
+#ifdef _KERNEL
+
#ifdef _M68K_INTR_PRIVATE
struct hp300_intrhand {
struct m68k_intrhand ih_super;
@@ -87,4 +93,6 @@ intr_disestablish(void *ih)
m68k_intr_disestablish(ih);
}
+#endif /* _KERNEL */
+
#endif /* _HP300_INTR_H */
Index: src/sys/arch/luna68k/include/intr.h
diff -u src/sys/arch/luna68k/include/intr.h:1.18 src/sys/arch/luna68k/include/intr.h:1.19
--- src/sys/arch/luna68k/include/intr.h:1.18 Mon Jan 15 20:10:33 2024
+++ src/sys/arch/luna68k/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.18 2024/01/15 20:10:33 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.19 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LUNA68K_INTR_H_
#define _LUNA68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "lev1", "scsi", "network", "lev4", "clock", "serial", "nmi" }
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
#endif /* _LUNA68K_INTR_H */
Index: src/sys/arch/m68k/include/intr.h
diff -u src/sys/arch/m68k/include/intr.h:1.5 src/sys/arch/m68k/include/intr.h:1.6
--- src/sys/arch/m68k/include/intr.h:1.5 Tue Jan 16 01:16:46 2024
+++ src/sys/arch/m68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2024/01/16 01:16:46 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.6 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
@@ -32,9 +32,16 @@
#ifndef _M68k_INTR_H_
#define _M68k_INTR_H_
-#include <sys/types.h>
#include <machine/psl.h>
+#if (defined(_KERNEL) && !defined(_LOCORE)) || defined(_KMEMUSER)
+typedef struct {
+ uint16_t _psl; /* physical manifestation of logical IPL_* */
+} ipl_cookie_t;
+#endif
+
+#ifdef _KERNEL
+
/*
* Logical interrupt priority levels -- these are distinct from
* the hardware interrupt priority levels of the m68k.
@@ -61,13 +68,8 @@
#define ISRPRI_TTYNOBUF 3 /* a particularly bad serial port */
#define ISRPRI_AUDIO 4 /* audio devices */
-#if defined(_KERNEL) || defined(_KMEMUSER)
-typedef struct {
- uint16_t _psl; /* physical manifestation of logical IPL_* */
-} ipl_cookie_t;
-#endif
+#ifndef _LOCORE
-#ifdef _KERNEL
extern volatile int idepth; /* interrupt depth */
extern const uint16_t ipl2psl_table[NIPL];
@@ -202,6 +204,8 @@ bool m68k_intr_disestablish(void *);
void *m68k_intrvec_intrhand(int vec); /* XXX */
#endif
+#endif /* !_LOCORE */
+
#endif /* _KERNEL */
#endif /* _M68k_INTR_H_ */
Index: src/sys/arch/mvme68k/include/intr.h
diff -u src/sys/arch/mvme68k/include/intr.h:1.23 src/sys/arch/mvme68k/include/intr.h:1.24
--- src/sys/arch/mvme68k/include/intr.h:1.23 Tue Jan 16 01:26:34 2024
+++ src/sys/arch/mvme68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.23 2024/01/16 01:26:34 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.24 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _MVME68K_INTR_H_
#define _MVME68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "lev1", "lev2", "lev3", "lev4", "clock", "lev6", "nmi" }
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
#endif /* _MVME68K_INTR_H */
Index: src/sys/arch/news68k/include/intr.h
diff -u src/sys/arch/news68k/include/intr.h:1.30 src/sys/arch/news68k/include/intr.h:1.31
--- src/sys/arch/news68k/include/intr.h:1.30 Mon Jan 15 20:21:50 2024
+++ src/sys/arch/news68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.30 2024/01/15 20:21:50 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.31 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _NEWS68K_INTR_H_
#define _NEWS68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL2
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "AST", "softint", "lev3", "lev4", "lev5", "clock", "nmi" }
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
#endif /* _NEWS68K_INTR_H_ */
Index: src/sys/arch/next68k/include/intr.h
diff -u src/sys/arch/next68k/include/intr.h:1.24 src/sys/arch/next68k/include/intr.h:1.25
--- src/sys/arch/next68k/include/intr.h:1.24 Thu Jan 18 13:46:14 2024
+++ src/sys/arch/next68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.24 2024/01/18 13:46:14 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.25 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _NEXT68K_INTR_H_
#define _NEXT68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -41,12 +43,14 @@
#define MACHINE_PSL_IPL_VM PSL_IPL6
#define MACHINE_PSL_IPL_SCHED PSL_IPL7
-#include <m68k/intr.h>
+#endif /* _KERNEL */
-#define spldma() splraise6()
+#include <m68k/intr.h>
#ifdef _KERNEL
+#define spldma() splraise6()
+
extern volatile u_long *intrstat;
extern volatile u_long *intrmask;
#define INTR_SETMASK(x) (*intrmask = (x))
Index: src/sys/arch/sun68k/include/intr.h
diff -u src/sys/arch/sun68k/include/intr.h:1.25 src/sys/arch/sun68k/include/intr.h:1.26
--- src/sys/arch/sun68k/include/intr.h:1.25 Mon Jan 15 17:40:35 2024
+++ src/sys/arch/sun68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.25 2024/01/15 17:40:35 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.26 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _SUN68K_INTR_H_
#define _SUN68K_INTR_H_
+#ifdef _KERNEL
+
#include <m68k/psl.h>
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -54,6 +56,8 @@
#define _IPL_SOFT_LEVEL_MIN 1
#define _IPL_SOFT_LEVEL_MAX 3
+#endif /* _KERNEL */
+
#include <m68k/intr.h>
#ifdef _KERNEL
