[src/trunk]: src/sys/arch/pmax Cleanu <machine/*> includes

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ecbd1b811748
branches:  trunk
changeset: 767142:ecbd1b811748
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jul 09 17:32:29 2011 +0000

description:
Cleanu <machine/*> includes

diffstat:

 sys/arch/pmax/ibus/dz_ibus.c      |  17 ++++++++---------
 sys/arch/pmax/ibus/ibus.c         |   8 ++++----
 sys/arch/pmax/ibus/ibus_3max.c    |   7 ++++---
 sys/arch/pmax/ibus/ibus_pmax.c    |  10 +++++-----
 sys/arch/pmax/ibus/ibusvar.h      |   4 ++--
 sys/arch/pmax/ibus/pm.c           |  15 +++++++--------
 sys/arch/pmax/ibus/sii.c          |   6 +++---
 sys/arch/pmax/ibus/sii_ds.c       |  13 +++++++------
 sys/arch/pmax/include/locore.h    |   4 +---
 sys/arch/pmax/pmax/autoconf.c     |  14 +++++++-------
 sys/arch/pmax/pmax/bus_dma.c      |  12 ++++++------
 sys/arch/pmax/pmax/bus_space.c    |   7 +++----
 sys/arch/pmax/pmax/clock.c        |   7 ++++---
 sys/arch/pmax/pmax/cpu.c          |   6 +++---
 sys/arch/pmax/pmax/dec_3100.c     |  13 ++++++-------
 sys/arch/pmax/pmax/dec_3max.c     |  17 +++++++++--------
 sys/arch/pmax/pmax/dec_3maxplus.c |  11 ++++++-----
 sys/arch/pmax/pmax/dec_3min.c     |  14 +++++++-------
 sys/arch/pmax/pmax/dec_5100.c     |  14 ++++++++------
 sys/arch/pmax/pmax/dec_maxine.c   |  13 +++++++------
 sys/arch/pmax/pmax/interrupt.c    |  14 +++++++-------
 sys/arch/pmax/pmax/machdep.c      |  36 ++++++++++++++++++------------------
 sys/arch/pmax/pmax/mainbus.c      |   8 ++++----
 sys/arch/pmax/pmax/memc_3max.c    |   6 +++---
 sys/arch/pmax/pmax/promcall.c     |   6 +++---
 sys/arch/pmax/pmax/sysconf.c      |   8 +++++---
 sys/arch/pmax/tc/asc_ioasic.c     |  12 +++++-------
 sys/arch/pmax/tc/dtkbd.c          |  11 +++++------
 sys/arch/pmax/tc/dtms.c           |  13 ++++++-------
 sys/arch/pmax/tc/ioasic.c         |   6 +++---
 sys/arch/pmax/tc/tcbus.c          |  17 ++++++++---------
 31 files changed, 174 insertions(+), 175 deletions(-)

diffs (truncated from 1019 to 300 lines):

diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/dz_ibus.c
--- a/sys/arch/pmax/ibus/dz_ibus.c      Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/dz_ibus.c      Sat Jul 09 17:32:29 2011 +0000
@@ -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>
 
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/ibus.c
--- a/sys/arch/pmax/ibus/ibus.c Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus.c Sat Jul 09 17:32:29 2011 +0000
@@ -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/device.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
-#include <machine/sysconf.h>
+#include <pmax/sysconf.h>
 #include <pmax/ibus/ibusvar.h>
 
 #include "locators.h"
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/ibus_3max.c
--- a/sys/arch/pmax/ibus/ibus_3max.c    Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus_3max.c    Sat Jul 09 17:32:29 2011 +0000
@@ -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/device.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
 #include <dev/tc/tcvar.h>
+
 #include <pmax/ibus/ibusvar.h>
 #include <pmax/pmax/kn02.h>
 
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/ibus_pmax.c
--- a/sys/arch/pmax/ibus/ibus_pmax.c    Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus_pmax.c    Sat Jul 09 17:32:29 2011 +0000
@@ -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/device.h>
 #include <sys/systm.h>
-#include <sys/device.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>
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/ibusvar.h
--- a/sys/arch/pmax/ibus/ibusvar.h      Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/ibusvar.h      Sat Jul 09 17:32:29 2011 +0000
@@ -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;
 
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/pm.c
--- a/sys/arch/pmax/ibus/pm.c   Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/pm.c   Sat Jul 09 17:32:29 2011 +0000
@@ -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/buf.h>
+#include <sys/bus.h>
 #include <sys/device.h>
-#include <sys/buf.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>
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/sii.c
--- a/sys/arch/pmax/ibus/sii.c  Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/sii.c  Sat Jul 09 17:32:29 2011 +0000
@@ -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>
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/ibus/sii_ds.c
--- a/sys/arch/pmax/ibus/sii_ds.c       Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/ibus/sii_ds.c       Sat Jul 09 17:32:29 2011 +0000
@@ -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/buf.h>
+#include <sys/bus.h>
 #include <sys/device.h>
-#include <sys/buf.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>
 
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/include/locore.h
--- a/sys/arch/pmax/include/locore.h    Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/include/locore.h    Sat Jul 09 17:32:29 2011 +0000
@@ -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);
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/pmax/autoconf.c
--- a/sys/arch/pmax/pmax/autoconf.c     Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/pmax/autoconf.c     Sat Jul 09 17:32:29 2011 +0000
@@ -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>
 
diff -r 9d32b669e0f5 -r ecbd1b811748 sys/arch/pmax/pmax/bus_dma.c
--- a/sys/arch/pmax/pmax/bus_dma.c      Sat Jul 09 17:22:08 2011 +0000
+++ b/sys/arch/pmax/pmax/bus_dma.c      Sat Jul 09 17:32:29 2011 +0000
@@ -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 @@
  */