[src/trunk]: src/sys/arch/i386/stand/lib trim some fat, don't scan disklabels...

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

details:   https://anonhg.NetBSD.org/src/rev/0eae10e2230a
branches:  trunk
changeset: 748321:0eae10e2230a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Oct 20 14:49:03 2009 +0000

description:
trim some fat, don't scan disklabels on non-HD disks

diffstat:

 sys/arch/i386/stand/lib/biosdisk.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r c7bb9727a1db -r 0eae10e2230a sys/arch/i386/stand/lib/biosdisk.c
--- a/sys/arch/i386/stand/lib/biosdisk.c        Tue Oct 20 14:47:33 2009 +0000
+++ b/sys/arch/i386/stand/lib/biosdisk.c        Tue Oct 20 14:49:03 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosdisk.c,v 1.29 2009/09/13 22:45:27 jmcneill Exp $   */
+/*     $NetBSD: biosdisk.c,v 1.30 2009/10/20 14:49:03 jmcneill Exp $   */
 
 /*
  * Copyright (c) 1996, 1998
@@ -319,17 +319,17 @@
                        d.ll.dev = 0x80 + i;                    /* hd/cd */
                if (set_geometry(&d.ll, &ed))
                        continue;
+               printf("disk ");
                switch (d.ll.type) {
                case BIOSDISK_TYPE_CD:
-                       printf("disk cd0\n");
-                       printf("  cd0a(unknown)\n");
+                       printf("cd0\n  cd0a\n");
                        break;
                case BIOSDISK_TYPE_FD:
-                       printf("disk fd%d\n", d.ll.dev & 0x7f);
-                       printf("  fd%da(unknown)\n", d.ll.dev & 0x7f);
+                       printf("fd%d\n", d.ll.dev & 0x7f);
+                       printf("  fd%da\n", d.ll.dev & 0x7f);
                        break;
                case BIOSDISK_TYPE_HD:
-                       printf("disk hd%d", d.ll.dev & 0x7f);
+                       printf("hd%d", d.ll.dev & 0x7f);
                        if (d.ll.flags & BIOSDISK_INT13EXT) {
                                printf(" size ");
                                size = ed.totsec * ed.sbytes;
@@ -344,6 +344,8 @@
                        break;
                }
 #ifndef NO_DISKLABEL
+               if (d.ll.type != BIOSDISK_TYPE_HD)
+                       continue;
                if (read_label(&d) == -1)
                        break;
                lp = (struct disklabel *)(d.buf + LABELOFFSET);