[src/netbsd-3]: src/sys/dev/raidframe Pull up revision 1.187 (requested by os...

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

details:   https://anonhg.NetBSD.org/src/rev/20e301a3f8ca
branches:  netbsd-3
changeset: 576252:20e301a3f8ca
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jun 17 13:34:50 2005 +0000

description:
Pull up revision 1.187 (requested by oster in ticket #472):
- avoid variable shadowing
- add a lot of const
- remove parameters from function declarations

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diffs (70 lines):

diff -r e9b64a067c0b -r 20e301a3f8ca sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Fri Jun 17 13:32:39 2005 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Fri Jun 17 13:34:50 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.186 2005/02/27 00:27:45 perry Exp $       */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.186.2.1 2005/06/17 13:34:50 tron Exp $    */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -146,7 +146,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.186 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.186.2.1 2005/06/17 13:34:50 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -206,12 +206,10 @@
 MALLOC_DEFINE(M_RAIDFRAME, "RAIDframe", "RAIDframe structures");
 
 /* prototypes */
-static void KernelWakeupFunc(struct buf * bp);
-static void InitBP(struct buf * bp, struct vnode *, unsigned rw_flag,
-                  dev_t dev, RF_SectorNum_t startSect,
-                  RF_SectorCount_t numSect, caddr_t buf,
-                  void (*cbFunc) (struct buf *), void *cbArg,
-                  int logBytesPerSector, struct proc * b_proc);
+static void KernelWakeupFunc(struct buf *);
+static void InitBP(struct buf *, struct vnode *, unsigned,
+    dev_t, RF_SectorNum_t, RF_SectorCount_t, caddr_t, void (*) (struct buf *),
+    void *, int, struct proc *);
 static void raidinit(RF_Raid_t *);
 
 void raidattach(int);
@@ -1998,7 +1996,7 @@
  */
 static void
 InitBP(struct buf *bp, struct vnode *b_vp, unsigned rw_flag, dev_t dev,
-       RF_SectorNum_t startSect, RF_SectorCount_t numSect, caddr_t buf,
+       RF_SectorNum_t startSect, RF_SectorCount_t numSect, caddr_t bf,
        void (*cbFunc) (struct buf *), void *cbArg, int logBytesPerSector,
        struct proc *b_proc)
 {
@@ -2008,7 +2006,7 @@
        bp->b_bufsize = bp->b_bcount;
        bp->b_error = 0;
        bp->b_dev = dev;
-       bp->b_data = buf;
+       bp->b_data = bf;
        bp->b_blkno = startSect;
        bp->b_resid = bp->b_bcount;     /* XXX is this right!??!?!! */
        if (bp->b_bcount == 0) {
@@ -3323,11 +3321,11 @@
 }
 
 void
-rf_pool_init(struct pool *p, size_t size, char *w_chan,
-            size_t min, size_t max)
+rf_pool_init(struct pool *p, size_t size, const char *w_chan,
+            size_t xmin, size_t xmax)
 {
        pool_init(p, size, 0, 0, 0, w_chan, NULL);
-       pool_sethiwat(p, max);
-       pool_prime(p, min);
-       pool_setlowat(p, min);
+       pool_sethiwat(p, xmax);
+       pool_prime(p, xmin);
+       pool_setlowat(p, xmin);
 }