Module Name: src
Committed By: tsutsui
Date: Wed Apr 16 13:43:02 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: devopen.c init_main.c samachdep.h
version
Log Message:
Use booted device unit if no unit number is specified on boot command.
Bump version to denote a visible change.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/devopen.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/stand/boot/init_main.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/stand/boot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/stand/boot/devopen.c
diff -u src/sys/arch/luna68k/stand/boot/devopen.c:1.6 src/sys/arch/luna68k/stand/boot/devopen.c:1.7
--- src/sys/arch/luna68k/stand/boot/devopen.c:1.6 Sat Jan 11 08:08:23 2014
+++ src/sys/arch/luna68k/stand/boot/devopen.c Wed Apr 16 13:43:02 2014
@@ -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 @@ make_device(const char *str, int *devp,
{
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
*/
Index: src/sys/arch/luna68k/stand/boot/init_main.c
diff -u src/sys/arch/luna68k/stand/boot/init_main.c:1.13 src/sys/arch/luna68k/stand/boot/init_main.c:1.14
--- src/sys/arch/luna68k/stand/boot/init_main.c:1.13 Sat Jan 11 15:51:02 2014
+++ src/sys/arch/luna68k/stand/boot/init_main.c Wed Apr 16 13:43:02 2014
@@ -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 cpuspeed; /* for DELAY() macro */
int hz = 60;
int machtype;
char default_file[64];
+int default_unit;
#define VERS_LOCAL "Phase-31"
@@ -286,6 +287,7 @@ main(void)
snprintf(default_file, sizeof(default_file),
"%s(%d,%d)%s", bootdev, unit, part, "netbsd");
+ default_unit = unit;
howto = reorder_dipsw(dipsw2);
Index: src/sys/arch/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.17 src/sys/arch/luna68k/stand/boot/samachdep.h:1.18
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.17 Sat Jan 11 17:00:37 2014
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Wed Apr 16 13:43:02 2014
@@ -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 hz;
extern int nplane;
extern int machtype;
extern char default_file[];
+extern int default_unit;
/* kbd.c */
int kbd_decode(u_char);
Index: src/sys/arch/luna68k/stand/boot/version
diff -u src/sys/arch/luna68k/stand/boot/version:1.10 src/sys/arch/luna68k/stand/boot/version:1.11
--- src/sys/arch/luna68k/stand/boot/version:1.10 Sat Jan 11 08:20:51 2014
+++ src/sys/arch/luna68k/stand/boot/version Wed Apr 16 13:43:02 2014
@@ -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 @@ is taken as the current.
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.
