diff options
| -rw-r--r-- | sys/arch/arm/arm/arm32_machdep.c | 3 | ||||
| -rw-r--r-- | sys/arch/arm/arm/db_interface.c | 3 | ||||
| -rw-r--r-- | sys/arch/arm/arm/fault.c | 7 | ||||
| -rw-r--r-- | sys/arch/arm/arm/pmap.c | 3 | ||||
| -rw-r--r-- | sys/arch/arm/include/katelib.h | 99 |
5 files changed, 6 insertions, 109 deletions
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c index ab551548063..f2a1b1d6d0d 100644 --- a/sys/arch/arm/arm/arm32_machdep.c +++ b/sys/arch/arm/arm/arm32_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm32_machdep.c,v 1.20 2006/03/15 21:41:37 deraadt Exp $ */ +/* $OpenBSD: arm32_machdep.c,v 1.21 2006/05/26 17:06:39 miod Exp $ */ /* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */ /* @@ -59,7 +59,6 @@ #include <dev/cons.h> -#include <arm/katelib.h> #include <arm/machdep.h> #include <machine/bootconfig.h> #include <machine/conf.h> diff --git a/sys/arch/arm/arm/db_interface.c b/sys/arch/arm/arm/db_interface.c index c3bbe049581..198a391bd7a 100644 --- a/sys/arch/arm/arm/db_interface.c +++ b/sys/arch/arm/arm/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.4 2005/01/03 16:58:50 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.5 2006/05/26 17:06:39 miod Exp $ */ /* $NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $ */ /* @@ -43,7 +43,6 @@ #include <uvm/uvm_extern.h> #include <arm/db_machdep.h> -#include <arm/katelib.h> #include <arm/undefined.h> #include <ddb/db_access.h> #include <ddb/db_command.h> diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c index a894e95ca28..0ffaf4b4699 100644 --- a/sys/arch/arm/arm/fault.c +++ b/sys/arch/arm/arm/fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fault.c,v 1.7 2006/03/04 10:19:12 miod Exp $ */ +/* $OpenBSD: fault.c,v 1.8 2006/05/26 17:06:39 miod Exp $ */ /* $NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $ */ /* @@ -92,7 +92,6 @@ #include <arm/cpuconf.h> #include <machine/frame.h> -#include <arm/katelib.h> #include <machine/cpu.h> #include <machine/intr.h> #if defined(DDB) || defined(KGDB) @@ -310,7 +309,7 @@ data_abort_handler(trapframe_t *tf) if (user == 0 && (va >= VM_MIN_KERNEL_ADDRESS || (va < VM_MIN_ADDRESS && vector_page == ARM_VECTORS_LOW)) && __predict_true((pcb->pcb_onfault == NULL || - (ReadWord(tf->tf_pc) & 0x05200000) != 0x04200000))) { + ((*(u_int *)tf->tf_pc) & 0x05200000) != 0x04200000))) { map = kernel_map; /* Was the fault due to the FPE/IPKDB ? */ @@ -355,7 +354,7 @@ data_abort_handler(trapframe_t *tf) if (IS_PERMISSION_FAULT(fsr)) ftype = VM_PROT_WRITE; else { - u_int insn = ReadWord(tf->tf_pc); + u_int insn = *(u_int *)tf->tf_pc; if (((insn & 0x0c100000) == 0x04000000) || /* STR/STRB */ ((insn & 0x0e1000b0) == 0x000000b0) || /* STRH/STRD */ diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c index 0721d7c766e..def0947639e 100644 --- a/sys/arch/arm/arm/pmap.c +++ b/sys/arch/arm/arm/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.6 2005/07/18 02:43:24 fgsch Exp $ */ +/* $OpenBSD: pmap.c,v 1.7 2006/05/26 17:06:39 miod Exp $ */ /* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */ /* @@ -205,7 +205,6 @@ #include <machine/pmap.h> #include <machine/pcb.h> #include <machine/param.h> -#include <arm/katelib.h> #include <arm/cpufunc.h> #ifdef PMAP_DEBUG diff --git a/sys/arch/arm/include/katelib.h b/sys/arch/arm/include/katelib.h deleted file mode 100644 index b17905d0ce7..00000000000 --- a/sys/arch/arm/include/katelib.h +++ /dev/null @@ -1,99 +0,0 @@ -/* $OpenBSD: katelib.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ -/* $NetBSD: katelib.h,v 1.3 2001/11/23 19:21:48 thorpej Exp $ */ - -/* - * Copyright (c) 1994-1996 Mark Brinicombe. - * Copyright (c) 1994 Brini. - * All rights reserved. - * - * This code is derived from software written for Brini by Mark Brinicombe - * - * 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 Brini. - * 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 BRINI ``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 BRINI 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. - * - * RiscBSD kernel project - * - * katelib.h - * - * Prototypes for machine specific functions. Most of these - * could be inlined. - * - * This should not really be a separate header file. Eventually I will merge - * this into other header files once I have decided where the declarations - * should go. - * - * Created : 18/09/94 - * - * Based on kate/katelib/prototypes.h - */ - -/* - * USE OF THIS FILE IS DEPRECATED - */ - -#include <sys/types.h> -#include <arm/cpufunc.h> - -#ifdef _KERNEL - -/* Assembly modules */ - -/* In blockio.S */ -#include <arm/blockio.h> - -/* Macros for reading and writing words, shorts, bytes */ - -#define WriteWord(a, b) \ -*((volatile unsigned int *)(a)) = (b) - -#define ReadWord(a) \ -(*((volatile unsigned int *)(a))) - -#define WriteShort(a, b) \ -*((volatile unsigned int *)(a)) = ((b) | ((b) << 16)) - -#define ReadShort(a) \ -((*((volatile unsigned int *)(a))) & 0xffff) - -#define WriteByte(a, b) \ -*((volatile unsigned char *)(a)) = (b) - -#define ReadByte(a) \ -(*((volatile unsigned char *)(a))) - -/* Define in/out macros */ - -#define inb(port) ReadByte((port)) -#define outb(port, byte) WriteByte((port), (byte)) -#define inw(port) ReadShort((port)) -#define outw(port, word) WriteShort((port), (word)) -#define inl(port) ReadWord((port)) -#define outl(port, lword) WriteWord((port), (lword)) - -#endif - -/* End of katelib.h */ |