[src/trunk]: src/sys/arch/luna68k/stand/boot Disable unnecessary boot device ...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fe54c1e3ca6
branches:  trunk
changeset: 325678:6fe54c1e3ca6
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Jan 03 03:44:41 2014 +0000

description:
Disable unnecessary boot device check. From OpenBSD/luna88k.

diffstat:

 sys/arch/luna68k/stand/boot/boot.c |  20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diffs (82 lines):

diff -r a1eeed584438 -r 6fe54c1e3ca6 sys/arch/luna68k/stand/boot/boot.c
--- a/sys/arch/luna68k/stand/boot/boot.c        Fri Jan 03 03:25:25 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/boot.c        Fri Jan 03 03:44:41 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.3 2013/03/05 15:34:53 tsutsui Exp $ */
+/*     $NetBSD: boot.c,v 1.4 2014/01/03 03:44:41 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1992 OMRON Corporation.
@@ -85,7 +85,9 @@
 
 int howto;
 
+#if 0
 static int get_boot_device(const char *, int *, int *, int *);
+#endif
 
 struct exec header;
 
@@ -123,26 +125,33 @@
        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++;
        }
 
-       while (*++p != ',') {
+       p++;
+       for (; *p != ',' && *p != ')') {
                if (*p == '\0')
                        goto error;
                if (*p >= '0' && *p <= '9')
                        unit = (unit * 10) + (*p - '0');
        }
 
-       while (*++p != ')') {
+       if (*p == ',')
+               p++;
+       for (; *p != ')'; p++) {
                if (*p == '\0')
                        goto error;
                if (*p >= '0' && *p <= '9')
@@ -158,6 +167,7 @@
 error:
        return -1;
 }
+#endif
 
 int
 boot(int argc, char *argv[])
@@ -178,14 +188,18 @@
 bootnetbsd(char *line)
 {
        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));