[src/trunk]: src/sys/arch/zaurus Change <machine/bus.h> to <sys/bus.h> throug...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/zaurus Change <machine/bus.h> to <sys/bus.h> throug...
From: dyoung <dyoung%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:50:50 +0000

details:   https://anonhg.NetBSD.org/src/rev/d3870aba39b8
branches:  trunk
changeset: 767468:d3870aba39b8
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Jul 19 15:11:49 2011 +0000

description:
Change <machine/bus.h> to <sys/bus.h> throughout.

Split bus.h -> bus_{defs,funcs}.h.

diffstat:

 sys/arch/zaurus/dev/scoop.c         |  7 +++----
 sys/arch/zaurus/dev/zlcd.c          |  6 +++---
 sys/arch/zaurus/dev/zssp.c          |  7 +++----
 sys/arch/zaurus/dev/zusb.c          |  6 +++---
 sys/arch/zaurus/include/Makefile    |  4 ++--
 sys/arch/zaurus/include/bus.h       |  3 ---
 sys/arch/zaurus/include/bus_defs.h  |  3 +++
 sys/arch/zaurus/include/bus_funcs.h |  3 +++
 sys/arch/zaurus/zaurus/machdep.c    |  6 +++---
 9 files changed, 23 insertions(+), 22 deletions(-)

diffs (185 lines):

diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/dev/scoop.c
--- a/sys/arch/zaurus/dev/scoop.c       Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/dev/scoop.c       Tue Jul 19 15:11:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $ */
+/*     $NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $ */
 /*     $OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $   */
 
 /*
@@ -18,15 +18,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/gpio.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0var.h>
 
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/dev/zlcd.c
--- a/sys/arch/zaurus/dev/zlcd.c        Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/dev/zlcd.c        Tue Jul 19 15:11:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $ */
+/*     $NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $ */
 /*     $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $    */
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,13 +43,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 #include <dev/wscons/wsconsio.h>
@@ -58,7 +59,6 @@
 
 #include <dev/hpc/hpcfbio.h>
 
-#include <machine/bus.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0_lcd.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/dev/zssp.c
--- a/sys/arch/zaurus/dev/zssp.c        Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/dev/zssp.c        Tue Jul 19 15:11:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $ */
+/*     $NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $ */
 /*     $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $      */
 
 /*
@@ -18,13 +18,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/dev/zusb.c
--- a/sys/arch/zaurus/dev/zusb.c        Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/dev/zusb.c        Tue Jul 19 15:11:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $  */
+/*     $NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $  */
 
 /*
  * Copyright (c) 2008 Christopher Gilbert
@@ -27,18 +27,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 
 #include <zaurus/zaurus/zaurus_reg.h>
 #include <zaurus/zaurus/zaurus_var.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/include/Makefile
--- a/sys/arch/zaurus/include/Makefile  Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/include/Makefile  Tue Jul 19 15:11:49 2011 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.6 2011/07/17 20:54:49 joerg Exp $
+#      $NetBSD: Makefile,v 1.7 2011/07/19 15:11:49 dyoung Exp $
 
 INCSDIR= /usr/include/zaurus
 
 INCS=  ansi.h aout_machdep.h apmvar.h asm.h \
-       bswap.h bus.h \
+       bswap.h \
        cdefs.h cpu.h \
        disklabel.h \
        elf_machdep.h endian.h endian_machdep.h \
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/include/bus.h
--- a/sys/arch/zaurus/include/bus.h     Tue Jul 19 15:08:55 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: bus.h,v 1.1 2006/12/16 05:43:36 ober Exp $     */
-
-#include <arm/bus.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/include/bus_defs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/zaurus/include/bus_defs.h        Tue Jul 19 15:11:49 2011 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:11:49 dyoung Exp $      */
+
+#include <arm/bus_defs.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/include/bus_funcs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/zaurus/include/bus_funcs.h       Tue Jul 19 15:11:49 2011 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:11:49 dyoung Exp $     */
+
+#include <arm/bus_funcs.h>
diff -r 28043f40c37b -r d3870aba39b8 sys/arch/zaurus/zaurus/machdep.c
--- a/sys/arch/zaurus/zaurus/machdep.c  Tue Jul 19 15:08:55 2011 +0000
+++ b/sys/arch/zaurus/zaurus/machdep.c  Tue Jul 19 15:11:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.25 2011/06/30 20:09:38 wiz Exp $ */
+/*     $NetBSD: machdep.c,v 1.26 2011/07/19 15:11:49 dyoung Exp $      */
 /*     $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $        */
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2011/06/30 20:09:38 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2011/07/19 15:11:49 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -138,6 +138,7 @@
 #include <dev/cons.h>
 #include <sys/conf.h>
 #include <sys/queue.h>
+#include <sys/bus.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
@@ -148,7 +149,6 @@
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
-#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #ifdef KLOADER

Prev by Date: [src/trunk]: src/distrib/sets/lists/comp Make shark/bus.h obsolete.
Next by Date: [src/trunk]: src/distrib/sets/lists/comp Mark zaurus/bus.h obsolete.
Previous by Thread: [src/trunk]: src/distrib/sets/lists/comp Make shark/bus.h obsolete.
Next by Thread: [src/trunk]: src/distrib/sets/lists/comp Mark zaurus/bus.h obsolete.
Indexes:

Home | Main Index | Thread Index | Old Index