CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Sun Nov 15 23:10:22 UTC 2009

Modified Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio.c

Log Message:
- use PRIxPADDR and PRIxPSIZE as needed when printing
bus address and size following change in typedef
- use new obio bus space


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_obio.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/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.5	Mon Nov  9 10:05:06 2009
+++ src/sys/arch/mips/rmi/rmixl_obio.c	Sun Nov 15 23:10:22 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_obio.c,v 1.1.2.5 2009/11/09 10:05:06 cliff Exp $	*/
+/*	$NetBSD: rmixl_obio.c,v 1.1.2.6 2009/11/15 23:10:22 cliff Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.5 2009/11/09 10:05:06 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.6 2009/11/15 23:10:22 cliff Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -105,7 +105,8 @@
 
 	obio_bus_init(sc);
 
-	aprint_normal(" addr %#lx size %#x\n", ba, RMIXL_IO_DEV_SIZE);
+	aprint_normal(" addr %#"PRIxPADDR" size %#"PRIxPSIZE"\n",
+		ba, (bus_size_t)RMIXL_IO_DEV_SIZE);
 	aprint_naive("\n");
 
 	/*
@@ -121,9 +122,9 @@
 	struct obio_attach_args *obio = aux;
 
 	if (obio->obio_addr != OBIOCF_ADDR_DEFAULT) {
-		aprint_normal(" addr 0x%08lx", obio->obio_addr);
+		aprint_normal(" addr %#"PRIxPADDR, obio->obio_addr);
 		if (obio->obio_size != OBIOCF_SIZE_DEFAULT)
-			aprint_normal("-0x%08lx",
+			aprint_normal("-%#"PRIxPADDR,
 				obio->obio_addr + (obio->obio_size - 1));
 	}
 	if (obio->obio_mult != OBIOCF_MULT_DEFAULT)
@@ -140,8 +141,7 @@
 	struct obio_softc *sc = device_private(parent);
 	struct obio_attach_args obio;
 
-	obio.obio_el_bst = sc->sc_el_bst;
-	obio.obio_eb_bst = sc->sc_eb_bst;
+	obio.obio_bst = sc->sc_bst;
 	obio.obio_addr = cf->cf_loc[OBIOCF_ADDR];
 	obio.obio_size = cf->cf_loc[OBIOCF_SIZE];
 	obio.obio_mult = cf->cf_loc[OBIOCF_MULT];
@@ -166,13 +166,9 @@
 		return;
 	done = 1;
 
-	/* little endian space */
-	if (rcp->rc_el_memt.bs_cookie == 0)
-		rmixl_el_bus_mem_init(&rcp->rc_el_memt, rcp);
-
-	/* big endian space */
-	if (rcp->rc_eb_memt.bs_cookie == 0)
-		rmixl_eb_bus_mem_init(&rcp->rc_eb_memt, rcp);
+	/* obio (devio) space */
+	if (rcp->rc_obio_memt.bs_cookie == 0)
+		rmixl_obio_bus_mem_init(&rcp->rc_obio_memt, rcp);
 
 	/* dma space for addr < 512MB */
 	if (rcp->rc_29bit_dmat._cookie == 0)
@@ -188,8 +184,7 @@
 
 	sc->sc_base = (bus_addr_t)rcp->rc_io_pbase;
 	sc->sc_size = (bus_size_t)RMIXL_IO_DEV_SIZE;
-	sc->sc_el_bst = (bus_space_tag_t)&rcp->rc_el_memt;
-	sc->sc_eb_bst = (bus_space_tag_t)&rcp->rc_eb_memt;
+	sc->sc_bst = (bus_space_tag_t)&rcp->rc_obio_memt;
 	sc->sc_29bit_dmat = &rcp->rc_29bit_dmat;
 #ifdef NOTYET
 	sc->sc_32bit_dmat = &rcp->rc_32bit_dmat;