From owner-newconfig@jp.freebsd.org  Thu Nov 19 01:45:00 1998
Received: by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id BAA06606;
	Thu, 19 Nov 1998 01:45:00 +0900 (JST)
	(envelope-from owner-newconfig@jp.FreeBSD.org)
Received: from localhost.rr.iij4u.or.jp (h078.p048.iij4u.or.jp [210.130.48.78])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id BAA06592
	for <newconfig@jp.FreeBSD.ORG>; Thu, 19 Nov 1998 01:44:57 +0900 (JST)
	(envelope-from bishop@rr.iij4u.or.jp)
Received: from localhost (localhost [127.0.0.1])
	by localhost.rr.iij4u.or.jp (8.9.1/8.9.1) with ESMTP id BAA00996
	for <newconfig@jp.FreeBSD.ORG>; Thu, 19 Nov 1998 01:47:29 +0900 (JST)
	(envelope-from bishop@rr.iij4u.or.jp)
To: newconfig@jp.FreeBSD.ORG
From: MAEKAWA Masahide <bishop@rr.iij4u.or.jp>
X-Mailer: Mew version 1.94b1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19981119014729H.bishop@rr.iij4u.or.jp>
Date: Thu, 19 Nov 1998 01:47:29 +0900
X-Dispatcher: imput version 981104(IM103)
Lines: 56
Reply-To: newconfig@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: newconfig 8
Subject: [newconfig 8] wd.c
Errors-To: owner-newconfig@jp.freebsd.org
Sender: owner-newconfig@jp.freebsd.org
X-Originator: bishop@rr.iij4u.or.jp

$BA0@n!w?@8MBg3X$G$9(B.

wd $B$K4X$9$k%a%C%;!<%8$rD>$7$F$_$^$7$?(B.
$BA4It0l9T$GI=<($7$^$9(B. (IDE $B$J(B HDD $B$,$J$$$N$GL$3NG'$G$9(B.)
$BK\2H$HF1$8%a%C%;!<%8$,=P$^$9(B. $B$?$V$s(B.

$B%F%9%H$*4j$$$7$^$9(B.

--- sys/i386/isa/wd.c.orig	Thu Nov 19 01:35:09 1998
+++ sys/i386/isa/wd.c	Thu Nov 19 01:34:58 1998
@@ -396,9 +396,7 @@
 		 * Print out description of drive.
 		 * wdp_model may not be null terminated.
 		 */
-		printf("wdc%d: unit %d (wd%d): <%.*s>",
-		       du->dk_ctrlr, drive, lunit,
-		       sizeof du->dk_params.wdp_model,
+		printf(": <%.*s>", sizeof du->dk_params.wdp_model,
 		       du->dk_params.wdp_model);
 		if (du->dk_flags & DKFL_LBA)
 			printf(", LBA");
@@ -410,14 +408,11 @@
 			printf(", multi-block-%d", du->dk_multi);
 		if (du->cfg_flags & WDOPT_SLEEPHACK)
 			printf(", sleep-hack");
-		printf("\n");
 		if (du->dk_params.wdp_heads == 0)
-			printf("wd%d: size unknown, using %s values\n",
-			       lunit, du->dk_dd.d_secperunit > 17
-			       ? "BIOS" : "fake");
-		printf( "wd%d: %luMB (%lu sectors), "
+			printf(" size unknown, using %s values",
+			       du->dk_dd.d_secperunit > 17 ? "BIOS" : "fake");
+		printf( " %luMB (%lu sectors), "
 			"%lu cyls, %lu heads, %lu S/T, %lu B/S\n",
-		       lunit,
 		       du->dk_dd.d_secperunit
 		       / ((1024L * 1024L) / du->dk_dd.d_secsize),
 		       du->dk_dd.d_secperunit,
@@ -502,6 +497,10 @@
 static int
 wdc_print(void *aux, const char *name)
 {
+	struct wd_attach_args *wa = aux;
+
+	if (!name)
+		printf(" unit %d", wa->wa_drive);
 	return (UNCONF);
 }
 #endif /* NEW_CONFIG */

-------------------------
  $B?@8MBg3XM}3XIt?t3X2J(B
        $BA0@n>-=((B
  9643024s@kobe-u.ac.jp
-------------------------
