Module Name: src
Committed By: thorpej
Date: Sun Jan 14 18:22:02 UTC 2024
Modified Files:
src/distrib/sets/lists/comp: md.sun2 md.sun3
src/sys/arch/sun2/include: types.h
src/sys/arch/sun3/include: types.h
src/sys/arch/sun68k/include: Makefile
Added Files:
src/sys/arch/sun68k/include: types.h
Log Message:
Merge common sun68k types defns into <sun68k/types.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/md.sun2
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/comp/md.sun3
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun2/include/types.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/include/types.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun68k/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/sun68k/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.sun2
diff -u src/distrib/sets/lists/comp/md.sun2:1.22 src/distrib/sets/lists/comp/md.sun2:1.23
--- src/distrib/sets/lists/comp/md.sun2:1.22 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.sun2 Sun Jan 14 18:22:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sun2,v 1.22 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.sun2,v 1.23 2024/01/14 18:22:02 thorpej Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sun2 comp-c-include
./usr/include/sun2/_G_config.h comp-obsolete obsolete
@@ -70,3 +70,4 @@
./usr/include/sun68k/intr.h comp-c-include
./usr/include/sun68k/mon.h comp-c-include
./usr/include/sun68k/psl.h comp-c-include
+./usr/include/sun68k/types.h comp-c-include
Index: src/distrib/sets/lists/comp/md.sun3
diff -u src/distrib/sets/lists/comp/md.sun3:1.64 src/distrib/sets/lists/comp/md.sun3:1.65
--- src/distrib/sets/lists/comp/md.sun3:1.64 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.sun3 Sun Jan 14 18:22:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sun3,v 1.64 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.sun3,v 1.65 2024/01/14 18:22:02 thorpej Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sun3 comp-c-include
./usr/include/sun3/_G_config.h comp-obsolete obsolete
@@ -81,3 +81,4 @@
./usr/include/sun68k/intr.h comp-c-include
./usr/include/sun68k/mon.h comp-c-include
./usr/include/sun68k/psl.h comp-c-include
+./usr/include/sun68k/types.h comp-c-include
Index: src/sys/arch/sun2/include/types.h
diff -u src/sys/arch/sun2/include/types.h:1.14 src/sys/arch/sun2/include/types.h:1.15
--- src/sys/arch/sun2/include/types.h:1.14 Thu Apr 1 04:43:01 2021
+++ src/sys/arch/sun2/include/types.h Sun Jan 14 18:22:02 2024
@@ -1,11 +1,5 @@
-/* $NetBSD: types.h,v 1.14 2021/04/01 04:43:01 simonb Exp $ */
+/* $NetBSD: types.h,v 1.15 2024/01/14 18:22:02 thorpej Exp $ */
-#include <m68k/types.h>
+#include <sun68k/types.h>
-#define __HAVE_LEGACY_INTRCNT
-#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#define __HAVE_MM_MD_KERNACC
-#define __HAVE_MM_MD_MMAP
-#define __HAVE_MM_MD_READWRITE
#define __HAVE_NO___THREAD
-#define __HAVE_NO_PMAP_STATS
Index: src/sys/arch/sun3/include/types.h
diff -u src/sys/arch/sun3/include/types.h:1.22 src/sys/arch/sun3/include/types.h:1.23
--- src/sys/arch/sun3/include/types.h:1.22 Thu Apr 1 04:43:01 2021
+++ src/sys/arch/sun3/include/types.h Sun Jan 14 18:22:02 2024
@@ -1,10 +1,3 @@
-/* $NetBSD: types.h,v 1.22 2021/04/01 04:43:01 simonb Exp $ */
+/* $NetBSD: types.h,v 1.23 2024/01/14 18:22:02 thorpej Exp $ */
-#include <m68k/types.h>
-
-#define __HAVE_LEGACY_INTRCNT
-#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#define __HAVE_MM_MD_KERNACC
-#define __HAVE_MM_MD_MMAP
-#define __HAVE_MM_MD_READWRITE
-#define __HAVE_NO_PMAP_STATS
+#include <sun68k/types.h>
Index: src/sys/arch/sun68k/include/Makefile
diff -u src/sys/arch/sun68k/include/Makefile:1.2 src/sys/arch/sun68k/include/Makefile:1.3
--- src/sys/arch/sun68k/include/Makefile:1.2 Tue Nov 26 23:30:29 2002
+++ src/sys/arch/sun68k/include/Makefile Sun Jan 14 18:22:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/26 23:30:29 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2024/01/14 18:22:02 thorpej Exp $
INCSDIR= /usr/include/sun68k
@@ -9,6 +9,7 @@ INCS= \
idprom.h \
intr.h \
mon.h \
- psl.h
+ psl.h \
+ types.h
.include <bsd.kinc.mk>
Added files:
Index: src/sys/arch/sun68k/include/types.h
diff -u /dev/null src/sys/arch/sun68k/include/types.h:1.1
--- /dev/null Sun Jan 14 18:22:02 2024
+++ src/sys/arch/sun68k/include/types.h Sun Jan 14 18:22:02 2024
@@ -0,0 +1,10 @@
+/* $NetBSD: types.h,v 1.1 2024/01/14 18:22:02 thorpej Exp $ */
+
+#include <m68k/types.h>
+
+#define __HAVE_LEGACY_INTRCNT
+#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define __HAVE_MM_MD_KERNACC
+#define __HAVE_MM_MD_MMAP
+#define __HAVE_MM_MD_READWRITE
+#define __HAVE_NO_PMAP_STATS
