 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.5 2014/01/10 11:12:03 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.6 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * 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
 @@ -66,161 +66,88 @@
  * 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.
+ *
  *	@(#)boot.c	8.1 (Berkeley) 6/10/93
  */
 /*
  * boot.c -- boot program
  * by A.Fujita, MAR-01-1992
  */
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/reboot.h>
 #include <sys/exec.h>
 #include <luna68k/stand/boot/samachdep.h>
 #include <luna68k/stand/boot/stinger.h>
 #include <luna68k/stand/boot/status.h>
 #include <lib/libsa/loadfile.h>
 int howto;
 #if 0
 static int get_boot_device(const char *, int *, int *, int *);
 #endif
 struct exec header;
 char *how_to_info[] = {
 	"RB_ASKNAME	ask for file name to reboot from",
 	"RB_SINGLE	reboot to single user only",
 	"RB_NOSYNC	dont sync before reboot",
 	"RB_HALT	don't reboot, just halt",
 	"RB_INITNAME	name given for /etc/init (unused)",
 	"RB_DFLTROOT	use compiled-in rootdev",
 	"RB_KDB		give control to kernel debugger",
 	"RB_RDONLY	mount root fs read-only"
 };
 int
 how_to_boot(int argc, char *argv[])
 	int i, h = howto;
 	if (argc < 2) {
 		printf("howto: 0x%s\n\n", hexstr(howto, 2));
 		if (h == 0) {
 			printf("\t%s\n", "RB_AUTOBOOT	flags for system auto-booting itself");
 		} else {
 			for (i = 0; i < 8; i++, h >>= 1) {
 				if (h & 0x01) {
 					printf("\t%s\n", how_to_info[i]);
 		printf("\n");
 	return ST_NORMAL;
 #if 0
 int
 get_boot_device(const char *s, int *devp, int *unitp, int *partp)
 	const char *p = s;
 	int unit, part;
 	uint = 0;
 	part = 0;
 	while (*p != '(') {
 		if (*p == '\0')
 			goto error;
 		p++;
 	p++;
 	for (; *p != ',' && *p != ')') {
 		if (*p == '\0')
 			goto error;
 		if (*p >= '0' && *p <= '9')
 			unit = (unit * 10) + (*p - '0');
 	if (*p == ',')
 		p++;
 	for (; *p != ')'; p++) {
 		if (*p == '\0')
 			goto error;
 		if (*p >= '0' && *p <= '9')
 			part = (part * 10) + (*p - '0');
 	*devp  = 0;	/* XXX not yet */
 	*unitp = unit;
 	*partp = part;
 	return 0;
 error:
 	return -1;
 #endif
 int
 boot(int argc, char *argv[])
+{
-	char *line;
+	char *line, *opts;
 	int i, howto;
-	if (argc < 2)
+	char c;
 	line = NULL;
 	howto = 0;
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] == '-') {
 			opts = argv[i];
 			while ((c = *++opts) && c != '\0')
 				BOOT_FLAG(c, howto);
 		} else if (line == NULL)
 			line = argv[i];
+	}
 	if (line == NULL)
 		line = default_file;
 	else
 		line = argv[1];
-	printf("Booting %s\n", line);
+	printf("Booting %s", line);
 	if (howto != 0)
 		printf(" (howto 0x%x)", howto);
 	printf("\n");
-	return bootnetbsd(line);
+	return bootnetbsd(line, howto);
+}
 int
-bootnetbsd(char *line)
+bootnetbsd(char *line, int howto)
+{
 	int io;
 #if 0
 	int dev, unit, part;
 #endif
 	u_long marks[MARK_MAX];
 	void (*entry)(void);
 #if 0
 	if (get_boot_device(line, &dev, &unit, &part) != 0) {
 		printf("Bad file name %s\n", line);
 		return ST_ERROR;
 #endif
 	/* Note marks[MARK_START] is passed as an load address offset */
 	memset(marks, 0, sizeof(marks));
 	io = loadfile(line, marks, LOAD_KERNEL);
 	if (io >= 0) {
 		int dev = 0, unit = 0, part = 0;
 		uint adpt, ctlr, id;
 		uint32_t bootdev;
 		make_device(line, &dev, &unit, &part, NULL);
 		adpt = dev2adpt[dev];
 		ctlr = CTLR(unit);
 		id   = TARGET(unit);
 		bootdev = MAKEBOOTDEV(0, adpt, ctlr, id, part);
 #ifdef DEBUG
 		printf("entry = 0x%lx\n", marks[MARK_ENTRY]);
 		printf("ssym  = 0x%lx\n", marks[MARK_SYM]);
 		printf("esym  = 0x%lx\n", marks[MARK_END]);
 #endif
 		__asm volatile (
-		/*
+			"movl	%0,%%d7;"
-		 * XXX TODO: fill bootinfo about symbols, boot device etc.
+			"movl	%1,%%d6;"
-		 */
+			"movl	%2,%%a0;"
 			"jbsr	%%a0@"
 		entry = (void *)marks[MARK_ENTRY];
 			: "g" (howto), "g" (bootdev),
-		(*entry)();
+			  "g" ((void *)marks[MARK_ENTRY])
 			: "d6", "d7", "a0");
+	}
 	printf("Booting kernel failed. (%s)\n", strerror(errno));
 	return ST_ERROR;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: devopen.c,v 1.5 2014/01/10 11:12:03 tsutsui Exp $	*/
+/*	$NetBSD: devopen.c,v 1.6 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * 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
 @@ -66,28 +66,26 @@
  * 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.
+ *
  *	@(#)conf.c	8.1 (Berkeley) 6/10/93
  */
 #include <lib/libkern/libkern.h>
 #include <luna68k/stand/boot/samachdep.h>
 #include <machine/disklabel.h>
 #define MAXDEVNAME	16
 static int make_device(const char *, int *, int *, int *, char **);
 int
 devopen(struct open_file *f, const char *fname, char **file)
+{
 	int dev, unit, part;
 	int error;
 	struct devsw *dp;
 	int i;
 	if (make_device(fname, &dev, &unit, &part, file) != 0)
 		return ENXIO;
 #ifdef DEBUG
 	printf("%s: %s(%d,%d)%s\n", __func__,
 @@ -115,49 +113,49 @@ devopen(struct open_file *f, const char
+	}
 #endif
 	f->f_dev = dp;
 	return 0;
+}
 int
 make_device(const char *str, int *devp, int *unitp, int *partp, char **fname)
+{
 	const char *cp;
 	struct devsw *dp;
-	int major, unit = 0, part = 0;
+	int dev, unit = 0, part = 0;
 	int i;
 	char devname[MAXDEVNAME + 1];
 	/*
 	 * parse path strings
 	 */
 	/* find end of dev type name */
 	for (cp = str, i = 0; *cp != '\0' && *cp != '(' && i < MAXDEVNAME; i++)
 			devname[i] = *cp++;
 	if (*cp != '(') {
 		return (-1);
+	}
 	devname[i] = '\0';
 	/* compare dev type name */
 	for (dp = devsw; dp->dv_name; dp++)
 		if (!strcmp(devname, dp->dv_name))
 			break;
 	cp++;
 	if (dp->dv_name == NULL) {
 		return (-1);
+	}
-	major = dp - devsw;
+	dev = dp - devsw;
 	/* get mixed controller and unit number */
 	for (; *cp != ',' && *cp != ')'; cp++) {
 		if (*cp == '\0')
 			return -1;
 		if (*cp >= '0' && *cp <= '9')
 			unit = unit * 10 + *cp - '0';
+	}
 	if (unit < 0 || CTLR(unit) >= 2 || TARGET(unit) > 7) {
 #ifdef DEBUG
 		printf("%s: invalid unit number (%d)\n", __func__, unit);
 #endif
 		return (-1);
+	}
 @@ -168,28 +166,30 @@ make_device(const char *str, int *devp,
 	for (; /* *cp != ',' && */ *cp != ')'; cp++) {
 		if (*cp == '\0')
 			return -1;
 		if (*cp >= '0' && *cp <= '9')
 			part = part * 10 + *cp - '0';
+	}
 	if (part < 0 || part >= MAXPARTITIONS) {
 #ifdef DEBUG
 		printf("%s: invalid partition number (%d)\n", __func__, part);
 #endif
 		return (-1);
+	}
 	/* check out end of dev spec */
-	*devp  = major;
+	*devp  = dev;
 	*unitp = unit;
 	*partp = part;
-	cp++;
+	if (fname != NULL) {
-	if (*cp == '\0')
+		cp++;
-		*fname = "netbsd";
+		if (*cp == '\0')
-	else
+			*fname = "netbsd";
-		*fname = __UNCONST(cp);	/* XXX */
+		else
 			*fname = __UNCONST(cp);	/* XXX */
+	}
 #ifdef DEBUG
-	printf("%s: major = %d, unit = %d, part = %d, fname = %s\n",
+	printf("%s: dev = %d, unit = %d, part = %d, fname = %s\n",
-	    __func__, major, unit, part, *fname);
+	    __func__, dev, unit, part, fname != NULL ? *fname : "");
 #endif
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: conf.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $	*/
+/*	$NetBSD: conf.c,v 1.4 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  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.
 @@ -33,26 +33,27 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <lib/libsa/stand.h>
 #include <lib/libsa/dev_net.h>
 #include <lib/libsa/nfs.h>
 #include <lib/libsa/ufs.h>
 #include <machine/bootinfo.h>
 #include <luna68k/stand/boot/samachdep.h>
 #define xxstrategy	\
 	(int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys
 #define xxopen		(int (*)(struct open_file *, ...))nodev
 #define xxclose		(int (*)(struct open_file *))nullsys
 /*
  * Device configuration
  */
 #ifndef SUPPORT_ETHERNET
 #define	netstrategy	xxstrategy
 #define	netopen		xxopen
 @@ -70,26 +71,32 @@
 #define	sdclose		xxclose
 #endif
 #define	sdioctl		noioctl
 /*
  * Note: "le" isn't a major offset.
  */
 struct devsw devsw[] = {
 	{ "sd",	sdstrategy,	sdopen,	sdclose,	sdioctl },
 	{ "le",	netstrategy,	netopen, netclose,	netioctl },
 };
 int	ndevs = __arraycount(devsw);
 /* XXX: These indices must sync with the above devsw */
 const int dev2adpt[] = {
 	LUNA68K_BOOTADPT_SPC,
 	LUNA68K_BOOTADPT_LANCE,
 };
 #ifdef SUPPORT_ETHERNET
 extern struct netif_driver le_netif_driver;
 struct netif_driver *netif_drivers[] = {
 	&le_netif_driver,
 };
 int	n_netif_drivers = __arraycount(netif_drivers);
 #endif
 /*
  * Filesystem configuration
  */
 #ifdef SUPPORT_DISK
 struct fs_ops file_system_disk[] = {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.9 2014/01/10 11:12:03 tsutsui Exp $	*/
+/*	$NetBSD: init_main.c,v 1.10 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * 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
 @@ -169,26 +169,27 @@ struct luna2_bootinfo {
 		uint8_t	bd_xxx5[4];	/* 12: ??? */
 		uint8_t	bd_xxx6[4];	/* 16: ??? */
 	} bi_devinfo[LUNA2_NBTDEV];
 } __packed;
 /* #define BTINFO_DEBUG */
 void
 main(void)
+{
 	int i, status = 0;
 	const char *machstr;
 	const char *bootdev;
 	uint32_t howto;
 	int unit, part;
 	int bdev, ctlr, id;
 	/*
 	 * Initialize the console before we print anything out.
 	 */
 	if (cputype == CPU_68030) {
 		machtype = LUNA_I;
 		machstr  = "LUNA-I";
 		cpuspeed = MHZ_25;
 		hz = 60;
 	} else {
 		machtype = LUNA_II;
 @@ -297,27 +298,27 @@ main(void)
 	    "%s(%d,%d)%s", bootdev, unit, part, "netbsd");
 	howto = reorder_dipsw(dipsw2);
 	if ((howto & 0xFE) == 0) {
 		char c;
 		printf("Press return to boot now,"
 		    " any other key for boot menu\n");
 		printf("booting %s - starting in ", default_file);
 		c = awaitkey("%d seconds. ", boot_timeout, true);
 		if (c == '\r' || c == '\n' || c == 0) {
 			printf("auto-boot %s\n", default_file);
-			bootnetbsd(default_file);
+			bootnetbsd(default_file, 0);
+		}
+	}
 	/*
 	 * Main Loop
 	 */
 	printf("type \"help\" for help.\n");
 	do {
 		memset(buffer, 0, BUFFSIZE);
 		if (getline(prompt, buffer) > 0) {
 			argc = getargs(buffer, argv, sizeof(argv)/sizeof(char *));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.4 2013/01/22 15:48:40 tsutsui Exp $	*/
+/*	$NetBSD: parse.c,v 1.5 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * 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
 @@ -90,28 +90,29 @@ check_args(int argc, char *argv[])
 		printf("argv[%d] = \"%s\"\n", i, argv[i]);
 	return(ST_NORMAL);
+}
 int
 exit_program(int argc, char *argv[])
+{
 	return(ST_EXIT);
+}
 static const char helpmsg[] =
 	"commands are:\n"
-	"boot [device(unit,part)filename]\n"
+	"boot [device(unit,part)filename] [-ads]\n"
-	" (ex. \"boot sd(0,0)netbsd\", \"boot le(0,0)netbsd.old\" etc.)\n"
+	" (ex. \"boot sd(6,0)netbsd\", \"boot le()netbsd.old\" etc.)\n"
 	"  Note unit number for SCSI device is (ctlr) * 10 + (id)."
 	"ls [device(unit, part)[path]]\n"
 	" (ex. \"ls sd(0,0)/bin\")\n"
 	"help\n"
 	"exit\n"
 #if 0 /* debug commands */
 	"checkargs\n"
 	"disklabel\n"
 	"howto\n"
 	"screen\n"
 	"scsi\n"
 #endif
+;
 @@ -129,27 +130,26 @@ struct command_entry {
 };
 struct command_entry entries[] = {
 	{ "b",		boot         },
 	{ "boot",	boot         },
 	{ "chkargs",	check_args   },
 	{ "disklabel",	disklabel    },
 	{ "exit",	exit_program },
 #ifdef notyet
 	{ "fsdump",	fsdump       },
 	{ "fsrestore",	fsrestore    },
 #endif
 	{ "help",	cmd_help     },
 	{ "howto",	how_to_boot  },
 	{ "ls",		cmd_ls       },
 	{ "screen",	screen	     },
 #ifdef notyet
 	{ "tape",	tape	     },
 	{ "tp",		tape	     },
 #endif
 	{ "scsi",	scsi         },
 	{ "quit",	exit_program },
 	{ 0, 0 }
 };
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: samachdep.h,v 1.15 2014/01/10 11:12:03 tsutsui Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.16 2014/01/11 08:08:23 tsutsui Exp $	*/
 /*
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  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.
 @@ -44,56 +44,58 @@
 #define MHZ_25		3
 #define MHZ_33		4
 #define MHZ_50		6
 struct consdev;
 struct frame;
 typedef struct label_t {
 	int val[15];
 } label_t;
 /* autoconf.c */
 void configure(void);
 void find_devs(void);
 extern const int dev2adpt[];
 /* awaitkey.c */
 char awaitkey(const char *, int, bool);
 /* bmc.c */
 void bmccnprobe(struct consdev *);
 void bmccninit(struct consdev *);
 int  bmccngetc(dev_t);
 void bmccnputc(dev_t, int);
 /* bmd.c */
 void bmdinit(void);
 int bmdputc(int);
 void bmdadjust(short, short);
 void bmdclear(void);
 /* boot.c */
 extern int howto;
 int how_to_boot(int, char **);
 int boot(int, char **);
-int bootnetbsd(char *);
+int bootnetbsd(char *, int);
 /* clock.c */
 /* not yet */
 /* cons.c */
 void cninit(void);
 int cngetc(void);
 void cnputc(int);
 /* devopen.c */
 int make_device(const char *, int *, int *, int *, char **);
 /* disklabel.c */
 extern u_char lbl_buff[];
 int disklabel(int, char **);
 /* exec.c */
 void exec_hp300(char *, u_long, int);
 /* font.c */
 extern const uint16_t bmdfont[][20];
 /* fsdump.c */
 int fsdump(int, char **);
 int fsrestore(int, char **);