[src/trunk]: src/sys/arch/ews4800mips Fixup includes to the new world order.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/ews4800mips Fixup includes to the new world order.
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:28:22 +0000
details:   https://anonhg.NetBSD.org/src/rev/4c98adbdd298
branches:  trunk
changeset: 339050:4c98adbdd298
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jun 23 21:00:23 2015 +0000

description:
Fixup includes to the new world order.
Put platform wdflush into mips_locore_jumpvec

diffstat:

 sys/arch/ews4800mips/ews4800mips/bus_dma.c   |  10 ++++++----
 sys/arch/ews4800mips/ews4800mips/bus_space.c |  15 +++++++++------
 sys/arch/ews4800mips/ews4800mips/cpu.c       |   6 ++++--
 sys/arch/ews4800mips/ews4800mips/sbd.c       |   6 ++++--
 sys/arch/ews4800mips/ews4800mips/tr2.c       |   7 +++++--
 sys/arch/ews4800mips/ews4800mips/tr2a.c      |   7 +++++--
 sys/arch/ews4800mips/include/bus.h           |   5 +----
 sys/arch/ews4800mips/sbd/fb_sbdio.c          |   6 +++---
 sys/arch/ews4800mips/sbd/if_iee_sbdio.c      |  15 ++++++++-------
 sys/arch/ews4800mips/sbd/sbdio.c             |  13 ++++++++-----
 sys/arch/ews4800mips/sbd/zs_sbdio.c          |   6 ++++--
 11 files changed, 57 insertions(+), 39 deletions(-)

diffs (truncated from 335 to 300 lines):

diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/bus_dma.c
--- a/sys/arch/ews4800mips/ews4800mips/bus_dma.c        Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/bus_dma.c        Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.14 2015/06/11 08:22:08 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.15 2015/06/23 21:00:23 matt Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,18 +31,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.14 2015/06/11 08:22:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.15 2015/06/23 21:00:23 matt Exp $");
 
+#define        _EWS4800MIPS_BUS_DMA_PRIVATE
 /* #define     BUS_DMA_DEBUG */
+
 #include <sys/param.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
+#include <mips/locore.h>
 #include <mips/cache.h>
 
-#define        _EWS4800MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
 #include <machine/sbdvar.h>
 
 #include <dev/bus_dma/bus_dmamem_common.h>
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/bus_space.c
--- a/sys/arch/ews4800mips/ews4800mips/bus_space.c      Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/bus_space.c      Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $       */
+/*     $NetBSD: bus_space.c,v 1.6 2015/06/23 21:00:23 matt Exp $       */
 
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,15 +27,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.6 2015/06/23 21:00:23 matt Exp $");
+
+#define        _EWS4800MIPS_BUS_SPACE_PRIVATE
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/bus.h>
 #include <sys/extent.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
 
-#define        _EWS4800MIPS_BUS_SPACE_PRIVATE
-#include <machine/bus.h>
+#include <mips/locore.h>
+
 #include <machine/sbdvar.h>
 
 #ifdef BUS_SPACE_DEBUG
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/cpu.c
--- a/sys/arch/ews4800mips/ews4800mips/cpu.c    Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/cpu.c    Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.4 2011/02/20 07:55:20 matt Exp $     */
+/*     $NetBSD: cpu.c,v 1.5 2015/06/23 21:00:23 matt Exp $     */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,13 +26,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.4 2011/02/20 07:55:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.5 2015/06/23 21:00:23 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 
+#include <mips/locore.h>
+
 #include <machine/autoconf.h>
 
 #include "ioconf.h"
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/sbd.c
--- a/sys/arch/ews4800mips/ews4800mips/sbd.c    Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/sbd.c    Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbd.c,v 1.3 2009/12/14 00:46:03 matt Exp $     */
+/*     $NetBSD: sbd.c,v 1.4 2015/06/23 21:00:23 matt Exp $     */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbd.c,v 1.3 2009/12/14 00:46:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbd.c,v 1.4 2015/06/23 21:00:23 matt Exp $");
 
 /* System board */
 #include "opt_sbd.h"
@@ -40,6 +40,8 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <mips/locore.h>
+
 #include <machine/sbdvar.h>
 #include <machine/sbd.h>
 
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/tr2.c
--- a/sys/arch/ews4800mips/ews4800mips/tr2.c    Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/tr2.c    Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tr2.c,v 1.5 2011/02/20 07:55:20 matt Exp $     */
+/*     $NetBSD: tr2.c,v 1.6 2015/06/23 21:00:23 matt Exp $     */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.5 2011/02/20 07:55:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.6 2015/06/23 21:00:23 matt Exp $");
 
 #define __INTR_PRIVATE
 #include "fb_sbdio.h"
@@ -46,6 +46,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <mips/locore.h>       /* Set L2-cache size */
 #include <mips/cache.h>                /* Set L2-cache size */
 
 #include <machine/autoconf.h>
