[src/trunk]: src/sys/dev/raidframe Cleanup configuration and auto-configurati...

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

details:   https://anonhg.NetBSD.org/src/rev/d98deb7567f7
branches:  trunk
changeset: 534788:d98deb7567f7
user:      oster <oster%NetBSD.org@localhost>
date:      Sat Aug 03 00:55:54 2002 +0000

description:
Cleanup configuration and auto-configuration information printing.
Thanks to mrg for the suggestions.

diffstat:

 sys/dev/raidframe/rf_driver.c |  22 ++++++++++++++++++++--
 sys/dev/raidframe/rf_layout.c |  17 ++---------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diffs (81 lines):

diff -r 24c89f7a8869 -r d98deb7567f7 sys/dev/raidframe/rf_driver.c
--- a/sys/dev/raidframe/rf_driver.c     Sat Aug 03 00:40:03 2002 +0000
+++ b/sys/dev/raidframe/rf_driver.c     Sat Aug 03 00:55:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_driver.c,v 1.51 2002/08/03 00:38:42 oster Exp $     */
+/*     $NetBSD: rf_driver.c,v 1.52 2002/08/03 00:55:54 oster Exp $     */
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -73,7 +73,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.51 2002/08/03 00:38:42 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.52 2002/08/03 00:55:54 oster Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -491,6 +491,24 @@
 
        raidPtr->valid = 1;
 
+       printf("raid%d: %s\n", raidPtr->raidid,
+              raidPtr->Layout.map->configName);
+       printf("raid%d: Components:", raidPtr->raidid);
+       for (row = 0; row < raidPtr->numRow; row++) {
+               for (col = 0; col < raidPtr->numCol; col++) {
+                       printf(" %s", raidPtr->Disks[row][col].devname);
+                       if (RF_DEAD_DISK(raidPtr->Disks[row][col].status)) {
+                               printf("[**FAILED**]");
+                       }
+               }
+       }
+       printf("\n");
+       printf("raid%d: Total Sectors: %lu (%lu MB)\n",
+              raidPtr->raidid,
+              (unsigned long) raidPtr->totalSectors,
+              (unsigned long) (raidPtr->totalSectors / 1024 * 
+                               (1 << raidPtr->logBytesPerSector) / 1024));
+
        return (0);
 }
 
diff -r 24c89f7a8869 -r d98deb7567f7 sys/dev/raidframe/rf_layout.c
--- a/sys/dev/raidframe/rf_layout.c     Sat Aug 03 00:40:03 2002 +0000
+++ b/sys/dev/raidframe/rf_layout.c     Sat Aug 03 00:55:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_layout.c,v 1.11 2001/11/13 07:11:14 lukem Exp $     */
+/*     $NetBSD: rf_layout.c,v 1.12 2002/08/03 00:58:09 oster Exp $     */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.11 2001/11/13 07:11:14 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.12 2002/08/03 00:58:09 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -451,19 +451,6 @@
        } else {
                raidPtr->headSepLimit = rf_GetDefaultHeadSepLimit(raidPtr);
        }
-
-       printf("RAIDFRAME: Configure (%s): total number of sectors is %lu (%lu MB)\n",
-           layoutPtr->map->configName,
-           (unsigned long) raidPtr->totalSectors,
-           (unsigned long) (raidPtr->totalSectors / 1024 * (1 << raidPtr->logBytesPerSector) / 1024));
-       if (raidPtr->headSepLimit >= 0) {
-               printf("RAIDFRAME(%s): Using %ld floating recon bufs with head sep limit %ld\n",
-                   layoutPtr->map->configName, (long) raidPtr->numFloatingReconBufs, (long) raidPtr->headSepLimit);
-       } else {
-               printf("RAIDFRAME(%s): Using %ld floating recon bufs with no head sep limit\n",
-                   layoutPtr->map->configName, (long) raidPtr->numFloatingReconBufs);
-       }
-
        return (0);
 }
 /* typically there is a 1-1 mapping between stripes and parity stripes.