[src/trunk]: src/sys/arch/luna68k/stand/boot Use booted device unit if no uni...

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

details:   https://anonhg.NetBSD.org/src/rev/7378dced4436
branches:  trunk
changeset: 795507:7378dced4436
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Apr 16 13:43:02 2014 +0000

description:
Use booted device unit if no unit number is specified on boot command.

Bump version to denote a visible change.

diffstat:

 sys/arch/luna68k/stand/boot/devopen.c   |  7 +++++--
 sys/arch/luna68k/stand/boot/init_main.c |  4 +++-
 sys/arch/luna68k/stand/boot/samachdep.h |  3 ++-
 sys/arch/luna68k/stand/boot/version     |  3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diffs (80 lines):

diff -r 226c3333fe8a -r 7378dced4436 sys/arch/luna68k/stand/boot/devopen.c
--- a/sys/arch/luna68k/stand/boot/devopen.c     Wed Apr 16 12:01:53 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/devopen.c     Wed Apr 16 13:43:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devopen.c,v 1.6 2014/01/11 08:08:23 tsutsui Exp $      */
+/*     $NetBSD: devopen.c,v 1.7 2014/04/16 13:43:02 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1992 OMRON Corporation.
@@ -123,10 +123,13 @@
 {
        const char *cp;
        struct devsw *dp;
-       int dev, unit = 0, part = 0;
+       int dev, unit, part;
        int i;
        char devname[MAXDEVNAME + 1];
 
+       unit = default_unit;
+       part = 0;
+
        /*
         * parse path strings
         */
diff -r 226c3333fe8a -r 7378dced4436 sys/arch/luna68k/stand/boot/init_main.c
--- a/sys/arch/luna68k/stand/boot/init_main.c   Wed Apr 16 12:01:53 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/init_main.c   Wed Apr 16 13:43:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_main.c,v 1.13 2014/01/11 15:51:02 tsutsui Exp $   */
+/*     $NetBSD: init_main.c,v 1.14 2014/04/16 13:43:02 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1992 OMRON Corporation.
@@ -88,6 +88,7 @@
 int hz = 60;
 int machtype;
 char default_file[64];
+int default_unit;
 
 #define        VERS_LOCAL      "Phase-31"
 
@@ -286,6 +287,7 @@
 
        snprintf(default_file, sizeof(default_file),
            "%s(%d,%d)%s", bootdev, unit, part, "netbsd");
+       default_unit = unit;
 
        howto = reorder_dipsw(dipsw2);
 
diff -r 226c3333fe8a -r 7378dced4436 sys/arch/luna68k/stand/boot/samachdep.h
--- a/sys/arch/luna68k/stand/boot/samachdep.h   Wed Apr 16 12:01:53 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/samachdep.h   Wed Apr 16 13:43:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: samachdep.h,v 1.17 2014/01/11 17:00:37 tsutsui Exp $   */
+/*     $NetBSD: samachdep.h,v 1.18 2014/04/16 13:43:02 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -103,6 +103,7 @@
 extern int nplane;
 extern int machtype;
 extern char default_file[];
+extern int default_unit;
 
 /* kbd.c */
 int kbd_decode(u_char);
diff -r 226c3333fe8a -r 7378dced4436 sys/arch/luna68k/stand/boot/version
--- a/sys/arch/luna68k/stand/boot/version       Wed Apr 16 12:01:53 2014 +0000
+++ b/sys/arch/luna68k/stand/boot/version       Wed Apr 16 13:43:02 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.10 2014/01/11 08:20:51 tsutsui Exp $
+$NetBSD: version,v 1.11 2014/04/16 13:43:02 tsutsui Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important - make sure the entries are appended on end, last item
@@ -15,3 +15,4 @@
 1.8:   Probe SCSI devices at any IDs and change boot command to use SCSI
        controller number and target ID to specify the boot disk.
 1.9:   Parse boot flags and pass boothowto and bootdev info to kernel.
+1.10:  Use booted device unit by default if no unit number is specified.