@@ -110,6 +111,8 @@
 
        /* Register system-board specific ops. */
        _SBD_OPS_REGISTER_ALL(tr2);
+
+       mips_locore_jumpvec.ljv_wbflush = platform.wbflush;
 }
 
 int
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/ews4800mips/tr2a.c
--- a/sys/arch/ews4800mips/ews4800mips/tr2a.c   Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/tr2a.c   Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tr2a.c,v 1.5 2011/02/20 07:55:20 matt Exp $    */
+/*     $NetBSD: tr2a.c,v 1.6 2015/06/23 21:00:23 matt Exp $    */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.5 2011/02/20 07:55:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.6 2015/06/23 21:00:23 matt Exp $");
 
 #define __INTR_PRIVATE
 #include "fb_sbdio.h"
@@ -46,6 +46,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <mips/locore.h>
 #include <mips/cache.h>                /* Set L2-cache size */
 
 #include <machine/autoconf.h>
@@ -159,6 +160,8 @@
 
        /* Register system-board specific ops. */
        _SBD_OPS_REGISTER_ALL(tr2a);
+
+       mips_locore_jumpvec.ljv_wbflush = platform.wbflush;
 }
 
 int
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/include/bus.h
--- a/sys/arch/ews4800mips/include/bus.h        Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/include/bus.h        Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.6 2008/04/28 20:23:18 martin Exp $   */
+/*     $NetBSD: bus.h,v 1.7 2015/06/23 21:00:23 matt Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 2000, 2001, 2005 The NetBSD Foundation, Inc.
@@ -230,9 +230,6 @@
 };
 
 #ifdef _KERNEL
-/* Don't use locore.h wbflush */
-#undef wbflush
-#define        wbflush()       platform.wbflush()
 #ifdef _EWS4800MIPS_BUS_SPACE_PRIVATE
 
 #ifndef __read_1
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/sbd/fb_sbdio.c
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c       Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c       Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb_sbdio.c,v 1.14 2014/09/21 15:50:35 christos Exp $   */
+/*     $NetBSD: fb_sbdio.c,v 1.15 2015/06/23 21:00:23 matt Exp $       */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define WIRED_FB_TLB
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.14 2014/09/21 15:50:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.15 2015/06/23 21:00:23 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,9 +46,9 @@
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 
+#include <mips/locore.h>
 #include <mips/pte.h>
 
-#include <machine/locore.h>
 #include <machine/sbdiovar.h>
 
 #include <machine/gareg.h>
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/sbd/if_iee_sbdio.c
--- a/sys/arch/ews4800mips/sbd/if_iee_sbdio.c   Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/sbd/if_iee_sbdio.c   Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iee_sbdio.c,v 1.11 2014/01/22 18:20:41 christos Exp $       */
+/*     $NetBSD: if_iee_sbdio.c,v 1.12 2015/06/23 21:00:23 matt Exp $   */
 
 /*
  * Copyright (c) 2003 Jochen Kunz.
@@ -30,22 +30,23 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iee_sbdio.c,v 1.11 2014/01/22 18:20:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iee_sbdio.c,v 1.12 2015/06/23 21:00:23 matt Exp $");
 
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
-#include <sys/socket.h>
-#include <sys/mbuf.h>
 
 #include <mips/cache.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <mips/locore.h>
 #include <machine/sbdvar.h>    /* for ether_addr() */
 #include <machine/sbdiovar.h>
 
diff -r b16dc52e64b2 -r 4c98adbdd298 sys/arch/ews4800mips/sbd/sbdio.c
--- a/sys/arch/ews4800mips/sbd/sbdio.c  Tue Jun 23 20:56:17 2015 +0000
+++ b/sys/arch/ews4800mips/sbd/sbdio.c  Tue Jun 23 21:00:23 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbdio.c,v 1.4 2009/12/14 00:46:03 matt Exp $   */
+/*     $NetBSD: sbdio.c,v 1.5 2015/06/23 21:00:23 matt Exp $   */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,15 +30,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdio.c,v 1.4 2009/12/14 00:46:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdio.c,v 1.5 2015/06/23 21:00:23 matt Exp $");
+
+#define _EWS4800MIPS_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
 #include <sys/systm.h>
-#include <sys/device.h>
+
Prev by Date: [src/trunk]: src/external/gpl3/gcc/dist/gcc/config/rs6000 Change CC1_SPEC and...
Next by Date: [src/trunk]: src/sys/arch/mipsco/include All mips ports will need it.
Previous by Thread: [src/trunk]: src/external/gpl3/gcc/dist/gcc/config/rs6000 Change CC1_SPEC and...
Next by Thread: [src/trunk]: src/sys/arch/mipsco/include All mips ports will need it.
Indexes:
Home | Main Index | Thread Index | Old Index