Module Name: src
Committed By: matt
Date: Sat Jul 9 16:09:03 UTC 2011
Modified Files:
src/sys/arch/cobalt/cobalt: autoconf.c bus.c machdep.c
src/sys/arch/cobalt/dev: com_mainbus.c gt.c
src/sys/arch/cobalt/pci: pci_machdep.c pcib.c pciide_machdep.c
Log Message:
Cleanup kernel files to use sys variants for bus.h, cpu.h, and intr.h
Use <mips/..> for db_machdep.h and psl.h
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cobalt/cobalt/autoconf.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/cobalt/dev/com_mainbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cobalt/pci/pci_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cobalt/pci/pcib.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/pci/pciide_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/cobalt/cobalt/autoconf.c
diff -u src/sys/arch/cobalt/cobalt/autoconf.c:1.28 src/sys/arch/cobalt/cobalt/autoconf.c:1.29
--- src/sys/arch/cobalt/cobalt/autoconf.c:1.28 Sat Mar 22 18:32:20 2008
+++ src/sys/arch/cobalt/cobalt/autoconf.c Sat Jul 9 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.28 2008/03/22 18:32:20 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,16 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2008/03/22 18:32:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/cpu.h>
#include <sys/conf.h>
#include <sys/device.h>
-
-#include <machine/cpu.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
#include <dev/pci/pcivar.h>
#include <dev/ata/atavar.h>
Index: src/sys/arch/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.40 src/sys/arch/cobalt/cobalt/bus.c:1.41
--- src/sys/arch/cobalt/cobalt/bus.c:1.40 Tue May 3 09:15:20 2011
+++ src/sys/arch/cobalt/cobalt/bus.c Sat Jul 9 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $ */
+/* $NetBSD: bus.c,v 1.41 2011/07/09 16:09:01 matt Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,9 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.41 2011/07/09 16:09:01 matt Exp $");
+
+#define _COBALT_BUS_DMA_PRIVATE
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
@@ -41,9 +44,6 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#define _COBALT_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-
#include <common/bus_dma/bus_dmamem_common.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.111 src/sys/arch/cobalt/cobalt/machdep.c:1.112
--- src/sys/arch/cobalt/cobalt/machdep.c:1.111 Sun Feb 20 15:47:28 2011
+++ src/sys/arch/cobalt/cobalt/machdep.c Sat Jul 9 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.112 2011/07/09 16:09:01 matt Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2011/07/09 16:09:01 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -72,9 +72,9 @@
#include <uvm/uvm_extern.h>
#include <machine/bootinfo.h>
-#include <machine/psl.h>
#include <mips/locore.h>
+#include <mips/psl.h>
#include <dev/cons.h>
@@ -87,7 +87,7 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
Index: src/sys/arch/cobalt/dev/com_mainbus.c
diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.18 src/sys/arch/cobalt/dev/com_mainbus.c:1.19
--- src/sys/arch/cobalt/dev/com_mainbus.c:1.18 Fri Jul 1 20:36:42 2011
+++ src/sys/arch/cobalt/dev/com_mainbus.c Sat Jul 9 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,16 +26,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
#include <sys/termios.h>
#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.26 src/sys/arch/cobalt/dev/gt.c:1.27
--- src/sys/arch/cobalt/dev/gt.c:1.26 Fri Jul 1 20:36:42 2011
+++ src/sys/arch/cobalt/dev/gt.c Sat Jul 9 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $ */
+/* $NetBSD: gt.c,v 1.27 2011/07/09 16:09:01 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,30 +26,29 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.27 2011/07/09 16:09:01 matt Exp $");
#include "opt_pci.h"
#include "pci.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
+#include <sys/bus.h>
#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/extent.h>
#include <sys/file.h>
-#include <sys/uio.h>
+#include <sys/intr.h>
+#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/types.h>
-#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/extent.h>
+#include <sys/proc.h>
+#include <sys/select.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
#include <machine/autoconf.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
#include <mips/cache.h>
Index: src/sys/arch/cobalt/pci/pci_machdep.c
diff -u src/sys/arch/cobalt/pci/pci_machdep.c:1.31 src/sys/arch/cobalt/pci/pci_machdep.c:1.32
--- src/sys/arch/cobalt/pci/pci_machdep.c:1.31 Fri Jul 1 20:37:08 2011
+++ src/sys/arch/cobalt/pci/pci_machdep.c Sat Jul 9 16:09:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.32 2011/07/09 16:09:02 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,19 +26,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.32 2011/07/09 16:09:02 matt Exp $");
+
+#define _COBALT_BUS_DMA_PRIVATE
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/extent.h>
-
-#define _COBALT_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/time.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/cobalt/pci/pcib.c
diff -u src/sys/arch/cobalt/pci/pcib.c:1.20 src/sys/arch/cobalt/pci/pcib.c:1.21
--- src/sys/arch/cobalt/pci/pcib.c:1.20 Fri Jul 1 20:37:08 2011
+++ src/sys/arch/cobalt/pci/pcib.c Sat Jul 9 16:09:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $ */
+/* $NetBSD: pcib.c,v 1.21 2011/07/09 16:09:02 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,16 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2011/07/09 16:09:02 matt Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/systm.h>
-#include <machine/cpu.h>
-#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/cobalt/pci/pciide_machdep.c
diff -u src/sys/arch/cobalt/pci/pciide_machdep.c:1.8 src/sys/arch/cobalt/pci/pciide_machdep.c:1.9
--- src/sys/arch/cobalt/pci/pciide_machdep.c:1.8 Mon Apr 4 20:37:47 2011
+++ src/sys/arch/cobalt/pci/pciide_machdep.c Sat Jul 9 16:09:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.8 2011/04/04 20:37:47 dyoung Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.9 2011/07/09 16:09:03 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,19 +26,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.8 2011/04/04 20:37:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.9 2011/07/09 16:09:03 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciidereg.h>
#include <dev/pci/pciidevar.h>
-#include <machine/intr.h>
-
void *
pciide_machdep_compat_intr_establish(struct device *dev,
const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
