Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Merge arm32/dev/bus_space_notimpl.S and hpcarm/hpca...
details: https://anonhg.NetBSD.org/src/rev/9a5b295f7cd0
branches: trunk
changeset: 511380:9a5b295f7cd0
user: bjh21 <bjh21%NetBSD.org@localhost>
date: Mon Jun 18 22:26:15 2001 +0000
description:
Merge arm32/dev/bus_space_notimpl.S and hpcarm/hpcarm/bus_space_notimpl.S
into arm/arm/bus_space_notimpl.S. They were identical anyway.
This file has no excuse for being in assembler, but I'll leave that for another
day.
diffstat:
sys/arch/arm/arm/bus_space_notimpl.S | 152 +++++++++++++++++++++++++++++
sys/arch/arm/conf/files.arm | 3 +-
sys/arch/arm32/conf/files.arm32 | 3 +-
sys/arch/arm32/dev/bus_space_notimpl.S | 152 -----------------------------
sys/arch/cats/conf/files.cats | 4 +-
sys/arch/dnard/conf/files.dnard | 4 +-
sys/arch/hpcarm/conf/files.hpcarm | 3 +-
sys/arch/hpcarm/hpcarm/bus_space_notimpl.S | 152 -----------------------------
sys/arch/netwinder/conf/files.netwinder | 3 +-
9 files changed, 159 insertions(+), 317 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r 6061a282819e -r 9a5b295f7cd0 sys/arch/arm/arm/bus_space_notimpl.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/arm/bus_space_notimpl.S Mon Jun 18 22:26:15 2001 +0000
@@ -0,0 +1,152 @@
+/* $NetBSD: bus_space_notimpl.S,v 1.1 2001/06/18 22:26:15 bjh21 Exp $ */
+
+/*
+ * Copyright (c) 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 THE 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 THE 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.
+ */
+
+#include <machine/asm.h>
+
+/*
+ * BUS_SPACE - name of this bus space
+ */
+
+#define BUS_SPACE bs_notimpl
+
+#define __C(x,y) __CONCAT(x,y)
+#define __S(s) __STRING(s)
+#define NAME(func) __C(BUS_SPACE,__C(_bs_,func))
+#define LNAME(func) __C(L,NAME(func))
+
+#define __L(x) _C_LABEL(x)
+#define GLOBAL(func) .global __L(NAME(func))
+#define LABEL(func) __L(NAME(func)):
+#define LLABEL(func) LNAME(func):
+
+#define FTEXT(func,text) __S(__C(NAME(func),text))
+
+
+#define NOT_IMPL(func) \
+ GLOBAL(func) ; \
+LABEL(func) ; \
+ stmfd sp!, {r0-r3} ; \
+ adr r0, LNAME(__C(func,_text)) ; \
+ mov r1, sp ; \
+ b _C_LABEL(panic) ; \
+ ; \
+LLABEL(__C(func,_text)) ; \
+ .asciz FTEXT(func,: args at 0x%08x\n) ; \
+ .align 0 ;
+
+
+/*
+ * Generic bus_space I/O functions
+ */
+
+/*
+ * read single
+ */
+
+NOT_IMPL(r_1)
+NOT_IMPL(r_2)
+NOT_IMPL(r_4)
+NOT_IMPL(r_8)
+
+/*
+ * write single
+ */
+
+NOT_IMPL(w_1)
+NOT_IMPL(w_2)
+NOT_IMPL(w_4)
+NOT_IMPL(w_8)
+
+/*
+ * read multiple
+ */
+
+NOT_IMPL(rm_1)
+NOT_IMPL(rm_2)
+NOT_IMPL(rm_4)
+NOT_IMPL(rm_8)
+
+/*
+ * write multiple
+ */
+
+NOT_IMPL(wm_1)
+NOT_IMPL(wm_2)
+NOT_IMPL(wm_4)
+NOT_IMPL(wm_8)
+
+/*
+ * read region
+ */
+
+NOT_IMPL(rr_1)
+NOT_IMPL(rr_2)
+NOT_IMPL(rr_4)
+NOT_IMPL(rr_8)
+
+/*
+ * write region
+ */
+
+NOT_IMPL(wr_1)
+NOT_IMPL(wr_2)
+NOT_IMPL(wr_4)
+NOT_IMPL(wr_8)
+
+/*
+ * set multiple
+ */
+
+NOT_IMPL(sm_1)
+NOT_IMPL(sm_2)
+NOT_IMPL(sm_4)
+NOT_IMPL(sm_8)
+
+/*
+ * set region
+ */
+
+NOT_IMPL(sr_1)
+NOT_IMPL(sr_2)
+NOT_IMPL(sr_4)
+NOT_IMPL(sr_8)
+
+/*
+ * copy
+ */
+
+NOT_IMPL(c_1)
+NOT_IMPL(c_2)
+NOT_IMPL(c_4)
+NOT_IMPL(c_8)
diff -r 6061a282819e -r 9a5b295f7cd0 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm Mon Jun 18 22:24:03 2001 +0000
+++ b/sys/arch/arm/conf/files.arm Mon Jun 18 22:26:15 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.31 2001/06/05 09:25:06 bjh21 Exp $
+# $NetBSD: files.arm,v 1.32 2001/06/18 22:26:15 bjh21 Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defopt ARM32
@@ -47,6 +47,7 @@
file arch/arm/arm/arm_machdep.c
file arch/arm/arm/blockio.S
file arch/arm/arm/bootconfig.c
+file arch/arm/arm/bus_space_notimpl.S arm32
file arch/arm/arm/compat_13_machdep.c compat_13
file arch/arm/arm/cpufunc.c
file arch/arm/arm/cpufunc_asm.S
diff -r 6061a282819e -r 9a5b295f7cd0 sys/arch/arm32/conf/files.arm32
--- a/sys/arch/arm32/conf/files.arm32 Mon Jun 18 22:24:03 2001 +0000
+++ b/sys/arch/arm32/conf/files.arm32 Mon Jun 18 22:26:15 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm32,v 1.116 2001/06/18 20:49:14 bjh21 Exp $
+# $NetBSD: files.arm32,v 1.117 2001/06/18 22:26:15 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@@ -359,7 +359,6 @@
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/intr.c
-file arch/arm32/dev/bus_space_notimpl.S
file arch/arm/arm/disksubr.c disk
file arch/arm/arm/disksubr_acorn.c disk
diff -r 6061a282819e -r 9a5b295f7cd0 sys/arch/arm32/dev/bus_space_notimpl.S
--- a/sys/arch/arm32/dev/bus_space_notimpl.S Mon Jun 18 22:24:03 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/* $NetBSD: bus_space_notimpl.S,v 1.6 1999/11/03 22:13:20 mycroft Exp $ */
-
-/*
- * Copyright (c) 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 THE 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 THE 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.
- */
-
-#include <machine/asm.h>
-
-/*
- * BUS_SPACE - name of this bus space
- */
-
-#define BUS_SPACE bs_notimpl
-
-#define __C(x,y) __CONCAT(x,y)
-#define __S(s) __STRING(s)
-#define NAME(func) __C(BUS_SPACE,__C(_bs_,func))
-#define LNAME(func) __C(L,NAME(func))
-
-#define __L(x) _C_LABEL(x)
-#define GLOBAL(func) .global __L(NAME(func))
-#define LABEL(func) __L(NAME(func)):
-#define LLABEL(func) LNAME(func):
-
-#define FTEXT(func,text) __S(__C(NAME(func),text))
-
-
-#define NOT_IMPL(func) \
- GLOBAL(func) ; \
-LABEL(func) ; \
- stmfd sp!, {r0-r3} ; \
- adr r0, LNAME(__C(func,_text)) ; \
- mov r1, sp ; \
- b _C_LABEL(panic) ; \
- ; \
-LLABEL(__C(func,_text)) ; \
- .asciz FTEXT(func,: args at 0x%08x\n) ; \
- .align 0 ;
-
-
-/*
- * Generic bus_space I/O functions
- */
-
-/*
- * read single
- */
-
-NOT_IMPL(r_1)
-NOT_IMPL(r_2)
-NOT_IMPL(r_4)
-NOT_IMPL(r_8)
-
-/*
- * write single
- */
-
-NOT_IMPL(w_1)
-NOT_IMPL(w_2)
-NOT_IMPL(w_4)
-NOT_IMPL(w_8)
-
-/*
- * read multiple
- */
-
-NOT_IMPL(rm_1)
-NOT_IMPL(rm_2)
-NOT_IMPL(rm_4)
-NOT_IMPL(rm_8)
-
-/*
- * write multiple
- */
-
-NOT_IMPL(wm_1)
-NOT_IMPL(wm_2)
-NOT_IMPL(wm_4)
Home |
Main Index |
Thread Index |
Old Index