Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove katelib.h and references to it.



details:   https://anonhg.NetBSD.org/src/rev/95b6d79819ca
branches:  trunk
changeset: 803390:95b6d79819ca
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Oct 25 10:58:12 2014 +0000

description:
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)

diffstat:

 distrib/sets/lists/comp/ad.aarch64             |   4 +-
 distrib/sets/lists/comp/ad.arm                 |   4 +-
 sys/arch/acorn32/acorn32/rpc_machdep.c         |   5 +-
 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c |   5 +-
 sys/arch/acorn32/mainbus/fd.c                  |   5 +-
 sys/arch/acorn32/podulebus/asc.c               |   6 +-
 sys/arch/acorn32/podulebus/cosc.c              |   5 +-
 sys/arch/acorn32/podulebus/esc.c               |   5 +-
 sys/arch/acorn32/podulebus/if_ie.c             |   5 +-
 sys/arch/acorn32/podulebus/netslot.c           |  10 +-
 sys/arch/acorn32/podulebus/podulebus.c         |  10 +-
 sys/arch/acorn32/podulebus/sfas.c              |   5 +-
 sys/arch/arm/arm32/arm32_machdep.c             |   5 +-
 sys/arch/arm/arm32/db_interface.c              |   5 +-
 sys/arch/arm/arm32/fault.c                     |   6 +-
 sys/arch/arm/arm32/pmap.c                      |   7 +-
 sys/arch/arm/include/arm32/Makefile            |   4 +-
 sys/arch/arm/include/arm32/katelib.h           |  98 --------------------------
 sys/arch/arm/iomd/iomd_irqhandler.c            |   6 +-
 sys/arch/arm/iomd/vidc20config.c               |  10 +-
 sys/arch/arm/iomd/vidcaudio.c                  |  11 ++-
 sys/arch/hpcarm/dev/ipaq_lcd.c                 |   5 +-
 22 files changed, 65 insertions(+), 161 deletions(-)

diffs (truncated from 668 to 300 lines):

diff -r 581b00c9455c -r 95b6d79819ca distrib/sets/lists/comp/ad.aarch64
--- a/distrib/sets/lists/comp/ad.aarch64        Sat Oct 25 00:57:59 2014 +0000
+++ b/distrib/sets/lists/comp/ad.aarch64        Sat Oct 25 10:58:12 2014 +0000
@@ -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
diff -r 581b00c9455c -r 95b6d79819ca distrib/sets/lists/comp/ad.arm
--- a/distrib/sets/lists/comp/ad.arm    Sat Oct 25 00:57:59 2014 +0000
+++ b/distrib/sets/lists/comp/ad.arm    Sat Oct 25 10:58:12 2014 +0000
@@ -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
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c    Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c    Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 
 #include <arm/locore.h>
 #include <arm/undefined.h>
-#include <arm/arm32/katelib.h>
 #include <arm/arm32/machdep.h>
 #include <arm/arm32/pmap.h>
 
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
 
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/asc.c
--- a/sys/arch/acorn32/podulebus/asc.c  Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/asc.c  Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
 
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/cosc.c
--- a/sys/arch/acorn32/podulebus/cosc.c Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/cosc.c Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/esc.c
--- a/sys/arch/acorn32/podulebus/esc.c  Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/esc.c  Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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>
 
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/netslot.c
--- a/sys/arch/acorn32/podulebus/netslot.c      Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/netslot.c      Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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 @@
 #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
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c    Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c    Sat Oct 25 10:58:12 2014 +0000
@@ -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 @@
 #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 @@
 
 #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];
diff -r 581b00c9455c -r 95b6d79819ca sys/arch/acorn32/podulebus/sfas.c
--- a/sys/arch/acorn32/podulebus/sfas.c Sat Oct 25 00:57:59 2014 +0000
+++ b/sys/arch/acorn32/podulebus/sfas.c Sat Oct 25 10:58:12 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $   */



Home | Main Index | Thread Index | Old Index