Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:11:49 UTC 2011
Modified Files:
src/sys/arch/zaurus/dev: scoop.c zlcd.c zssp.c zusb.c
src/sys/arch/zaurus/include: Makefile
src/sys/arch/zaurus/zaurus: machdep.c
Added Files:
src/sys/arch/zaurus/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/zaurus/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/scoop.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/dev/zusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/zaurus/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/include/bus_defs.h \
src/sys/arch/zaurus/include/bus_funcs.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/zaurus/zaurus/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/scoop.c
diff -u src/sys/arch/zaurus/dev/scoop.c:1.8 src/sys/arch/zaurus/dev/scoop.c:1.9
--- src/sys/arch/zaurus/dev/scoop.c:1.8 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/scoop.c Tue Jul 19 15:11:49 2011
@@ -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>
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.14 src/sys/arch/zaurus/dev/zlcd.c:1.15
--- src/sys/arch/zaurus/dev/zlcd.c:1.14 Tue Jun 21 18:13:19 2011
+++ src/sys/arch/zaurus/dev/zlcd.c Tue Jul 19 15:11:49 2011
@@ -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>
Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.10 src/sys/arch/zaurus/dev/zssp.c:1.11
--- src/sys/arch/zaurus/dev/zssp.c:1.10 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zssp.c Tue Jul 19 15:11:49 2011
@@ -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>
Index: src/sys/arch/zaurus/dev/zusb.c
diff -u src/sys/arch/zaurus/dev/zusb.c:1.5 src/sys/arch/zaurus/dev/zusb.c:1.6
--- src/sys/arch/zaurus/dev/zusb.c:1.5 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zusb.c Tue Jul 19 15:11:49 2011
@@ -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>
Index: src/sys/arch/zaurus/include/Makefile
diff -u src/sys/arch/zaurus/include/Makefile:1.6 src/sys/arch/zaurus/include/Makefile:1.7
--- src/sys/arch/zaurus/include/Makefile:1.6 Sun Jul 17 20:54:49 2011
+++ src/sys/arch/zaurus/include/Makefile Tue Jul 19 15:11:49 2011
@@ -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 \
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.25 src/sys/arch/zaurus/zaurus/machdep.c:1.26
--- src/sys/arch/zaurus/zaurus/machdep.c:1.25 Thu Jun 30 20:09:38 2011
+++ src/sys/arch/zaurus/zaurus/machdep.c Tue Jul 19 15:11:49 2011
@@ -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
Added files:
Index: src/sys/arch/zaurus/include/bus_defs.h
diff -u /dev/null src/sys/arch/zaurus/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:11:50 2011
+++ src/sys/arch/zaurus/include/bus_defs.h Tue Jul 19 15:11:49 2011
@@ -0,0 +1,3 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:11:49 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
Index: src/sys/arch/zaurus/include/bus_funcs.h
diff -u /dev/null src/sys/arch/zaurus/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:11:50 2011
+++ src/sys/arch/zaurus/include/bus_funcs.h Tue Jul 19 15:11:49 2011
@@ -0,0 +1,3 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:11:49 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
