 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.350 2017/04/03 17:36:17 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.351 2017/08/15 09:26:56 maya Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -64,27 +64,27 @@
  * 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.
+ *
  */
 /*
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
+ *
  *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.350 2017/04/03 17:36:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.351 2017/08/15 09:26:56 maya Exp $");
 #include "opt_adb.h"
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #include "akbd.h"
 #include "macfb.h"
 #include "zsc.h"
 #include <sys/param.h>
 @@ -862,32 +862,30 @@ static char *envbuf = NULL;
 /*
  * getenvvars: Grab a few useful variables
  */
 void
 getenvvars(u_long flag, char *buf)
+{
 	extern u_long bootdev;
 	extern u_long macos_boottime, MacOSROMBase;
 	extern long macos_gmtbias;
 	int root_scsi_id;
 	u_long root_ata_dev;
 #ifdef	__ELF__
 	int i;
 	Elf_Ehdr *ehdr;
 	Elf_Shdr *shp;
 	vaddr_t minsym;
 #endif
 	/*
 	 * If flag & 0x80000000 == 0, then we're booting with the old booter
 	 * and we should freak out.
 	 */
 	if ((flag & 0x80000000) == 0) {
 		/* Freak out; print something if that becomes available */
 	} else
 		envbuf = buf;
 	/* These next two should give us mapped video & serial */
 	/* We need these for pre-mapping graybars & echo, but probably */
 	/* only on MacII or LC.  --  XXX */
 @@ -980,57 +978,52 @@ getenvvars(u_long flag, char *buf)
 	ROMBase = (void *)getenv("ROMBASE");
 	if (ROMBase == (void *)0) {
 		ROMBase = (void *)ROMBASE;
+	}
 	MacOSROMBase = (unsigned long)ROMBase;
 	TimeDBRA = getenv("TIMEDBRA");
 	ADBDelay = (u_short)getenv("ADBDELAY");
 	HwCfgFlags  = getenv("HWCFGFLAGS");
 	HwCfgFlags2 = getenv("HWCFGFLAG2");
 	HwCfgFlags3 = getenv("HWCFGFLAG3");
  	ADBReInit_JTBL = getenv("ADBREINIT_JTBL");
  	mrg_ADBIntrPtr = (void *)getenv("ADBINTERRUPT");
 #ifdef	__ELF__
 	/*
 	 * Check the ELF headers.
 	 */
 	ehdr = (void *)getenv("MARK_SYM");
 	if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG) != 0 ||
 	    ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
 		return;
+	}
 	/*
 	 * Find the end of the symbols and strings.
 	 */
 	minsym = ~0;
 	shp = (Elf_Shdr *)(end + ehdr->e_shoff);
 	for (i = 0; i < ehdr->e_shnum; i++) {
 		if (shp[i].sh_type != SHT_SYMTAB &&
 		    shp[i].sh_type != SHT_STRTAB) {
 			continue;
+		}
 		minsym = MIN(minsym, (vaddr_t)end + shp[i].sh_offset);
+	}
 	symsize = 1;
 	ssym = (int *)ehdr;
 #else
 	symsize = *(int *)&end;
 	ssym = ((int *)&end) + 1;
 #endif
+}
 static long
 getenv(const char *str)
+{
 	/*
 	 * Returns the value of the environment variable "str".
+	 *
 	 * Format of the buffer is "var=val\0var=val\0...\0var=val\0\0".
+	 *
 	 * Returns 0 if the variable is not there, and 1 if the variable is
 	 * there without an "=val".
 	 */