Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Make <sysarch.h> valid for all arm platforms. Adju...
details: https://anonhg.NetBSD.org/src/rev/83af5ff760b4
branches: trunk
changeset: 512684:83af5ff760b4
user: matt <matt%NetBSD.org@localhost>
date: Sat Jul 14 00:23:09 2001 +0000
description:
Make <sysarch.h> valid for all arm platforms. Adjust/remove port-specific
includes as required.
diffstat:
sys/arch/arm/include/Makefile | 4 +-
sys/arch/arm/include/arm32/Makefile | 4 +-
sys/arch/arm/include/arm32/sysarch.h | 56 ------------------------------------
sys/arch/arm/include/sysarch.h | 56 ++++++++++++++++++++++++++++++++++++
sys/arch/arm32/include/sysarch.h | 4 +-
sys/arch/cats/include/Makefile | 3 +-
sys/arch/cats/include/sysarch.h | 4 --
sys/arch/dnard/include/Makefile | 4 +-
sys/arch/dnard/include/sysarch.h | 4 --
sys/arch/hpcarm/include/sysarch.h | 4 +-
sys/arch/netwinder/include/Makefile | 3 +-
sys/arch/netwinder/include/sysarch.h | 4 --
12 files changed, 68 insertions(+), 82 deletions(-)
diffs (248 lines):
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/arm/include/Makefile
--- a/sys/arch/arm/include/Makefile Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/arm/include/Makefile Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/06/23 13:25:19 bjh21 Exp $
+# $NetBSD: Makefile,v 1.19 2001/07/14 00:23:09 matt Exp $
KDIR= /sys/arch/arm/include
INCSDIR= /usr/include/arm
@@ -18,7 +18,7 @@
param.h pci_machdep.h pio.h proc.h profile.h profileio.h pte.h \
ptrace.h \
reg.h \
- setjmp.h signal.h stdarg.h \
+ setjmp.h signal.h stdarg.h sysarch.h \
trap.h types.h \
varargs.h
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/arm/include/arm32/Makefile
--- a/sys/arch/arm/include/arm32/Makefile Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/arm/include/arm32/Makefile Sat Jul 14 00:23:09 2001 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/06/18 21:37:33 bjh21 Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
KDIR= /sys/arch/arm/include/arm32
INCSDIR= /usr/include/arm/arm32
-INCS= katelib.h pcb.h psl.h sysarch.h frame.h param.h pmap.h rtc.h
+INCS= frame.h katelib.h param.h pcb.h pmap.h psl.h rtc.h
.include <bsd.kinc.mk>
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/arm/include/arm32/sysarch.h
--- a/sys/arch/arm/include/arm32/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $ */
-
-/*
- * Copyright (c) 1996-1997 Mark Brinicombe.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _ARM32_SYSARCH_H_
-#define _ARM32_SYSARCH_H_
-
-/*
- * Architecture specific syscalls (arm32)
- */
-
-#define ARM32_SYNC_ICACHE 0
-#define ARM32_DRAIN_WRITEBUF 1
-
-struct arm32_sync_icache_args {
- u_int addr; /* Virtual start address */
- int len; /* Region size */
-};
-
-#ifndef _KERNEL
-int arm32_sync_icache __P((u_int addr, int len));
-int arm32_drain_writebuf __P((void));
-int sysarch __P((int, void *));
-#endif
-
-#endif /* !_ARM32_SYSARCH_H_ */
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/arm/include/sysarch.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/include/sysarch.h Sat Jul 14 00:23:09 2001 +0000
@@ -0,0 +1,56 @@
+/* $NetBSD: sysarch.h,v 1.1 2001/07/14 00:23:09 matt Exp $ */
+
+/*
+ * Copyright (c) 1996-1997 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Mark Brinicombe.
+ * 4. The name of the company nor the name of the author may be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _ARM_SYSARCH_H_
+#define _ARM_SYSARCH_H_
+
+/*
+ * Architecture specific syscalls (arm32)
+ */
+
+#define ARM32_SYNC_ICACHE 0
+#define ARM32_DRAIN_WRITEBUF 1
+
+struct arm32_sync_icache_args {
+ u_int addr; /* Virtual start address */
+ int len; /* Region size */
+};
+
+#ifndef _KERNEL
+int arm32_sync_icache __P((u_int addr, int len));
+int arm32_drain_writebuf __P((void));
+int sysarch __P((int, void *));
+#endif
+
+#endif /* !_ARM_SYSARCH_H_ */
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/arm32/include/sysarch.h
--- a/sys/arch/arm32/include/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/arm32/include/sysarch.h Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.6 2001/02/23 21:23:51 reinoud Exp $ */
+/* $NetBSD: sysarch.h,v 1.7 2001/07/14 00:23:10 matt Exp $ */
-#include <arm/arm32/sysarch.h>
+#include <arm/sysarch.h>
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/cats/include/Makefile
--- a/sys/arch/cats/include/Makefile Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/cats/include/Makefile Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/23 12:20:28 bjh21 Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
KDIR= /sys/arch/cats/include
INCSDIR= /usr/include/arm/cats
@@ -11,7 +11,6 @@
katelib.h kerndebug.h \
param.h pcb.h pci_machdep.h pmap.h psl.h \
rtc.h \
- sysarch.h \
types.h \
vmparam.h
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/cats/include/sysarch.h
--- a/sys/arch/cats/include/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/06/08 22:23:03 chris Exp $ */
-
-#include <arm/arm32/sysarch.h>
-
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/dnard/include/Makefile
--- a/sys/arch/dnard/include/Makefile Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/dnard/include/Makefile Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/23 12:20:29 bjh21 Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
KDIR= /sys/arch/dnard/include
INCSDIR= /usr/include/arm/dnard
@@ -12,7 +12,7 @@
katelib.h kerndebug.h \
ofisa_machdep.h \
param.h pcb.h pmap.h psl.h \
- scrio.h sysarch.h \
+ scrio.h \
types.h \
vmparam.h
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/dnard/include/sysarch.h
--- a/sys/arch/dnard/include/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/03/04 03:33:50 matt Exp $ */
-
-#include <arm/arm32/sysarch.h>
-
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/hpcarm/include/sysarch.h
--- a/sys/arch/hpcarm/include/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/hpcarm/include/sysarch.h Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.2 2001/02/23 21:23:53 reinoud Exp $ */
+/* $NetBSD: sysarch.h,v 1.3 2001/07/14 00:23:11 matt Exp $ */
-#include <arm/arm32/sysarch.h>
+#include <arm/sysarch.h>
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/netwinder/include/Makefile
--- a/sys/arch/netwinder/include/Makefile Fri Jul 13 23:32:26 2001 +0000
+++ b/sys/arch/netwinder/include/Makefile Sat Jul 14 00:23:09 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/23 12:20:29 bjh21 Exp $
+# $NetBSD: Makefile,v 1.6 2001/07/14 00:23:11 matt Exp $
KDIR= /sys/arch/netwinder/include
INCSDIR= /usr/include/arm/netwinder
@@ -12,7 +12,6 @@
netwinder_boot.h \
param.h pcb.h pci_machdep.h pmap.h psl.h \
rtc.h \
- sysarch.h \
types.h \
vmparam.h
diff -r 4521f4679eb4 -r 83af5ff760b4 sys/arch/netwinder/include/sysarch.h
--- a/sys/arch/netwinder/include/sysarch.h Fri Jul 13 23:32:26 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/04/19 07:11:04 matt Exp $ */
-
-#include <arm/arm32/sysarch.h>
-
Home |
Main Index |
Thread Index |
Old Index