Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Change <machine/bus.h> to <sys/bus.h> throughout.
details: https://anonhg.NetBSD.org/src/rev/2704177e2083
branches: trunk
changeset: 767473:2704177e2083
user: dyoung <dyoung%NetBSD.org@localhost>
date: Tue Jul 19 15:37:38 2011 +0000
description:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark hpcarm/bus.h obsolete.
diffstat:
distrib/sets/lists/comp/md.hpcarm | 4 ++--
sys/arch/hpcarm/dev/ipaq_atmelgpio.c | 7 +++----
sys/arch/hpcarm/dev/ipaq_lcd.c | 6 +++---
sys/arch/hpcarm/dev/ipaq_lcdvar.h | 4 ++--
sys/arch/hpcarm/dev/ipaq_pcic.c | 6 +++---
sys/arch/hpcarm/dev/ipaq_saip.c | 6 +++---
sys/arch/hpcarm/dev/j720pcic.c | 6 +++---
sys/arch/hpcarm/dev/sacc_hpcarm.c | 6 +++---
sys/arch/hpcarm/dev/sed_saip.c | 6 +++---
sys/arch/hpcarm/dev/uda1341.c | 7 +++----
sys/arch/hpcarm/dev/wzero3_kbd.c | 6 +++---
sys/arch/hpcarm/dev/wzero3_keypad.c | 6 +++---
sys/arch/hpcarm/dev/wzero3_lcd.c | 6 +++---
sys/arch/hpcarm/dev/wzero3_mci.c | 6 +++---
sys/arch/hpcarm/dev/wzero3_usb.c | 6 +++---
sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c | 6 +++---
sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c | 6 +++---
sys/arch/hpcarm/include/Makefile | 4 ++--
sys/arch/hpcarm/include/bus.h | 4 ----
sys/arch/hpcarm/include/bus_defs.h | 4 ++++
sys/arch/hpcarm/include/bus_funcs.h | 4 ++++
21 files changed, 59 insertions(+), 57 deletions(-)
diffs (truncated from 525 to 300 lines):
diff -r a0ec9ac494ea -r 2704177e2083 distrib/sets/lists/comp/md.hpcarm
--- a/distrib/sets/lists/comp/md.hpcarm Tue Jul 19 15:31:44 2011 +0000
+++ b/distrib/sets/lists/comp/md.hpcarm Tue Jul 19 15:37:38 2011 +0000
@@ -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
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/ipaq_atmelgpio.c
--- a/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/ipaq_lcd.c
--- a/sys/arch/hpcarm/dev/ipaq_lcd.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_lcd.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/ipaq_lcdvar.h
--- a/sys/arch/hpcarm/dev/ipaq_lcdvar.h Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_lcdvar.h Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/ipaq_pcic.c
--- a/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/ipaq_saip.c
--- a/sys/arch/hpcarm/dev/ipaq_saip.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_saip.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/j720pcic.c
--- a/sys/arch/hpcarm/dev/j720pcic.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/j720pcic.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/sacc_hpcarm.c
--- a/sys/arch/hpcarm/dev/sacc_hpcarm.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/sacc_hpcarm.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/sed_saip.c
--- a/sys/arch/hpcarm/dev/sed_saip.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/sed_saip.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/uda1341.c
--- a/sys/arch/hpcarm/dev/uda1341.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/uda1341.c Tue Jul 19 15:37:38 2011 +0000
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/wzero3_kbd.c
--- a/sys/arch/hpcarm/dev/wzero3_kbd.c Tue Jul 19 15:31:44 2011 +0000
+++ b/sys/arch/hpcarm/dev/wzero3_kbd.c Tue Jul 19 15:37:38 2011 +0000
@@ -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 <nonaka%netbsd.org@localhost>
@@ -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>
diff -r a0ec9ac494ea -r 2704177e2083 sys/arch/hpcarm/dev/wzero3_keypad.c
Home |
Main Index |
Thread Index |
Old Index