 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
 @@ -58,27 +58,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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: 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"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 @@ -205,26 +205,31 @@ cpu_startup(void)
 	u_char *macaddr, *macaddr1;
 	static u_char buf[16];	/* MAC address x2 buffer */
 	/*
 	 * cpu common startup
 	 */
 	ibm4xx_cpu_startup("OpenBlockS600 AMCC PowerPC 405EX Board");
 	/*
 	 * Set up the board properties database.
 	 */
 	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];
 	pn = prop_number_create_integer(OBS600_CPU_FREQ);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "processor-frequency", pn) ==
 	    false)
 		panic("setting processor-frequency");
 	prop_object_release(pn);
 	pn = prop_number_create_integer(OBS600_MEM_SIZE);
 	KASSERT(pn != NULL);
 @@ -250,31 +255,26 @@ cpu_startup(void)
 	/* emac0 connects to phy 2 and emac1 to phy 3 via RGMII. */
 	pn = prop_number_create_integer(2);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "emac0-mii-phy", pn) == false)
 		panic("setting emac0-mii-phy");
 	prop_object_release(pn);
 	pn = prop_number_create_integer(3);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "emac1-mii-phy", pn) == false)
 		panic("setting emac1-mii-phy");
 	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;
 	splraise(-1);
+}
 /*
  * Halt or reboot the machine after syncing/dumping according to howto.
  */
 void
 cpu_reboot(int howto, char *what)
+{
 @@ -403,17 +403,19 @@ read_eeprom(int len, char *buf)
 		if ((sts & IIC_STS_PT) || (sts & IIC_STS_ERR))
 			break;
 		if (sts & IIC_STS_MDBS) {
 			delay(1);
 			/* read 4byte */
 			for (i = 0; i < 4 && cnt < len; i++, cnt++)
 				buf[cnt] =
 				    bus_space_read_1(bst, bsh, IIC_MDBUF);
+		}
+	}
 	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;
+}