[src/trunk]: src/sys/dev/raidframe - remove "#include "rf_memchunk.h"

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

details:   https://anonhg.NetBSD.org/src/rev/1e7c0503ae5c
branches:  trunk
changeset: 534720:1e7c0503ae5c
user:      oster <oster%NetBSD.org@localhost>
date:      Fri Aug 02 03:42:33 2002 +0000

description:
- remove "#include "rf_memchunk.h"
- nuke the call to rf_ConfigureMemChunk() from rf_driver.c

diffstat:

 sys/dev/raidframe/rf_dag.h               |   3 +--
 sys/dev/raidframe/rf_dagdegrd.c          |   5 ++---
 sys/dev/raidframe/rf_dagdegwr.c          |   5 ++---
 sys/dev/raidframe/rf_dagffrd.c           |   5 ++---
 sys/dev/raidframe/rf_dagffwr.c           |   5 ++---
 sys/dev/raidframe/rf_driver.c            |  22 ++++++++++++++++++----
 sys/dev/raidframe/rf_parityloggingdags.c |   5 ++---
 7 files changed, 29 insertions(+), 21 deletions(-)

diffs (204 lines):

diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_dag.h
--- a/sys/dev/raidframe/rf_dag.h        Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_dag.h        Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dag.h,v 1.5 2002/08/02 03:32:56 oster Exp $ */
+/*     $NetBSD: rf_dag.h,v 1.6 2002/08/02 03:42:33 oster Exp $ */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -43,7 +43,6 @@
 #include "rf_layout.h"
 #include "rf_dagflags.h"
 #include "rf_acctrace.h"
-#include "rf_memchunk.h"
 
 #define RF_THREAD_CONTEXT   0  /* we were invoked from thread context */
 #define RF_INTR_CONTEXT     1  /* we were invoked from interrupt context */
diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_dagdegrd.c
--- a/sys/dev/raidframe/rf_dagdegrd.c   Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_dagdegrd.c   Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $     */
+/*     $NetBSD: rf_dagdegrd.c,v 1.12 2002/08/02 03:42:33 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.12 2002/08/02 03:42:33 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -43,7 +43,6 @@
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
-#include "rf_memchunk.h"
 #include "rf_general.h"
 #include "rf_dagdegrd.h"
 
diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_dagdegwr.c
--- a/sys/dev/raidframe/rf_dagdegwr.c   Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_dagdegwr.c   Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $     */
+/*     $NetBSD: rf_dagdegwr.c,v 1.11 2002/08/02 03:42:33 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.11 2002/08/02 03:42:33 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -43,7 +43,6 @@
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
-#include "rf_memchunk.h"
 #include "rf_general.h"
 #include "rf_dagdegwr.h"
 
diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_dagffrd.c
--- a/sys/dev/raidframe/rf_dagffrd.c    Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_dagffrd.c    Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagffrd.c,v 1.6 2001/11/13 07:11:13 lukem Exp $     */
+/*     $NetBSD: rf_dagffrd.c,v 1.7 2002/08/02 03:42:34 oster Exp $     */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.6 2001/11/13 07:11:13 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.7 2002/08/02 03:42:34 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -43,7 +43,6 @@
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
-#include "rf_memchunk.h"
 #include "rf_general.h"
 #include "rf_dagffrd.h"
 
diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_dagffwr.c
--- a/sys/dev/raidframe/rf_dagffwr.c    Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_dagffwr.c    Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagffwr.c,v 1.7 2001/11/13 07:11:13 lukem Exp $     */
+/*     $NetBSD: rf_dagffwr.c,v 1.8 2002/08/02 03:42:34 oster Exp $     */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.7 2001/11/13 07:11:13 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.8 2002/08/02 03:42:34 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -44,7 +44,6 @@
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
 #include "rf_dagffrd.h"
-#include "rf_memchunk.h"
 #include "rf_general.h"
 #include "rf_dagffwr.h"
 
diff -r a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_driver.c
--- a/sys/dev/raidframe/rf_driver.c     Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_driver.c     Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_driver.c,v 1.49 2002/07/24 02:17:14 oster Exp $     */
+/*     $NetBSD: rf_driver.c,v 1.50 2002/08/02 03:42:34 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.49 2002/07/24 02:17:14 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.50 2002/08/02 03:42:34 oster Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,6 @@
 #include "rf_revent.h"
 #include "rf_callback.h"
 #include "rf_engine.h"
-#include "rf_memchunk.h"
 #include "rf_mcpair.h"
 #include "rf_nwayxor.h"
 #include "rf_debugprint.h"
@@ -371,7 +370,6 @@
                DO_INIT_CONFIGURE(rf_ConfigureMapModule);
                DO_INIT_CONFIGURE(rf_ConfigureReconEvent);
                DO_INIT_CONFIGURE(rf_ConfigureCallback);
-               DO_INIT_CONFIGURE(rf_ConfigureMemChunk);
                DO_INIT_CONFIGURE(rf_ConfigureRDFreeList);
                DO_INIT_CONFIGURE(rf_ConfigureNWayXor);
                DO_INIT_CONFIGURE(rf_ConfigureStripeLockFreeList);
@@ -492,6 +490,22 @@
        rf_StartUserStats(raidPtr);
 
        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);
+               }
+       }
+       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 a69ddb974e32 -r 1e7c0503ae5c sys/dev/raidframe/rf_parityloggingdags.c
--- a/sys/dev/raidframe/rf_parityloggingdags.c  Fri Aug 02 03:32:56 2002 +0000
+++ b/sys/dev/raidframe/rf_parityloggingdags.c  Fri Aug 02 03:42:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_parityloggingdags.c,v 1.7 2001/11/13 07:11:15 lukem Exp $   */
+/*     $NetBSD: rf_parityloggingdags.c,v 1.8 2002/08/02 03:42:34 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.7 2001/11/13 07:11:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.8 2002/08/02 03:42:34 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -45,7 +45,6 @@
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
 #include "rf_paritylog.h"
-#include "rf_memchunk.h"
 #include "rf_general.h"
 
 #include "rf_parityloggingdags.h"