Module Name: src Committed By: matt Date: Sat Jul 9 17:32:31 UTC 2011
Modified Files: src/sys/arch/pmax/ibus: dz_ibus.c ibus.c ibus_3max.c ibus_pmax.c ibusvar.h pm.c sii.c sii_ds.c src/sys/arch/pmax/include: locore.h src/sys/arch/pmax/pmax: autoconf.c bus_dma.c bus_space.c clock.c cpu.c dec_3100.c dec_3max.c dec_3maxplus.c dec_3min.c dec_5100.c dec_maxine.c interrupt.c machdep.c mainbus.c memc_3max.c promcall.c sysconf.c src/sys/arch/pmax/tc: asc_ioasic.c dtkbd.c dtms.c ioasic.c tcbus.c Log Message: Cleanu <machine/*> includes To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/ibus/dz_ibus.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/pmax/ibus/ibus.c \ src/sys/arch/pmax/ibus/ibusvar.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/pmax/ibus/ibus_3max.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/pmax/ibus/ibus_pmax.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/ibus/pm.c \ src/sys/arch/pmax/ibus/sii.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/pmax/ibus/sii_ds.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/pmax/include/locore.h cvs rdiff -u -r1.77 -r1.78 src/sys/arch/pmax/pmax/autoconf.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/pmax/pmax/bus_dma.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/pmax/bus_space.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/pmax/pmax/clock.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/pmax/pmax/cpu.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/pmax/pmax/dec_3100.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/pmax/pmax/dec_3max.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/pmax/pmax/dec_3maxplus.c cvs rdiff -u -r1.70 -r1.71 src/sys/arch/pmax/pmax/dec_3min.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/pmax/pmax/dec_5100.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/pmax/pmax/dec_maxine.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/pmax/pmax/interrupt.c cvs rdiff -u -r1.243 -r1.244 src/sys/arch/pmax/pmax/machdep.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/pmax/pmax/mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/pmax/pmax/memc_3max.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/pmax/pmax/promcall.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/pmax/pmax/sysconf.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/pmax/tc/asc_ioasic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/tc/dtkbd.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/tc/dtms.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/pmax/tc/ioasic.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/pmax/tc/tcbus.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/pmax/ibus/dz_ibus.c diff -u src/sys/arch/pmax/ibus/dz_ibus.c:1.10 src/sys/arch/pmax/ibus/dz_ibus.c:1.11 --- src/sys/arch/pmax/ibus/dz_ibus.c:1.10 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/dz_ibus.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: dz_ibus.c,v 1.11 2011/07/09 17:32:29 matt Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -61,22 +61,21 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.11 2011/07/09 17:32:29 matt Exp $"); #include "dzkbd.h" #include "dzms.h" #include <sys/param.h> -#include <sys/proc.h> -#include <sys/systm.h> -#include <sys/ioctl.h> -#include <sys/tty.h> -#include <sys/file.h> +#include <sys/bus.h> #include <sys/conf.h> #include <sys/device.h> +#include <sys/file.h> +#include <sys/ioctl.h> +#include <sys/proc.h> #include <sys/reboot.h> - -#include <machine/bus.h> +#include <sys/systm.h> +#include <sys/tty.h> #include <dev/cons.h> Index: src/sys/arch/pmax/ibus/ibus.c diff -u src/sys/arch/pmax/ibus/ibus.c:1.19 src/sys/arch/pmax/ibus/ibus.c:1.20 --- src/sys/arch/pmax/ibus/ibus.c:1.19 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibus.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibus.c,v 1.20 2011/07/09 17:32:29 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -31,13 +31,13 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.20 2011/07/09 17:32:29 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/device.h> +#include <sys/systm.h> -#include <machine/sysconf.h> +#include <pmax/sysconf.h> #include <pmax/ibus/ibusvar.h> #include "locators.h" Index: src/sys/arch/pmax/ibus/ibusvar.h diff -u src/sys/arch/pmax/ibus/ibusvar.h:1.19 src/sys/arch/pmax/ibus/ibusvar.h:1.20 --- src/sys/arch/pmax/ibus/ibusvar.h:1.19 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibusvar.h Sat Jul 9 17:32:29 2011 @@ -1,9 +1,9 @@ -/* $NetBSD: ibusvar.h,v 1.19 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibusvar.h,v 1.20 2011/07/09 17:32:29 matt Exp $ */ #ifndef _PMAX_IBUS_IBUSVAR_H_ #define _PMAX_IBUS_IBUSVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> struct ibus_attach_args; Index: src/sys/arch/pmax/ibus/ibus_3max.c diff -u src/sys/arch/pmax/ibus/ibus_3max.c:1.14 src/sys/arch/pmax/ibus/ibus_3max.c:1.15 --- src/sys/arch/pmax/ibus/ibus_3max.c:1.14 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibus_3max.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ibus_3max.c,v 1.14 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibus_3max.c,v 1.15 2011/07/09 17:32:29 matt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,13 +30,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.14 2011/02/20 07:50:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.15 2011/07/09 17:32:29 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/device.h> +#include <sys/systm.h> #include <dev/tc/tcvar.h> + #include <pmax/ibus/ibusvar.h> #include <pmax/pmax/kn02.h> Index: src/sys/arch/pmax/ibus/ibus_pmax.c diff -u src/sys/arch/pmax/ibus/ibus_pmax.c:1.22 src/sys/arch/pmax/ibus/ibus_pmax.c:1.23 --- src/sys/arch/pmax/ibus/ibus_pmax.c:1.22 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibus_pmax.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ibus_pmax.c,v 1.22 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibus_pmax.c,v 1.23 2011/07/09 17:32:29 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -31,19 +31,19 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.22 2011/02/20 07:50:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.23 2011/07/09 17:32:29 matt Exp $"); #include "opt_dec_3100.h" #include "opt_dec_5100.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/device.h> +#include <sys/systm.h> #include <pmax/ibus/ibusvar.h> -#include <machine/autoconf.h> -#include <machine/sysconf.h> +#include <pmax/autoconf.h> +#include <pmax/sysconf.h> #include <pmax/pmax/kn01.h> #include <pmax/pmax/kn230.h> Index: src/sys/arch/pmax/ibus/pm.c diff -u src/sys/arch/pmax/ibus/pm.c:1.9 src/sys/arch/pmax/ibus/pm.c:1.10 --- src/sys/arch/pmax/ibus/pm.c:1.9 Sat Jun 4 01:31:23 2011 +++ src/sys/arch/pmax/ibus/pm.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pm.c,v 1.9 2011/06/04 01:31:23 tsutsui Exp $ */ +/* $NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,17 +30,16 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.9 2011/06/04 01:31:23 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/device.h> #include <sys/buf.h> +#include <sys/bus.h> +#include <sys/device.h> #include <sys/ioctl.h> - -#include <machine/bus.h> -#include <machine/intr.h> +#include <sys/intr.h> +#include <sys/kernel.h> +#include <sys/systm.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> Index: src/sys/arch/pmax/ibus/sii.c diff -u src/sys/arch/pmax/ibus/sii.c:1.9 src/sys/arch/pmax/ibus/sii.c:1.10 --- src/sys/arch/pmax/ibus/sii.c:1.9 Sat Jun 4 01:31:23 2011 +++ src/sys/arch/pmax/ibus/sii.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sii.c,v 1.9 2011/06/04 01:31:23 tsutsui Exp $ */ +/* $NetBSD: sii.c,v 1.10 2011/07/09 17:32:30 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.9 2011/06/04 01:31:23 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.10 2011/07/09 17:32:30 matt Exp $"); #include "sii.h" /* @@ -50,7 +50,7 @@ #include <sys/device.h> #include <sys/systm.h> -#include <machine/locore.h> +#include <mips/locore.h> #include <dev/scsipi/scsi_all.h> #include <dev/scsipi/scsi_message.h> Index: src/sys/arch/pmax/ibus/sii_ds.c diff -u src/sys/arch/pmax/ibus/sii_ds.c:1.8 src/sys/arch/pmax/ibus/sii_ds.c:1.9 --- src/sys/arch/pmax/ibus/sii_ds.c:1.8 Sat Jun 4 01:31:23 2011 +++ src/sys/arch/pmax/ibus/sii_ds.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sii_ds.c,v 1.8 2011/06/04 01:31:23 tsutsui Exp $ */ +/* $NetBSD: sii_ds.c,v 1.9 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright 1996 The Board of Trustees of The Leland Stanford @@ -16,23 +16,24 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.8 2011/06/04 01:31:23 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.9 2011/07/09 17:32:30 matt Exp $"); #include "sii.h" #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> #include <sys/buf.h> +#include <sys/bus.h> +#include <sys/device.h> +#include <sys/systm.h> -#include <machine/locore.h> +#include <mips/locore.h> +#include <pmax/locore.h> #include <dev/scsipi/scsi_all.h> #include <dev/scsipi/scsipi_all.h> #include <dev/scsipi/scsiconf.h> #include <dev/scsipi/scsi_message.h> -#include <machine/bus.h> #include <pmax/ibus/siireg.h> #include <pmax/ibus/siivar.h> Index: src/sys/arch/pmax/include/locore.h diff -u src/sys/arch/pmax/include/locore.h:1.5 src/sys/arch/pmax/include/locore.h:1.6 --- src/sys/arch/pmax/include/locore.h:1.5 Wed Jun 5 06:19:29 2002 +++ src/sys/arch/pmax/include/locore.h Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.5 2002/06/05 06:19:29 simonb Exp $ */ +/* $NetBSD: locore.h,v 1.6 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright 1996 The Board of Trustees of The Leland Stanford @@ -18,8 +18,6 @@ #ifndef _PMAX_LOCORE_H_ #define _PMAX_LOCORE_H_ -#include <mips/locore.h> - void CopyToBuffer(u_short *src, /* NB: must be short aligned */ volatile u_short *dst, int length); void CopyFromBuffer(volatile u_short *src, char *dst, int length); Index: src/sys/arch/pmax/pmax/autoconf.c diff -u src/sys/arch/pmax/pmax/autoconf.c:1.77 src/sys/arch/pmax/pmax/autoconf.c:1.78 --- src/sys/arch/pmax/pmax/autoconf.c:1.77 Wed Apr 6 15:31:48 2011 +++ src/sys/arch/pmax/pmax/autoconf.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.77 2011/04/06 15:31:48 tsutsui Exp $ */ +/* $NetBSD: autoconf.c,v 1.78 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,17 +39,17 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.77 2011/04/06 15:31:48 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/conf.h> -#include <sys/reboot.h> #include <sys/device.h> +#include <sys/intr.h> +#include <sys/reboot.h> +#include <sys/systm.h> -#include <machine/autoconf.h> -#include <machine/intr.h> -#include <machine/sysconf.h> +#include <pmax/autoconf.h> +#include <pmax/sysconf.h> #include <pmax/pmax/pmaxtype.h> Index: src/sys/arch/pmax/pmax/bus_dma.c diff -u src/sys/arch/pmax/pmax/bus_dma.c:1.55 src/sys/arch/pmax/pmax/bus_dma.c:1.56 --- src/sys/arch/pmax/pmax/bus_dma.c:1.55 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/bus_dma.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.55 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.56 2011/07/09 17:32:30 matt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,20 +31,20 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.55 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.56 2011/07/09 17:32:30 matt Exp $"); #include "opt_cputype.h" +#define _PMAX_BUS_DMA_PRIVATE + #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> #include <sys/mbuf.h> #include <sys/proc.h> +#include <sys/systm.h> #include <uvm/uvm_extern.h> -#define _PMAX_BUS_DMA_PRIVATE -#include <machine/bus.h> - #include <common/bus_dma/bus_dmamem_common.h> #include <mips/cache.h> Index: src/sys/arch/pmax/pmax/bus_space.c diff -u src/sys/arch/pmax/pmax/bus_space.c:1.7 src/sys/arch/pmax/pmax/bus_space.c:1.8 --- src/sys/arch/pmax/pmax/bus_space.c:1.7 Mon Jul 20 17:05:13 2009 +++ src/sys/arch/pmax/pmax/bus_space.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.7 2009/07/20 17:05:13 tsutsui Exp $ */ +/* $NetBSD: bus_space.c,v 1.8 2011/07/09 17:32:30 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,13 +35,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.7 2009/07/20 17:05:13 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.8 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> +#include <sys/bus.h> #include <sys/systm.h> -#include <machine/bus.h> - /* ARGSUSED */ int bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags, Index: src/sys/arch/pmax/pmax/clock.c diff -u src/sys/arch/pmax/pmax/clock.c:1.39 src/sys/arch/pmax/pmax/clock.c:1.40 --- src/sys/arch/pmax/pmax/clock.c:1.39 Sat Jun 4 01:43:56 2011 +++ src/sys/arch/pmax/pmax/clock.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.39 2011/06/04 01:43:56 tsutsui Exp $ */ +/* $NetBSD: clock.c,v 1.40 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.39 2011/06/04 01:43:56 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -48,7 +48,8 @@ #include <dev/clock_subr.h> #include <dev/dec/clockvar.h> -#include <machine/sysconf.h> + +#include <pmax/sysconf.h> #include "opt_ntp.h" Index: src/sys/arch/pmax/pmax/cpu.c diff -u src/sys/arch/pmax/pmax/cpu.c:1.30 src/sys/arch/pmax/pmax/cpu.c:1.31 --- src/sys/arch/pmax/pmax/cpu.c:1.30 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/cpu.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.30 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.31 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.30 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.31 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -37,7 +37,7 @@ #include <mips/locore.h> -#include <machine/autoconf.h> +#include <pmax/autoconf.h> #include "ioconf.h" Index: src/sys/arch/pmax/pmax/dec_3100.c diff -u src/sys/arch/pmax/pmax/dec_3100.c:1.51 src/sys/arch/pmax/pmax/dec_3100.c:1.52 --- src/sys/arch/pmax/pmax/dec_3100.c:1.51 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_3100.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3100.c,v 1.51 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_3100.c,v 1.52 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -69,19 +69,18 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.51 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.52 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> #include <sys/cpu.h> -#include <sys/lwp.h> +#include <sys/device.h> #include <sys/intr.h> +#include <sys/lwp.h> +#include <sys/systm.h> -#include <machine/sysconf.h> +#include <pmax/sysconf.h> #include <mips/mips/mips_mcclock.h> /* mcclock CPUspeed estimation */ -//#include <mips/locore.h> #include <dev/tc/tcvar.h> /* tc_addr_t */ Index: src/sys/arch/pmax/pmax/dec_3max.c diff -u src/sys/arch/pmax/pmax/dec_3max.c:1.53 src/sys/arch/pmax/pmax/dec_3max.c:1.54 --- src/sys/arch/pmax/pmax/dec_3max.c:1.53 Thu Mar 10 17:13:13 2011 +++ src/sys/arch/pmax/pmax/dec_3max.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3max.c,v 1.53 2011/03/10 17:13:13 tsutsui Exp $ */ +/* $NetBSD: dec_3max.c,v 1.54 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,25 +70,26 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.53 2011/03/10 17:13:13 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.54 2011/07/09 17:32:30 matt Exp $"); #include "dzkbd.h" #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> -#include <sys/lwp.h> -#include <sys/cpu.h> #include <sys/bus.h> +#include <sys/cpu.h> +#include <sys/device.h> #include <sys/intr.h> +#include <sys/lwp.h> +#include <sys/systm.h> -#include <machine/locore.h> -#include <machine/sysconf.h> +#include <mips/locore.h> #include <mips/mips/mips_mcclock.h> /* mcclock CPUspeed estimation */ #include <dev/tc/tcvar.h> /* tc_addr_t */ +#include <pmax/sysconf.h> + #include <pmax/pmax/machdep.h> #include <pmax/pmax/kn02.h> #include <pmax/pmax/memc.h> Index: src/sys/arch/pmax/pmax/dec_3maxplus.c diff -u src/sys/arch/pmax/pmax/dec_3maxplus.c:1.67 src/sys/arch/pmax/pmax/dec_3maxplus.c:1.68 --- src/sys/arch/pmax/pmax/dec_3maxplus.c:1.67 Sun Apr 3 03:19:52 2011 +++ src/sys/arch/pmax/pmax/dec_3maxplus.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3maxplus.c,v 1.67 2011/04/03 03:19:52 mhitch Exp $ */ +/* $NetBSD: dec_3maxplus.c,v 1.68 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,17 +70,16 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.67 2011/04/03 03:19:52 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.68 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/cpu.h> #include <sys/evcnt.h> #include <sys/lwp.h> +#include <sys/systm.h> #include <sys/timetc.h> -#include <machine/sysconf.h> -#include <machine/locore.h> +#include <mips/locore.h> #include <mips/mips/mips_mcclock.h> /* mclock CPUspeed estimation */ @@ -89,6 +88,8 @@ #include <dev/tc/ioasicreg.h> /* ioasic interrrupt masks */ #include <dev/tc/ioasicvar.h> /* ioasic_base */ +#include <pmax/sysconf.h> + #include <pmax/pmax/machdep.h> #include <pmax/pmax/kn03.h> #include <pmax/pmax/memc.h> Index: src/sys/arch/pmax/pmax/dec_3min.c diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.70 src/sys/arch/pmax/pmax/dec_3min.c:1.71 --- src/sys/arch/pmax/pmax/dec_3min.c:1.70 Sun Apr 3 03:19:52 2011 +++ src/sys/arch/pmax/pmax/dec_3min.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3min.c,v 1.70 2011/04/03 03:19:52 mhitch Exp $ */ +/* $NetBSD: dec_3min.c,v 1.71 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,17 +70,17 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.70 2011/04/03 03:19:52 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.71 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> -#include <sys/timetc.h> -#include <sys/lwp.h> #include <sys/cpu.h> +#include <sys/device.h> #include <sys/intr.h> +#include <sys/lwp.h> +#include <sys/systm.h> +#include <sys/timetc.h> -#include <machine/sysconf.h> +#include <pmax/sysconf.h> #include <mips/mips/mips_mcclock.h> /* mcclock CPUspeed estimation */ Index: src/sys/arch/pmax/pmax/dec_5100.c diff -u src/sys/arch/pmax/pmax/dec_5100.c:1.45 src/sys/arch/pmax/pmax/dec_5100.c:1.46 --- src/sys/arch/pmax/pmax/dec_5100.c:1.45 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_5100.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_5100.c,v 1.45 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_5100.c,v 1.46 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -31,22 +31,24 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.45 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.46 2011/07/09 17:32:30 matt Exp $"); #define __INTR_PRIVATE #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> #include <sys/cpu.h> +#include <sys/device.h> #include <sys/intr.h> #include <sys/lwp.h> #include <sys/kernel.h> +#include <sys/systm.h> -#include <machine/locore.h> -#include <machine/sysconf.h> +#include <mips/locore.h> #include <mips/mips/mips_mcclock.h> /* mcclock CPUspeed estimation */ +#include <pmax/locore.h> +#include <pmax/sysconf.h> + #include <dev/tc/tcvar.h> /* tc_addr_t */ #include <pmax/pmax/machdep.h> Index: src/sys/arch/pmax/pmax/dec_maxine.c diff -u src/sys/arch/pmax/pmax/dec_maxine.c:1.62 src/sys/arch/pmax/pmax/dec_maxine.c:1.63 --- src/sys/arch/pmax/pmax/dec_maxine.c:1.62 Sun Apr 3 03:19:52 2011 +++ src/sys/arch/pmax/pmax/dec_maxine.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_maxine.c,v 1.62 2011/04/03 03:19:52 mhitch Exp $ */ +/* $NetBSD: dec_maxine.c,v 1.63 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,16 +70,17 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.62 2011/04/03 03:19:52 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.63 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> -#include <sys/systm.h> +#include <sys/cpu.h> #include <sys/device.h> -#include <sys/timetc.h> #include <sys/lwp.h> -#include <sys/cpu.h> +#include <sys/systm.h> +#include <sys/timetc.h> + +#include <pmax/sysconf.h> -#include <machine/sysconf.h> #include <mips/mips/mips_mcclock.h> #include <dev/tc/tcvar.h> Index: src/sys/arch/pmax/pmax/interrupt.c diff -u src/sys/arch/pmax/pmax/interrupt.c:1.18 src/sys/arch/pmax/pmax/interrupt.c:1.19 --- src/sys/arch/pmax/pmax/interrupt.c:1.18 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/interrupt.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.18 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: interrupt.c,v 1.19 2011/07/09 17:32:30 matt Exp $ */ /*- * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc. @@ -30,20 +30,20 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.18 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.19 2011/07/09 17:32:30 matt Exp $"); #include <sys/param.h> #include <sys/device.h> -#include <sys/proc.h> #include <sys/cpu.h> +#include <sys/intr.h> +#include <sys/proc.h> -#include <mips/psl.h> #include <mips/locore.h> +#include <mips/psl.h> #include <mips/regnum.h> -#include <machine/autoconf.h> -#include <machine/sysconf.h> -#include <machine/intr.h> +#include <pmax/autoconf.h> +#include <pmax/sysconf.h> struct evcnt pmax_clock_evcnt = EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "clock", "intr"); Index: src/sys/arch/pmax/pmax/machdep.c diff -u src/sys/arch/pmax/pmax/machdep.c:1.243 src/sys/arch/pmax/pmax/machdep.c:1.244 --- src/sys/arch/pmax/pmax/machdep.c:1.243 Wed Apr 6 15:31:08 2011 +++ src/sys/arch/pmax/pmax/machdep.c Sat Jul 9 17:32:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.243 2011/04/06 15:31:08 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.244 2011/07/09 17:32:30 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,22 +39,25 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243 2011/04/06 15:31:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.244 2011/07/09 17:32:30 matt Exp $"); #include "opt_ddb.h" #include "opt_modular.h" +#define _PMAX_BUS_DMA_PRIVATE + #include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> +#include <sys/boot_flag.h> #include <sys/buf.h> -#include <sys/reboot.h> -#include <sys/mount.h> +#include <sys/bus.h> +#include <sys/device.h> #include <sys/kcore.h> -#include <sys/boot_flag.h> +#include <sys/kernel.h> #include <sys/ksyms.h> +#include <sys/mount.h> #include <sys/proc.h> -#include <sys/device.h> +#include <sys/reboot.h> +#include <sys/systm.h> #include <uvm/uvm_extern.h> @@ -63,22 +66,19 @@ #include <ufs/mfs/mfs_extern.h> /* mfs_initminiroot() */ #include <mips/cache.h> +#include <mips/locore.h> #include <mips/regnum.h> #include <mips/psl.h> -#include <machine/autoconf.h> -#include <machine/dec_prom.h> -#include <machine/sysconf.h> -#include <machine/bootinfo.h> -#include <machine/locore.h> +#include <pmax/autoconf.h> +#include <pmax/dec_prom.h> +#include <pmax/sysconf.h> +#include <pmax/bootinfo.h> #include <pmax/pmax/machdep.h> -#define _PMAX_BUS_DMA_PRIVATE -#include <machine/bus.h> - #if NKSYMS || defined(DDB) || defined(MODULAR) -#include <machine/db_machdep.h> +#include <mips/db_machdep.h> #include <ddb/db_extern.h> #endif Index: src/sys/arch/pmax/pmax/mainbus.c diff -u src/sys/arch/pmax/pmax/mainbus.c:1.41 src/sys/arch/pmax/pmax/mainbus.c:1.42 --- src/sys/arch/pmax/pmax/mainbus.c:1.41 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/mainbus.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.41 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.42 2011/07/09 17:32:31 matt Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -29,14 +29,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.41 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.42 2011/07/09 17:32:31 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/sysconf.h> -#include <machine/autoconf.h> +#include <pmax/sysconf.h> +#include <pmax/autoconf.h> /* Definition of the mainbus driver. */ static int mbmatch(device_t, cfdata_t, void *); Index: src/sys/arch/pmax/pmax/memc_3max.c diff -u src/sys/arch/pmax/pmax/memc_3max.c:1.16 src/sys/arch/pmax/pmax/memc_3max.c:1.17 --- src/sys/arch/pmax/pmax/memc_3max.c:1.16 Mon Dec 14 00:46:11 2009 +++ src/sys/arch/pmax/pmax/memc_3max.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: memc_3max.c,v 1.16 2009/12/14 00:46:11 matt Exp $ */ +/* $NetBSD: memc_3max.c,v 1.17 2011/07/09 17:32:31 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -32,12 +32,12 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: memc_3max.c,v 1.16 2009/12/14 00:46:11 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: memc_3max.c,v 1.17 2011/07/09 17:32:31 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/locore.h> /* wbflush() */ +#include <mips/locore.h> /* wbflush() */ #include <pmax/pmax/kn02.h> /* error-register defs copied into kn03.h */ #include <pmax/pmax/memc.h> Index: src/sys/arch/pmax/pmax/promcall.c diff -u src/sys/arch/pmax/pmax/promcall.c:1.20 src/sys/arch/pmax/pmax/promcall.c:1.21 --- src/sys/arch/pmax/pmax/promcall.c:1.20 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/promcall.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: promcall.c,v 1.20 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: promcall.c,v 1.21 2011/07/09 17:32:31 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.20 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.21 2011/07/09 17:32:31 matt Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -48,7 +48,7 @@ #include <dev/cons.h> -#include <machine/dec_prom.h> +#include <pmax/dec_prom.h> #include <pmax/pmax/pmaxtype.h> #include <pmax/pmax/machdep.h> Index: src/sys/arch/pmax/pmax/sysconf.c diff -u src/sys/arch/pmax/pmax/sysconf.c:1.13 src/sys/arch/pmax/pmax/sysconf.c:1.14 --- src/sys/arch/pmax/pmax/sysconf.c:1.13 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/sysconf.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sysconf.c,v 1.13 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: sysconf.c,v 1.14 2011/07/09 17:32:31 matt Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,11 +31,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.13 2011/02/20 07:50:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.14 2011/07/09 17:32:31 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/sysconf.h> + +#include <pmax/sysconf.h> + #include <pmax/pmax/pmaxtype.h> Index: src/sys/arch/pmax/tc/asc_ioasic.c diff -u src/sys/arch/pmax/tc/asc_ioasic.c:1.23 src/sys/arch/pmax/tc/asc_ioasic.c:1.24 --- src/sys/arch/pmax/tc/asc_ioasic.c:1.23 Mon Dec 14 00:46:11 2009 +++ src/sys/arch/pmax/tc/asc_ioasic.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asc_ioasic.c,v 1.23 2009/12/14 00:46:11 matt Exp $ */ +/* $NetBSD: asc_ioasic.c,v 1.24 2011/07/09 17:32:31 matt Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,13 +30,13 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.23 2009/12/14 00:46:11 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.24 2011/07/09 17:32:31 matt Exp $"); -#include <sys/types.h> #include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> #include <sys/buf.h> +#include <sys/bus.h> +#include <sys/device.h> +#include <sys/systm.h> #include <uvm/uvm_extern.h> @@ -45,8 +45,6 @@ #include <dev/scsipi/scsiconf.h> #include <dev/scsipi/scsi_message.h> -#include <machine/bus.h> - #include <dev/ic/ncr53c9xreg.h> #include <dev/ic/ncr53c9xvar.h> Index: src/sys/arch/pmax/tc/dtkbd.c diff -u src/sys/arch/pmax/tc/dtkbd.c:1.9 src/sys/arch/pmax/tc/dtkbd.c:1.10 --- src/sys/arch/pmax/tc/dtkbd.c:1.9 Sat Jun 4 01:37:36 2011 +++ src/sys/arch/pmax/tc/dtkbd.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtkbd.c,v 1.9 2011/06/04 01:37:36 tsutsui Exp $ */ +/* $NetBSD: dtkbd.c,v 1.10 2011/07/09 17:32:31 matt Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,15 +30,16 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.9 2011/06/04 01:37:36 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.10 2011/07/09 17:32:31 matt Exp $"); #include "locators.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/callout.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/callout.h> +#include <sys/systm.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wskbdvar.h> @@ -47,8 +48,6 @@ #include <dev/dec/wskbdmap_lk201.h> #include <dev/tc/tcvar.h> -#include <machine/bus.h> - #include <pmax/tc/dtreg.h> #include <pmax/tc/dtvar.h> Index: src/sys/arch/pmax/tc/dtms.c diff -u src/sys/arch/pmax/tc/dtms.c:1.10 src/sys/arch/pmax/tc/dtms.c:1.11 --- src/sys/arch/pmax/tc/dtms.c:1.10 Sat Jun 4 01:37:36 2011 +++ src/sys/arch/pmax/tc/dtms.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtms.c,v 1.10 2011/06/04 01:37:36 tsutsui Exp $ */ +/* $NetBSD: dtms.c,v 1.11 2011/07/09 17:32:31 matt Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,20 +30,19 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dtms.c,v 1.10 2011/06/04 01:37:36 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dtms.c,v 1.11 2011/07/09 17:32:31 matt Exp $"); #include "locators.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/syslog.h> +#include <sys/systm.h> -#include <machine/bus.h> - -#include <arch/pmax/tc/dtreg.h> -#include <arch/pmax/tc/dtvar.h> +#include <pmax/tc/dtreg.h> +#include <pmax/tc/dtvar.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsmousevar.h> Index: src/sys/arch/pmax/tc/ioasic.c diff -u src/sys/arch/pmax/tc/ioasic.c:1.20 src/sys/arch/pmax/tc/ioasic.c:1.21 --- src/sys/arch/pmax/tc/ioasic.c:1.20 Sat Jun 4 01:49:43 2011 +++ src/sys/arch/pmax/tc/ioasic.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ioasic.c,v 1.20 2011/06/04 01:49:43 tsutsui Exp $ */ +/* $NetBSD: ioasic.c,v 1.21 2011/07/09 17:32:31 matt Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.20 2011/06/04 01:49:43 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.21 2011/07/09 17:32:31 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ #include <dev/tc/ioasicreg.h> #include <dev/tc/ioasicvar.h> -#include <machine/sysconf.h> +#include <pmax/sysconf.h> #include <pmax/pmax/pmaxtype.h> #include <pmax/pmax/kmin.h> Index: src/sys/arch/pmax/tc/tcbus.c diff -u src/sys/arch/pmax/tc/tcbus.c:1.27 src/sys/arch/pmax/tc/tcbus.c:1.28 --- src/sys/arch/pmax/tc/tcbus.c:1.27 Sat Jun 4 01:57:35 2011 +++ src/sys/arch/pmax/tc/tcbus.c Sat Jul 9 17:32:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tcbus.c,v 1.27 2011/06/04 01:57:35 tsutsui Exp $ */ +/* $NetBSD: tcbus.c,v 1.28 2011/07/09 17:32:31 matt Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,8 +30,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.27 2011/06/04 01:57:35 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.28 2011/07/09 17:32:31 matt Exp $"); +#define _PMAX_BUS_DMA_PRIVATE /* * Which system models were configured? */ @@ -41,14 +42,12 @@ #include "opt_dec_3maxplus.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> #include <sys/device.h> +#include <sys/systm.h> -#include <machine/autoconf.h> -#include <machine/sysconf.h> - -#define _PMAX_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <pmax/autoconf.h> +#include <pmax/sysconf.h> #include <dev/tc/tcvar.h> #include <pmax/pmax/pmaxtype.h> @@ -177,7 +176,7 @@ #include "pxg.h" #include <pmax/pmax/cons.h> -#include <machine/dec_prom.h> +#include <pmax/dec_prom.h> int tc_checkslot(tc_addr_t, char *);