 @@ -1,14 +1,14 @@
-/*	$NetBSD: ebus.c,v 1.33 2011/07/18 00:31:13 mrg Exp $ */
+/*	$NetBSD: ebus.c,v 1.34 2012/01/30 04:25:14 mrg Exp $ */
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * EBus support for PCI based SPARC systems (ms-IIep, Ultra).
  * EBus is documented in PCIO manual (Sun Part#: 802-7837-01).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.33 2011/07/18 00:31:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.34 2012/01/30 04:25:14 mrg Exp $");
 #if defined(DEBUG) && !defined(EBUS_DEBUG)
 #define EBUS_DEBUG
 #endif
 #ifdef EBUS_DEBUG
 #define	EDB_PROM	0x01
 #define EDB_CHILD	0x02
 #define	EDB_INTRMAP	0x04
 #define EDB_BUSMAP	0x08
 #define EDB_BUSDMA	0x10
 #define EDB_INTR	0x20
 int ebus_debug = 0;
 @@ -322,27 +322,27 @@ ebus_attach(device_t parent, device_t se
 static int
 ebus_setup_attach_args(struct ebus_softc *sc,
 		       bus_space_tag_t bustag, bus_dma_tag_t dmatag, int node,
 		       struct ebus_attach_args	*ea)
+{
 	int n, err;
 	memset(ea, 0, sizeof(struct ebus_attach_args));
 	err = prom_getprop(node, "name", 1, &n, &ea->ea_name);
 	if (err != 0)
 		return (err);
-	ea->ea_name[n] = '\0';
+	KASSERT(ea->ea_name[n-1] == '\0');
 	ea->ea_node = node;
 	ea->ea_bustag = bustag;
 	ea->ea_dmatag = dmatag;
 	err = prom_getprop(node, "reg", sizeof(struct ebus_regs),
 			   &ea->ea_nreg, &ea->ea_reg);
 	if (err != 0)
 		return (err);
 	/*
 	 * On Ultra the bar is the _offset_ of the BAR in PCI config
 	 * space but in (some?) ms-IIep systems (e.g. Krups) it's the

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $ */
+/*	$NetBSD: sbus.c,v 1.76 2012/01/30 04:25:14 mrg Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -64,27 +64,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)sbus.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Sbus stuff.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.76 2012/01/30 04:25:14 mrg Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <sparc/dev/sbusreg.h>
 #include <dev/sbus/sbusvar.h>
 @@ -434,27 +434,27 @@ sbus_attach_common(struct sbus_softc *sc
+}
 int
 sbus_setup_attach_args(struct sbus_softc *sc,
 		       bus_space_tag_t bustag, bus_dma_tag_t dmatag, int node,
 		       struct sbus_attach_args *sa)
+{
 	int n, error;
 	memset(sa, 0, sizeof(struct sbus_attach_args));
 	error = prom_getprop(node, "name", 1, &n, &sa->sa_name);
 	if (error != 0)
 		return (error);
-	sa->sa_name[n] = '\0';
+	KASSERT(sa->sa_name[n-1] == '\0');
 	sa->sa_bustag = bustag;
 	sa->sa_dmatag = dmatag;
 	sa->sa_node = node;
 	sa->sa_frequency = sc->sc_clockfreq;
 	error = prom_getprop(node, "reg", sizeof(struct openprom_addr),
 			&sa->sa_nreg, &sa->sa_reg);
 	if (error != 0) {
 		char buf[32];
 		if (error != ENOENT ||
 		    !node_has_property(node, "device_type") ||
 		    strcmp(prom_getpropstringA(node, "device_type", buf, sizeof buf),

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ebus.c,v 1.59 2011/07/20 12:06:00 macallan Exp $	*/
+/*	$NetBSD: ebus.c,v 1.60 2012/01/30 04:25:15 mrg Exp $	*/
 /*
  * Copyright (c) 1999, 2000, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.59 2011/07/20 12:06:00 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.60 2012/01/30 04:25:15 mrg Exp $");
 #include "opt_ddb.h"
 /*
  * UltraSPARC 5 and beyond ebus support.
+ *
  * note that this driver is not complete:
  *	- interrupt establish is written and appears to work
  *	- bus map code is written and appears to work
  *	- ebus2 DMA code is completely unwritten, we just punt to
  *	  the iommu.
  */
 @@ -216,27 +216,27 @@ ebus_attach(device_t parent, device_t se
 int	ebus_setup_attach_args(struct ebus_softc *, int,
 	    struct ebus_attach_args *);
 int
 ebus_setup_attach_args(struct ebus_softc *sc, int node,
 	struct ebus_attach_args	*ea)
+{
 	int	n, rv;
 	memset(ea, 0, sizeof(struct ebus_attach_args));
 	n = 0;
 	rv = prom_getprop(node, "name", 1, &n, &ea->ea_name);
 	if (rv != 0)
 		return (rv);
-	ea->ea_name[n] = '\0';
+	KASSERT(ea->ea_name[n-1] == '\0');
 	ea->ea_node = node;
 	ea->ea_bustag = sc->sc_childbustag;
 	ea->ea_dmatag = sc->sc_dmatag;
 	rv = prom_getprop(node, "reg", sizeof(struct ebus_regs), &ea->ea_nreg,
 	    &ea->ea_reg);
 	if (rv)
 		return (rv);
 	rv = prom_getprop(node, "address", sizeof(uint32_t), &ea->ea_nvaddr,
 	    &ea->ea_vaddr);
 	if (rv != ENOENT) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sbus.c,v 1.92 2011/09/04 12:17:14 nakayama Exp $ */
+/*	$NetBSD: sbus.c,v 1.93 2012/01/30 04:25:15 mrg Exp $ */
 /*
  * Copyright (c) 1999-2002 Eduardo Horvath
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Sbus stuff.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.92 2011/09/04 12:17:14 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.93 2012/01/30 04:25:15 mrg Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <machine/openfirm.h>
 @@ -305,27 +305,27 @@ int
 sbus_setup_attach_args(struct sbus_softc *sc, bus_space_tag_t bustag,
 	bus_dma_tag_t dmatag, int node, struct sbus_attach_args	*sa)
+{
 	/*struct	openprom_addr sbusreg;*/
 	/*int	base;*/
 	int	error;
 	int n;
 	memset(sa, 0, sizeof(struct sbus_attach_args));
 	n = 0;
 	error = prom_getprop(node, "name", 1, &n, &sa->sa_name);
 	if (error != 0)
 		return (error);
-	sa->sa_name[n] = '\0';
+	KASSERT(sa->sa_name[n-1] == '\0');
 	sa->sa_bustag = bustag;
 	sa->sa_dmatag = dmatag;
 	sa->sa_node = node;
 	sa->sa_frequency = sc->sc_clockfreq;
 	error = prom_getprop(node, "reg", sizeof(struct openprom_addr),
 			 &sa->sa_nreg, &sa->sa_reg);
 	if (error != 0) {
 		char buf[32];
 		if (error != ENOENT ||
 		    !node_has_property(node, "device_type") ||
 		    strcmp(prom_getpropstringA(node, "device_type", buf, sizeof buf),