Module Name: src
Committed By: kiyohara
Date: Mon Dec 12 11:31:46 UTC 2011
Modified Files:
src/sys/arch/evbppc/obs405: obs600_machdep.c
Log Message:
Call bus_space_mallocok earlier. Moreover, don't bus_space_unmap call.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs600_machdep.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/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.7 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.8
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.7 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Mon Dec 12 11:31:46 2011
@@ -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 @@ cpu_startup(void)
*/
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 @@ cpu_startup(void)
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 @@ read_eeprom(int len, char *buf)
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;
}
