Module Name: src Committed By: matt Date: Tue Jun 23 21:00:23 UTC 2015
Modified Files: src/sys/arch/ews4800mips/ews4800mips: bus_dma.c bus_space.c cpu.c sbd.c tr2.c tr2a.c src/sys/arch/ews4800mips/include: bus.h src/sys/arch/ews4800mips/sbd: fb_sbdio.c if_iee_sbdio.c sbdio.c zs_sbdio.c Log Message: Fixup includes to the new world order. Put platform wdflush into mips_locore_jumpvec To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/ews4800mips/bus_space.c \ src/sys/arch/ews4800mips/ews4800mips/tr2.c \ src/sys/arch/ews4800mips/ews4800mips/tr2a.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/ews4800mips/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ews4800mips/ews4800mips/sbd.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/include/bus.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/sbd/fb_sbdio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c \ src/sys/arch/ews4800mips/sbd/zs_sbdio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/sbd/sbdio.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/ews4800mips/ews4800mips/bus_dma.c diff -u src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.14 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.15 --- src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.14 Thu Jun 11 08:22:08 2015 +++ src/sys/arch/ews4800mips/ews4800mips/bus_dma.c Tue Jun 23 21:00:23 2015 @@ -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> Index: src/sys/arch/ews4800mips/ews4800mips/bus_space.c diff -u src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.5 src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.5 Fri Jan 27 18:52:55 2012 +++ src/sys/arch/ews4800mips/ews4800mips/bus_space.c Tue Jun 23 21:00:23 2015 @@ -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> + +#include <mips/locore.h> -#define _EWS4800MIPS_BUS_SPACE_PRIVATE -#include <machine/bus.h> #include <machine/sbdvar.h> #ifdef BUS_SPACE_DEBUG Index: src/sys/arch/ews4800mips/ews4800mips/tr2.c diff -u src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.5 src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.5 Sun Feb 20 07:55:20 2011 +++ src/sys/arch/ews4800mips/ews4800mips/tr2.c Tue Jun 23 21:00:23 2015 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.5 #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 @@ tr2_init(void) /* Register system-board specific ops. */ _SBD_OPS_REGISTER_ALL(tr2); + + mips_locore_jumpvec.ljv_wbflush = platform.wbflush; } int Index: src/sys/arch/ews4800mips/ews4800mips/tr2a.c diff -u src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.5 src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.5 Sun Feb 20 07:55:20 2011 +++ src/sys/arch/ews4800mips/ews4800mips/tr2a.c Tue Jun 23 21:00:23 2015 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.5 #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 @@ tr2a_init(void) /* Register system-board specific ops. */ _SBD_OPS_REGISTER_ALL(tr2a); + + mips_locore_jumpvec.ljv_wbflush = platform.wbflush; } int Index: src/sys/arch/ews4800mips/ews4800mips/cpu.c diff -u src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.4 src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.5 --- src/sys/arch/ews4800mips/ews4800mips/cpu.c:1.4 Sun Feb 20 07:55:20 2011 +++ src/sys/arch/ews4800mips/ews4800mips/cpu.c Tue Jun 23 21:00:23 2015 @@ -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" Index: src/sys/arch/ews4800mips/ews4800mips/sbd.c diff -u src/sys/arch/ews4800mips/ews4800mips/sbd.c:1.3 src/sys/arch/ews4800mips/ews4800mips/sbd.c:1.4 --- src/sys/arch/ews4800mips/ews4800mips/sbd.c:1.3 Mon Dec 14 00:46:03 2009 +++ src/sys/arch/ews4800mips/ews4800mips/sbd.c Tue Jun 23 21:00:23 2015 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: sbd.c,v 1.3 #include <uvm/uvm_extern.h> +#include <mips/locore.h> + #include <machine/sbdvar.h> #include <machine/sbd.h> Index: src/sys/arch/ews4800mips/include/bus.h diff -u src/sys/arch/ews4800mips/include/bus.h:1.6 src/sys/arch/ews4800mips/include/bus.h:1.7 --- src/sys/arch/ews4800mips/include/bus.h:1.6 Mon Apr 28 20:23:18 2008 +++ src/sys/arch/ews4800mips/include/bus.h Tue Jun 23 21:00:23 2015 @@ -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 @@ struct ews4800mips_bus_space { }; #ifdef _KERNEL -/* Don't use locore.h wbflush */ -#undef wbflush -#define wbflush() platform.wbflush() #ifdef _EWS4800MIPS_BUS_SPACE_PRIVATE #ifndef __read_1 Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.14 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.15 --- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.14 Sun Sep 21 15:50:35 2014 +++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Tue Jun 23 21:00:23 2015 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v #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> Index: src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.11 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.12 --- src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.11 Wed Jan 22 18:20:41 2014 +++ src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c Tue Jun 23 21:00:23 2015 @@ -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/systm.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 <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> Index: src/sys/arch/ews4800mips/sbd/zs_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.11 src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.12 --- src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.11 Wed Jan 22 18:47:03 2014 +++ src/sys/arch/ews4800mips/sbd/zs_sbdio.c Tue Jun 23 21:00:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: zs_sbdio.c,v 1.11 2014/01/22 18:47:03 christos Exp $ */ +/* $NetBSD: zs_sbdio.c,v 1.12 2015/06/23 21:00:23 matt Exp $ */ /*- * Copyright (c) 1996, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_sbdio.c,v 1.11 2014/01/22 18:47:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_sbdio.c,v 1.12 2015/06/23 21:00:23 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,6 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: zs_sbdio.c,v #include <dev/cons.h> #include <dev/ic/z8530reg.h> +#include <mips/locore.h> + #include <machine/sbdiovar.h> #include <machine/z8530var.h> Index: src/sys/arch/ews4800mips/sbd/sbdio.c diff -u src/sys/arch/ews4800mips/sbd/sbdio.c:1.4 src/sys/arch/ews4800mips/sbd/sbdio.c:1.5 --- src/sys/arch/ews4800mips/sbd/sbdio.c:1.4 Mon Dec 14 00:46:03 2009 +++ src/sys/arch/ews4800mips/sbd/sbdio.c Tue Jun 23 21:00:23 2015 @@ -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/systm.h> +#include <sys/bus.h> #include <sys/device.h> +#include <sys/systm.h> + +#include <mips/locore.h> #include <machine/autoconf.h> -#define _EWS4800MIPS_BUS_DMA_PRIVATE -#include <machine/bus.h> #include <machine/sbdvar.h> #include <machine/sbdiovar.h>