Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:37:40 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.hpcarm
src/sys/arch/hpcarm/dev: ipaq_atmelgpio.c ipaq_lcd.c ipaq_lcdvar.h
ipaq_pcic.c ipaq_saip.c j720pcic.c sacc_hpcarm.c sed_saip.c
uda1341.c wzero3_kbd.c wzero3_keypad.c wzero3_lcd.c wzero3_mci.c
wzero3_usb.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
src/sys/arch/hpcarm/include: Makefile
Added Files:
src/sys/arch/hpcarm/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/hpcarm/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark hpcarm/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.hpcarm
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/dev/ipaq_lcd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/dev/ipaq_lcdvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/dev/ipaq_pcic.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcarm/dev/ipaq_saip.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcarm/dev/j720pcic.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcarm/dev/sacc_hpcarm.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpcarm/dev/sed_saip.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcarm/dev/uda1341.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/dev/wzero3_kbd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/dev/wzero3_keypad.c \
src/sys/arch/hpcarm/dev/wzero3_usb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/dev/wzero3_lcd.c \
src/sys/arch/hpcarm/dev/wzero3_mci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/include/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/hpcarm/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/include/bus_defs.h \
src/sys/arch/hpcarm/include/bus_funcs.h
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/md.hpcarm
diff -u src/distrib/sets/lists/comp/md.hpcarm:1.16 src/distrib/sets/lists/comp/md.hpcarm:1.17
--- src/distrib/sets/lists/comp/md.hpcarm:1.16 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/md.hpcarm Tue Jul 19 15:37:38 2011
@@ -1,11 +1,11 @@
-# $NetBSD: md.hpcarm,v 1.16 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.hpcarm,v 1.17 2011/07/19 15:37:38 dyoung Exp $
./usr/include/hpcarm comp-c-include
./usr/include/hpcarm/ansi.h comp-c-include
./usr/include/hpcarm/aout_machdep.h comp-c-include
./usr/include/hpcarm/apmvar.h comp-c-include
./usr/include/hpcarm/asm.h comp-c-include
./usr/include/hpcarm/bswap.h comp-c-include
-./usr/include/hpcarm/bus.h comp-c-include
+./usr/include/hpcarm/bus.h comp-obsolete obsolete
./usr/include/hpcarm/cdefs.h comp-c-include
./usr/include/hpcarm/cpu.h comp-c-include
./usr/include/hpcarm/db_machdep.h comp-obsolete obsolete
Index: src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
diff -u src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.15 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.16
--- src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.15 Fri May 29 14:15:44 2009
+++ src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,7 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <hpcarm/dev/ipaq_saipvar.h>
#include <hpcarm/dev/ipaq_gpioreg.h>
Index: src/sys/arch/hpcarm/dev/ipaq_lcd.c
diff -u src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.18 src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.19
--- src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.18 Fri May 29 14:15:44 2009
+++ src/sys/arch/hpcarm/dev/ipaq_lcd.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung 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.18 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $");
#define IPAQ_LCD_DEBUG
@@ -40,13 +40,13 @@
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
#include <dev/wscons/wsconsio.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
#include <arm/arm32/katelib.h>
Index: src/sys/arch/hpcarm/dev/ipaq_lcdvar.h
diff -u src/sys/arch/hpcarm/dev/ipaq_lcdvar.h:1.3 src/sys/arch/hpcarm/dev/ipaq_lcdvar.h:1.4
--- src/sys/arch/hpcarm/dev/ipaq_lcdvar.h:1.3 Fri May 29 14:15:44 2009
+++ src/sys/arch/hpcarm/dev/ipaq_lcdvar.h Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_lcdvar.h,v 1.3 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: ipaq_lcdvar.h,v 1.4 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
Index: src/sys/arch/hpcarm/dev/ipaq_pcic.c
diff -u src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.19 src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.20
--- src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.19 Fri May 29 14:15:45 2009
+++ src/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_pcic.c,v 1.19 2009/05/29 14:15:45 rjs Exp $ */
+/* $NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.19 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
Index: src/sys/arch/hpcarm/dev/ipaq_saip.c
diff -u src/sys/arch/hpcarm/dev/ipaq_saip.c:1.22 src/sys/arch/hpcarm/dev/ipaq_saip.c:1.23
--- src/sys/arch/hpcarm/dev/ipaq_saip.c:1.22 Fri May 29 14:15:45 2009
+++ src/sys/arch/hpcarm/dev/ipaq_saip.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_saip.c,v 1.22 2009/05/29 14:15:45 rjs Exp $ */
+/* $NetBSD: ipaq_saip.c,v 1.23 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.22 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.23 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,9 +39,9 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/uio.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <arm/sa11x0/sa11x0_var.h>
#include <arm/sa11x0/sa11x0_reg.h>
Index: src/sys/arch/hpcarm/dev/j720pcic.c
diff -u src/sys/arch/hpcarm/dev/j720pcic.c:1.7 src/sys/arch/hpcarm/dev/j720pcic.c:1.8
--- src/sys/arch/hpcarm/dev/j720pcic.c:1.7 Thu Aug 19 15:17:53 2010
+++ src/sys/arch/hpcarm/dev/j720pcic.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: j720pcic.c,v 1.7 2010/08/19 15:17:53 tsutsui Exp $ */
+/* $NetBSD: j720pcic.c,v 1.8 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Jornada 720 PCMCIA support. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: j720pcic.c,v 1.7 2010/08/19 15:17:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: j720pcic.c,v 1.8 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
Index: src/sys/arch/hpcarm/dev/sacc_hpcarm.c
diff -u src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.11 src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.12
--- src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.11 Fri May 29 14:15:45 2009
+++ src/sys/arch/hpcarm/dev/sacc_hpcarm.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sacc_hpcarm.c,v 1.11 2009/05/29 14:15:45 rjs Exp $ */
+/* $NetBSD: sacc_hpcarm.c,v 1.12 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.11 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.12 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/uio.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
Index: src/sys/arch/hpcarm/dev/sed_saip.c
diff -u src/sys/arch/hpcarm/dev/sed_saip.c:1.24 src/sys/arch/hpcarm/dev/sed_saip.c:1.25
--- src/sys/arch/hpcarm/dev/sed_saip.c:1.24 Fri May 29 14:15:45 2009
+++ src/sys/arch/hpcarm/dev/sed_saip.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sed_saip.c,v 1.24 2009/05/29 14:15:45 rjs Exp $ */
+/* $NetBSD: sed_saip.c,v 1.25 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.24 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.25 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,8 +42,8 @@
#include <sys/buf.h>
#include <sys/ioctl.h>
#include <sys/reboot.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/bootinfo.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
Index: src/sys/arch/hpcarm/dev/uda1341.c
diff -u src/sys/arch/hpcarm/dev/uda1341.c:1.14 src/sys/arch/hpcarm/dev/uda1341.c:1.15
--- src/sys/arch/hpcarm/dev/uda1341.c:1.14 Fri May 29 14:15:45 2009
+++ src/sys/arch/hpcarm/dev/uda1341.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uda1341.c,v 1.14 2009/05/29 14:15:45 rjs Exp $ */
+/* $NetBSD: uda1341.c,v 1.15 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.14 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.15 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,7 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <hpcarm/dev/ipaq_saipvar.h>
#include <hpcarm/dev/ipaq_gpioreg.h>
Index: src/sys/arch/hpcarm/dev/wzero3_kbd.c
diff -u src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.5 src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.6
--- src/sys/arch/hpcarm/dev/wzero3_kbd.c:1.5 Sun May 30 03:17:21 2010
+++ src/sys/arch/hpcarm/dev/wzero3_kbd.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $ */
+/* $NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 NONAKA Kimihiro <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,6 +35,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/callout.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <dev/sysmon/sysmon_taskq.h>
@@ -43,7 +44,6 @@
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0_gpio.h>
-#include <machine/bus.h>
#include <machine/bootinfo.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
Index: src/sys/arch/hpcarm/dev/wzero3_keypad.c
diff -u src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.1 src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.2
--- src/sys/arch/hpcarm/dev/wzero3_keypad.c:1.1 Sun May 30 10:00:27 2010
+++ src/sys/arch/hpcarm/dev/wzero3_keypad.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_keypad.c,v 1.1 2010/05/30 10:00:27 nonaka Exp $ */
+/* $NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $ */
/*
* Copyright (c) 2010 NONAKA Kimihiro <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.1 2010/05/30 10:00:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $");
#include "wzero3lcd.h"
#include "opt_wsdisplay_compat.h"
@@ -37,12 +37,12 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/callout.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0cpu.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0_gpio.h>
-#include <machine/bus.h>
#include <machine/bootinfo.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
Index: src/sys/arch/hpcarm/dev/wzero3_usb.c
diff -u src/sys/arch/hpcarm/dev/wzero3_usb.c:1.1 src/sys/arch/hpcarm/dev/wzero3_usb.c:1.2
--- src/sys/arch/hpcarm/dev/wzero3_usb.c:1.1 Sat Apr 17 13:36:21 2010
+++ src/sys/arch/hpcarm/dev/wzero3_usb.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_usb.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $ */
+/* $NetBSD: wzero3_usb.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $ */
/*
* Copyright (c) 2009 NONAKA Kimihiro <[email protected]>
@@ -24,17 +24,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_usb.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_usb.c,v 1.2 2011/07/19 15:37:39 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/bus.h>
#include <machine/bootinfo.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
Index: src/sys/arch/hpcarm/dev/wzero3_lcd.c
diff -u src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.2 src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.3
--- src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.2 Thu Dec 9 04:37:04 2010
+++ src/sys/arch/hpcarm/dev/wzero3_lcd.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $ */
+/* $NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $ */
/*
* Copyright (c) 2008,2009 NONAKA Kimihiro <[email protected]>
@@ -27,12 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/pmf.h>
+#include <sys/bus.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
@@ -45,7 +46,6 @@
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0_lcd.h>
-#include <machine/bus.h>
#include <machine/bootinfo.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
Index: src/sys/arch/hpcarm/dev/wzero3_mci.c
diff -u src/sys/arch/hpcarm/dev/wzero3_mci.c:1.2 src/sys/arch/hpcarm/dev/wzero3_mci.c:1.3
--- src/sys/arch/hpcarm/dev/wzero3_mci.c:1.2 Sun May 23 11:53:18 2010
+++ src/sys/arch/hpcarm/dev/wzero3_mci.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_mci.c,v 1.2 2010/05/23 11:53:18 nonaka Exp $ */
+/* $NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $ */
/*-
* Copyright (c) 2009 NONAKA Kimihiro <[email protected]>
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.2 2010/05/23 11:53:18 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/pmf.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/bootinfo.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.12 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.13
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.12 Thu Jun 30 20:09:30 2011
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -59,6 +59,7 @@
#include <sys/boot_flag.h>
#include <sys/conf.h> /* XXX for consinit related hacks */
#include <sys/device.h>
+#include <sys/bus.h>
#if NKSYMS || defined(DDB) || defined(MODULAR)
#include <machine/db_machdep.h>
@@ -82,7 +83,6 @@
#include <machine/bootconfig.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.2 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.3
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.2 Sat Jun 26 00:25:02 2010
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Tue Jul 19 15:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsutsui Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -60,6 +60,7 @@
#include <sys/conf.h> /* XXX for consinit related hacks */
#include <sys/device.h>
#include <sys/termios.h>
+#include <sys/bus.h>
#if NKSYMS || defined(DDB) || defined(MODULAR)
#include <machine/db_machdep.h>
@@ -80,7 +81,6 @@
#include <machine/bootconfig.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: src/sys/arch/hpcarm/include/Makefile
diff -u src/sys/arch/hpcarm/include/Makefile:1.26 src/sys/arch/hpcarm/include/Makefile:1.27
--- src/sys/arch/hpcarm/include/Makefile:1.26 Sun Jul 17 20:54:40 2011
+++ src/sys/arch/hpcarm/include/Makefile Tue Jul 19 15:37:39 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2011/07/17 20:54:40 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2011/07/19 15:37:39 dyoung Exp $
INCSDIR= /usr/include/hpcarm
INCS= ansi.h apmvar.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Added files:
Index: src/sys/arch/hpcarm/include/bus_defs.h
diff -u /dev/null src/sys/arch/hpcarm/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:37:40 2011
+++ src/sys/arch/hpcarm/include/bus_defs.h Tue Jul 19 15:37:39 2011
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:37:39 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
+
Index: src/sys/arch/hpcarm/include/bus_funcs.h
diff -u /dev/null src/sys/arch/hpcarm/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:37:40 2011
+++ src/sys/arch/hpcarm/include/bus_funcs.h Tue Jul 19 15:37:39 2011
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:37:39 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
+
