 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.18 2012/03/20 12:37:01 minoura Exp $	*/
+/*	$NetBSD: boot.c,v 1.19 2014/07/06 05:31:02 tsutsui Exp $	*/
 /*
  * Copyright (c) 2001 Minoura Makoto
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -35,28 +35,30 @@
 #include <lib/libkern/libkern.h>
 #include "libx68k.h"
 #include "iocs.h"
 #include "exec_image.h"
 #define HEAP_START	((void*) 0x00080000)
 #define HEAP_END	((void*) 0x000fffff)
 #define EXSCSI_BDID	((void*) 0x00ea0001)
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
-char default_kernel[20] = "sd0a:netbsd";
+char default_kernel[20] =
-int mpu, hostadaptor;
+    "sd0a:netbsd";
 int mpu;
 int hostadaptor;
 int console_device = -1;
 static void help(void);
 static int get_scsi_host_adapter(void);
 static void doboot(const char *, int);
 static void boot(char *);
 static void cmd_ls(char *);
 int bootmenu(void);
 void bootmain(int);
 extern int detectmpu(void);
 extern int badbaddr(void *);
 /* from boot_ufs/bootmain.c */
 @@ -252,54 +254,57 @@ bootmenu(void)
 		printf("trying %s.\n", default_kernel);
 		doboot(default_kernel, 0);
 		printf("Could not start %s; ", default_kernel);
+	}
 	printf("Please use the absolute unit# (e.g. SCSI ID)"
 	       " instead of the NetBSD logical #.\n");
 	for (;;) {
 		char *p, *options;
 		printf("> ");
 		gets(input);
-		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++);
+		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++)
+			;
 		options = gettrailer(p);
 		if (strcmp("boot", p) == 0)
 			boot(options);
 		else if (strcmp("help", p) == 0 ||
 			 strcmp("?", p) == 0)
 			help();
-		else if ((strcmp("halt", p) == 0) ||(strcmp("reboot", p) == 0))
+		else if (strcmp("halt", p) == 0 ||
 			 strcmp("reboot", p) == 0)
 			exit(0);
 		else if (strcmp("ls", p) == 0)
 			cmd_ls(options);
 		else
 			printf("Unknown command %s\n", p);
+	}
+}
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
 /*
  * Arguments from the boot block:
  *   bootdev - specifies the device from which /boot was read, in
  *		bootdev format.
  */
 void
 bootmain(int bootdev)
+{
 	hostadaptor = get_scsi_host_adapter();
 	mpu = detectmpu();
 	if (mpu < 3) {		/* not tested on 68020 */
 		printf("This MPU cannot run NetBSD.\n");
 		exit(1);
+	}
 	if (SRAM_MEMSIZE < 4*1024*1024) {
 		printf("Main memory too small.\n");
 		exit(1);
+	}
 	console_device = consio_init(console_device);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.2 2012/11/01 14:46:26 isaki Exp $	*/
+/*	$NetBSD: boot.c,v 1.3 2014/07/06 05:31:03 tsutsui Exp $	*/
 /*
  * Copyright (c) 2001 Minoura Makoto
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -36,27 +36,28 @@
 #include <lib/libkern/libkern.h>
 #include "libx68k.h"
 #include "iocs.h"
 #include "exec_image.h"
 #define HEAP_START	((void*) 0x00080000)
 #define HEAP_END	((void*) 0x000fffff)
 #define EXSCSI_BDID	((void*) 0x00ea0001)
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
-char default_kernel[20] = "nfs:netbsd";
+char default_kernel[20] =
     "nfs:netbsd";
 int mpu;
 int console_device = -1;
 #ifdef DEBUG
 int debug = 1;
 #endif
 static void help(void);
 static void doboot(const char *, int);
 static void boot(char *);
 int bootmenu(void);
 void bootmain(int);
 extern int detectmpu(void);
 @@ -90,37 +91,43 @@ doboot(const char *file, int flags)
 		loadflag &= ~LOAD_BACKWARDS;
 	marks[MARK_START] = 0x100000;
 	if ((fd = loadfile(file, marks, loadflag)) == -1) {
 		printf("loadfile failed\n");
 		return;
+	}
 	close(fd);
 	if (devparse(file, &dev, &unit, &part, &name) != 0) {
 		printf("XXX: unknown corruption in /boot.\n");
+	}
 #ifdef DEBUG
 	printf("dev = %x, unit = %d, name = %s\n",
 	       dev, unit, name);
 #endif
 	dev = X68K_MAKEBOOTDEV(X68K_MAJOR_NE, unit, 0);
 #ifdef DEBUG
 	printf("boot device = %x\n", dev);
 	printf("if = %d, unit = %d\n",
 	       B_X68K_SCSI_IF(dev),
 	       B_X68K_SCSI_IF_UN(dev));
 #endif
 	p = ((short*) marks[MARK_ENTRY]) - 1;
 #ifdef DEBUG
 	printf("Kernel Version: 0x%x\n", *p);
 #endif
 	if (*p != 0x4e73 && *p != 0) {
 		/*
 		 * XXX temporary solution; compatibility loader
 		 * must be written.
 		 */
 		printf("This kernel is too new to be loaded by "
 		       "this version of /boot.\n");
 		return;
+	}
 	exec_image(marks[MARK_START], 0, marks[MARK_ENTRY]-marks[MARK_START],
 		   marks[MARK_END]-marks[MARK_START], dev, flags);
 @@ -196,50 +203,53 @@ bootmenu(void)
 	printf("Please use the absolute unit# (e.g. SCSI ID)"
 	       " instead of the NetBSD logical #.\n");
 	for (;;) {
 		char *p, *options;
 		printf("> ");
 		gets(input);
 		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++)
+			;
 		options = gettrailer(p);
 		if (strcmp("boot", p) == 0)
 			boot(options);
-		else if (strcmp("help", p) == 0 || strcmp("?", p) == 0)
+		else if (strcmp("help", p) == 0 ||
 			 strcmp("?", p) == 0)
 			help();
-		else if (strcmp("halt", p) == 0 || strcmp("reboot", p) == 0)
+		else if (strcmp("halt", p) == 0 ||
 			 strcmp("reboot", p) == 0)
 			exit(0);
 		else
 			printf("Unknown command %s\n", p);
+	}
+}
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
 /*
  * Arguments from the boot block:
  *   bootdev - specifies the device from which /boot was read, in
  *		bootdev format.
  */
 void
 bootmain(int bootdev)
+{
 	mpu = detectmpu();
 	rtc_offset = RTC_OFFSET;
 	try_bootp = 1;
 	mpu = detectmpu();
 	if (mpu < 3) {		/* not tested on 68020 */
 		printf("This MPU cannot run NetBSD.\n");
 		exit(1);
+	}
 	if (SRAM_MEMSIZE < 4*1024*1024) {
 		printf("Main memory too small.\n");
 		exit(1);
+	}
 	console_device = consio_init(console_device);
 	setheap(HEAP_START, HEAP_END);