[src/trunk]: src/sys/arch/evbppc/obs405 Call bus_space_mallocok earlier. Mor...

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

details:   https://anonhg.NetBSD.org/src/rev/55e94db7563c
branches:  trunk
changeset: 771977:55e94db7563c
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Mon Dec 12 11:31:46 2011 +0000

description:
Call bus_space_mallocok earlier.  Moreover, don't bus_space_unmap call.

diffstat:

 sys/arch/evbppc/obs405/obs600_machdep.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r ffa6b15b367a -r 55e94db7563c sys/arch/evbppc/obs405/obs600_machdep.c
--- a/sys/arch/evbppc/obs405/obs600_machdep.c   Mon Dec 12 11:28:04 2011 +0000
+++ b/sys/arch/evbppc/obs405/obs600_machdep.c   Mon Dec 12 11:31:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obs600_machdep.c,v 1.7 2011/06/20 17:44:33 matt Exp $  */
+/*     $NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $      */
 /*     Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $    */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.7 2011/06/20 17:44:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -215,6 +215,11 @@
         */
        board_info_init();
 
+       /*
+        * Now that we have VM, malloc()s are OK in bus_space.
+        */
+       bus_space_mallocok();
+
        read_eeprom(sizeof(buf), buf);
        macaddr = &buf[0];
        macaddr1 = &buf[8];
@@ -260,11 +265,6 @@
        prop_object_release(pn);
 
        /*
-        * Now that we have VM, malloc()s are OK in bus_space.
-        */
-       bus_space_mallocok();
-
-       /*
         * no fake mapiodev
         */
        fake_mapiodev = 0;
@@ -413,7 +413,9 @@
        for ( ; i < 4; i++)
                (void) bus_space_read_1(bst, bsh, IIC_MDBUF);
 
+#if 0  /* Ooops, can't unmap here... */
        bus_space_unmap(bst, bsh, IIC_NREG);
+#endif
 
        return (cnt == len) ? 0 : EINVAL;
 }