Module Name: src
Committed By: skrll
Date: Sat Oct 25 10:58:12 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: ad.aarch64 ad.arm
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/acorn32/podulebus: asc.c cosc.c esc.c if_ie.c netslot.c
podulebus.c sfas.c
src/sys/arch/arm/arm32: arm32_machdep.c db_interface.c fault.c pmap.c
src/sys/arch/arm/include/arm32: Makefile
src/sys/arch/arm/iomd: iomd_irqhandler.c vidc20config.c vidcaudio.c
src/sys/arch/hpcarm/dev: ipaq_lcd.c
Removed Files:
src/sys/arch/arm/include/arm32: katelib.h
Log Message:
Remove katelib.h and references to it.
{Read,Write}{Word,Byte} macros are provided in the files that still use
them. Someone(tm) should convert them to bus_space(9)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn32/podulebus/asc.c \
src/sys/arch/acorn32/podulebus/cosc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/podulebus/esc.c \
src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn32/podulebus/netslot.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/sfas.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm32/db_interface.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.304 -r1.305 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/arm32/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/include/arm32/katelib.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/iomd/iomd_irqhandler.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/iomd/vidc20config.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/iomd/vidcaudio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/dev/ipaq_lcd.c
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/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.6 src/distrib/sets/lists/comp/ad.aarch64:1.7
--- src/distrib/sets/lists/comp/ad.aarch64:1.6 Wed Oct 22 16:51:31 2014
+++ src/distrib/sets/lists/comp/ad.aarch64 Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2014/10/22 16:51:31 christos Exp $
+# $NetBSD: ad.aarch64,v 1.7 2014/10/25 10:58:12 skrll Exp $
./usr/include/aarch64 comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@@ -56,7 +56,7 @@
./usr/include/arm/arm26/types.h comp-c-include
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/frame.h comp-c-include
-./usr/include/arm/arm32/katelib.h comp-c-include
+./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.62 src/distrib/sets/lists/comp/ad.arm:1.63
--- src/distrib/sets/lists/comp/ad.arm:1.62 Wed Oct 22 16:51:31 2014
+++ src/distrib/sets/lists/comp/ad.arm Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.62 2014/10/22 16:51:31 christos Exp $
+# $NetBSD: ad.arm,v 1.63 2014/10/25 10:58:12 skrll Exp $
./usr/include/acorn26 comp-c-include
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
@@ -115,7 +115,7 @@
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/bus.h comp-obsolete obsolete
./usr/include/arm/arm32/frame.h comp-c-include
-./usr/include/arm/arm32/katelib.h comp-c-include
+./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.89 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.90
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.89 Sat Sep 13 17:36:41 2014
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -85,7 +85,6 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.
#include <arm/locore.h>
#include <arm/undefined.h>
-#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <arm/arm32/pmap.h>
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.27 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.28
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.27 Sat Sep 13 17:36:42 2014
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.27 2014/09/13 17:36:42 matt Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.27 2014/09/13 17:36:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: eb7500atx_ma
#include <machine/signal.h>
#include <machine/bootconfig.h>
#include <machine/io.h>
-#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <machine/rtc.h>
Index: src/sys/arch/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.55 src/sys/arch/acorn32/mainbus/fd.c:1.56
--- src/sys/arch/acorn32/mainbus/fd.c:1.55 Fri Jul 25 08:10:31 2014
+++ src/sys/arch/acorn32/mainbus/fd.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.55 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.55 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $");
#include "opt_ddb.h"
@@ -113,7 +113,6 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.55
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <arm/arm32/katelib.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>
Index: src/sys/arch/acorn32/podulebus/asc.c
diff -u src/sys/arch/acorn32/podulebus/asc.c:1.19 src/sys/arch/acorn32/podulebus/asc.c:1.20
--- src/sys/arch/acorn32/podulebus/asc.c:1.19 Sat Oct 27 17:17:23 2012
+++ src/sys/arch/acorn32/podulebus/asc.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.19 2012/10/27 17:17:23 chs Exp $ */
+/* $NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@@ -98,7 +98,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.19 2012/10/27 17:17:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -115,8 +115,6 @@ __KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.19
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
-#include <arm/arm32/katelib.h>
-
#include <dev/podulebus/podules.h>
#include <dev/podulebus/powerromreg.h>
Index: src/sys/arch/acorn32/podulebus/cosc.c
diff -u src/sys/arch/acorn32/podulebus/cosc.c:1.19 src/sys/arch/acorn32/podulebus/cosc.c:1.20
--- src/sys/arch/acorn32/podulebus/cosc.c:1.19 Tue Jan 21 19:46:45 2014
+++ src/sys/arch/acorn32/podulebus/cosc.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cosc.c,v 1.19 2014/01/21 19:46:45 christos Exp $ */
+/* $NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.19 2014/01/21 19:46:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.1
#include <machine/bootconfig.h>
#include <machine/io.h>
#include <machine/intr.h>
-#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/escreg.h>
#include <acorn32/podulebus/escvar.h>
Index: src/sys/arch/acorn32/podulebus/esc.c
diff -u src/sys/arch/acorn32/podulebus/esc.c:1.28 src/sys/arch/acorn32/podulebus/esc.c:1.29
--- src/sys/arch/acorn32/podulebus/esc.c:1.28 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/acorn32/podulebus/esc.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: esc.c,v 1.29 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.29 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28
#include <machine/cpu.h>
#include <machine/io.h>
#include <machine/intr.h>
-#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/escreg.h>
#include <acorn32/podulebus/escvar.h>
Index: src/sys/arch/acorn32/podulebus/podulebus.c
diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.28 src/sys/arch/acorn32/podulebus/podulebus.c:1.29
--- src/sys/arch/acorn32/podulebus/podulebus.c:1.28 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/acorn32/podulebus/podulebus.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: podulebus.c,v 1.29 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.29 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: podulebus.c,
#include <sys/device.h>
#include <uvm/uvm_extern.h>
#include <machine/io.h>
-#include <arm/arm32/katelib.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
#include <machine/pmap.h>
@@ -64,6 +63,11 @@ __KERNEL_RCSID(0, "$NetBSD: podulebus.c,
#include "locators.h"
+#define WriteByte(a, b) \
+ *((volatile unsigned char *)(a)) = (b)
+#define ReadByte(a) \
+ (*((volatile unsigned char *)(a)))
+
/* Array of podule structures, one per possible podule */
podule_t podules[MAX_PODULES + MAX_NETSLOTS];
Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.33 src/sys/arch/acorn32/podulebus/if_ie.c:1.34
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.33 Sat Oct 18 08:33:24 2014
+++ src/sys/arch/acorn32/podulebus/if_ie.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.33 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.33 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
#include <sys/device.h>
#include <machine/io.h>
#include <machine/intr.h>
-#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
Index: src/sys/arch/acorn32/podulebus/netslot.c
diff -u src/sys/arch/acorn32/podulebus/netslot.c:1.10 src/sys/arch/acorn32/podulebus/netslot.c:1.11
--- src/sys/arch/acorn32/podulebus/netslot.c:1.10 Thu May 10 10:27:10 2012
+++ src/sys/arch/acorn32/podulebus/netslot.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $ */
+/* $NetBSD: netslot.c,v 1.11 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -35,7 +35,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.11 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -44,7 +44,6 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v
#include <sys/device.h>
#include <uvm/uvm_extern.h>
#include <machine/io.h>
-#include <arm/arm32/katelib.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
#include <arm/iomd/iomdreg.h>
@@ -52,6 +51,11 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
+#define WriteByte(a, b) \
+ *((volatile unsigned char *)(a)) = (b)
+#define ReadByte(a) \
+ (*((volatile unsigned char *)(a)))
+
u_int netslotread(u_int, int);
u_int
Index: src/sys/arch/acorn32/podulebus/sfas.c
diff -u src/sys/arch/acorn32/podulebus/sfas.c:1.25 src/sys/arch/acorn32/podulebus/sfas.c:1.26
--- src/sys/arch/acorn32/podulebus/sfas.c:1.25 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/acorn32/podulebus/sfas.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: sfas.c,v 1.26 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.26 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.2
#include <machine/cpu.h>
#include <machine/io.h>
#include <machine/intr.h>
-#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/sfasreg.h>
#include <acorn32/podulebus/sfasvar.h>
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.105 src/sys/arch/arm/arm32/arm32_machdep.c:1.106
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.105 Mon May 19 22:47:53 2014
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.105 2014/05/19 22:47:53 rmind Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.105 2014/05/19 22:47:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machde
#include <arm/locore.h>
-#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <machine/bootconfig.h>
Index: src/sys/arch/arm/arm32/db_interface.c
diff -u src/sys/arch/arm/arm32/db_interface.c:1.52 src/sys/arch/arm/arm32/db_interface.c:1.53
--- src/sys/arch/arm/arm32/db_interface.c:1.52 Sun Mar 30 08:00:34 2014
+++ src/sys/arch/arm/arm32/db_interface.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.52 2014/03/30 08:00:34 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.52 2014/03/30 08:00:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
#include <uvm/uvm_extern.h>
#include <arm/arm32/db_machdep.h>
-#include <arm/arm32/katelib.h>
#include <arm/undefined.h>
#include <ddb/db_access.h>
#include <ddb/db_command.h>
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.101 src/sys/arch/arm/arm32/fault.c:1.102
--- src/sys/arch/arm/arm32/fault.c:1.101 Wed Aug 13 21:41:32 2014
+++ src/sys/arch/arm/arm32/fault.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $ */
+/* $NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include "opt_kgdb.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,8 +99,6 @@ __KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.
#include <arm/locore.h>
-#include <arm/arm32/katelib.h>
-
#include <machine/pcb.h>
#if defined(DDB) || defined(KGDB)
#include <machine/db_machdep.h>
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.304 src/sys/arch/arm/arm32/pmap.c:1.305
--- src/sys/arch/arm/arm32/pmap.c:1.304 Mon Oct 20 07:13:27 2014
+++ src/sys/arch/arm/arm32/pmap.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.304 2014/10/20 07:13:27 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.305 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -214,9 +214,8 @@
#include <uvm/uvm.h>
#include <arm/locore.h>
-//#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.304 2014/10/20 07:13:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.305 2014/10/25 10:58:12 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
Index: src/sys/arch/arm/include/arm32/Makefile
diff -u src/sys/arch/arm/include/arm32/Makefile:1.9 src/sys/arch/arm/include/arm32/Makefile:1.10
--- src/sys/arch/arm/include/arm32/Makefile:1.9 Tue Nov 26 23:30:12 2002
+++ src/sys/arch/arm/include/arm32/Makefile Sat Oct 25 10:58:12 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/11/26 23:30:12 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2014/10/25 10:58:12 skrll Exp $
INCSDIR= /usr/include/arm/arm32
-INCS= frame.h katelib.h param.h pmap.h psl.h pte.h rtc.h types.h vmparam.h
+INCS= frame.h param.h pmap.h psl.h pte.h rtc.h types.h vmparam.h
.include <bsd.kinc.mk>
Index: src/sys/arch/arm/iomd/iomd_irqhandler.c
diff -u src/sys/arch/arm/iomd/iomd_irqhandler.c:1.21 src/sys/arch/arm/iomd/iomd_irqhandler.c:1.22
--- src/sys/arch/arm/iomd/iomd_irqhandler.c:1.21 Sun Sep 21 15:46:44 2014
+++ src/sys/arch/arm/iomd/iomd_irqhandler.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_irqhandler.c,v 1.21 2014/09/21 15:46:44 christos Exp $ */
+/* $NetBSD: iomd_irqhandler.c,v 1.22 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.21 2014/09/21 15:46:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.22 2014/10/25 10:58:12 skrll Exp $");
#include "opt_irqstats.h"
@@ -49,12 +49,12 @@ __KERNEL_RCSID(0, "$NetBSD: iomd_irqhand
#include <sys/syslog.h>
#include <sys/malloc.h>
+#include <arm/cpufunc.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>
#include <machine/intr.h>
#include <machine/cpu.h>
-#include <arm/arm32/katelib.h>
irqhandler_t *irqhandlers[NIRQS];
Index: src/sys/arch/arm/iomd/vidc20config.c
diff -u src/sys/arch/arm/iomd/vidc20config.c:1.33 src/sys/arch/arm/iomd/vidc20config.c:1.34
--- src/sys/arch/arm/iomd/vidc20config.c:1.33 Sat Oct 18 08:33:24 2014
+++ src/sys/arch/arm/iomd/vidc20config.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vidc20config.c,v 1.33 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: vidc20config.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@@ -48,12 +48,11 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.33 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <arm/iomd/vidc.h>
-#include <arm/arm32/katelib.h>
#include <machine/bootconfig.h>
#include <machine/intr.h>
@@ -65,6 +64,11 @@ __KERNEL_RCSID(0, "$NetBSD: vidc20config
#include <arm/iomd/iomdvar.h>
#include <arm/iomd/vidc20config.h>
+#define WriteWord(a, b) \
+*((volatile unsigned int *)(a)) = (b)
+
+#define ReadWord(a) \
+(*((volatile unsigned int *)(a)))
/*
* A structure containing ALL the information required to restore
Index: src/sys/arch/arm/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.52 src/sys/arch/arm/iomd/vidcaudio.c:1.53
--- src/sys/arch/arm/iomd/vidcaudio.c:1.52 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/arm/iomd/vidcaudio.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: vidcaudio.c,v 1.53 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,7 +65,7 @@
#include <sys/param.h> /* proc.h */
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.53 2014/10/25 10:58:12 skrll Exp $");
#include <sys/audioio.h>
#include <sys/conf.h> /* autoconfig functions */
@@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,
#include <machine/intr.h>
#include <machine/machdep.h>
-#include <arm/arm32/katelib.h>
#include <arm/iomd/vidcaudiovar.h>
#include <arm/iomd/iomdreg.h>
@@ -105,6 +104,12 @@ extern int *vidc_base;
#define DPRINTF(x)
#endif
+#define WriteWord(a, b) \
+*((volatile unsigned int *)(a)) = (b)
+
+#define ReadWord(a) \
+(*((volatile unsigned int *)(a)))
+
struct vidcaudio_softc {
device_t sc_dev;
Index: src/sys/arch/hpcarm/dev/ipaq_lcd.c
diff -u src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.19 src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.20
--- src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.19 Tue Jul 19 15:37:38 2011
+++ src/sys/arch/hpcarm/dev/ipaq_lcd.c Sat Oct 25 10:58:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $ */
+/* $NetBSD: ipaq_lcd.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#define IPAQ_LCD_DEBUG
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v
#include <machine/bootinfo.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
-#include <arm/arm32/katelib.h>
#include <arm/sa11x0/sa11x0_reg.h>
#include <arm/sa11x0/sa11x0_gpioreg.h>
