summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>2000-03-30 12:41:09 +0000
committeraugustss <augustss@NetBSD.org>2000-03-30 12:41:09 +0000
commit169ac5b3c103b854ddb685c2ee6a366d1e9c1862 (patch)
treeb41bf8ef225f557550e399b09b3bf3d76ded0027 /sys/dev/raidframe
parent641df97d12d2be9a68cb558275c2966ea3f0e670 (diff)
Remove register declarations.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c30
-rw-r--r--sys/dev/raidframe/rf_evenodd_dagfuncs.c10
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c8
-rw-r--r--sys/dev/raidframe/rf_nwayxor.c116
4 files changed, 82 insertions, 82 deletions
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index f6a628ae568..31d59169452 100644
--- a/sys/dev/raidframe/rf_dagfuncs.c
+++ b/sys/dev/raidframe/rf_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.c,v 1.5 1999/08/26 02:40:28 oster Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.6 2000/03/30 12:45:40 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -636,14 +636,14 @@ rf_bxor(src, dest, len, bp)
*/
int
rf_longword_bxor(src, dest, len, bp)
- register unsigned long *src;
- register unsigned long *dest;
+ unsigned long *src;
+ unsigned long *dest;
int len; /* longwords */
void *bp;
{
- register unsigned long *end = src + len;
- register unsigned long d0, d1, d2, d3, s0, s1, s2, s3; /* temps */
- register unsigned long *pg_src, *pg_dest; /* per-page source/dest
+ unsigned long *end = src + len;
+ unsigned long d0, d1, d2, d3, s0, s1, s2, s3; /* temps */
+ unsigned long *pg_src, *pg_dest; /* per-page source/dest
* pointers */
int longs_this_time;/* # longwords to xor in the current iteration */
@@ -713,15 +713,15 @@ rf_longword_bxor(src, dest, len, bp)
*/
int
rf_longword_bxor3(dst, a, b, c, len, bp)
- register unsigned long *dst;
- register unsigned long *a;
- register unsigned long *b;
- register unsigned long *c;
+ unsigned long *dst;
+ unsigned long *a;
+ unsigned long *b;
+ unsigned long *c;
int len; /* length in longwords */
void *bp;
{
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
- register unsigned long *pg_a, *pg_b, *pg_c, *pg_dst; /* per-page source/dest
+ unsigned long *pg_a, *pg_b, *pg_c, *pg_dst; /* per-page source/dest
* pointers */
int longs_this_time;/* # longs to xor in the current iteration */
char dst_is_a = 0;
@@ -878,10 +878,10 @@ rf_longword_bxor3(dst, a, b, c, len, bp)
int
rf_bxor3(dst, a, b, c, len, bp)
- register unsigned char *dst;
- register unsigned char *a;
- register unsigned char *b;
- register unsigned char *c;
+ unsigned char *dst;
+ unsigned char *a;
+ unsigned char *b;
+ unsigned char *c;
unsigned long len;
void *bp;
{
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
index ea8a6d4bf39..d9c4c7a77de 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.5 2000/03/13 23:52:36 soren Exp $ */
+/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.6 2000/03/30 12:45:40 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -313,11 +313,11 @@ rf_e_EncOneSect(
#if RF_EO_MATRIX_DIM > 17
int shortsPerEU = bytesPerEU / sizeof(short);
short *destShortBuf, *srcShortBuf1, *srcShortBuf2;
- register short temp1;
+ short temp1;
#elif RF_EO_MATRIX_DIM == 17
int longsPerEU = bytesPerEU / sizeof(long);
long *destLongBuf, *srcLongBuf1, *srcLongBuf2;
- register long temp1;
+ long temp1;
#endif
#if RF_EO_MATRIX_DIM > 17
@@ -472,7 +472,7 @@ rf_doubleEOdecode(
int shortsPerEU = bytesPerEU / sizeof(short);
short *rrdbuf_current, *pbuf_current, *ebuf_current;
short *dest_smaller, *dest_smaller_current, *dest_larger, *dest_larger_current;
- register short *temp;
+ short *temp;
short *P;
RF_ASSERT(bytesPerEU % sizeof(short) == 0);
@@ -482,7 +482,7 @@ rf_doubleEOdecode(
int longsPerEU = bytesPerEU / sizeof(long);
long *rrdbuf_current, *pbuf_current, *ebuf_current;
long *dest_smaller, *dest_smaller_current, *dest_larger, *dest_larger_current;
- register long *temp;
+ long *temp;
long *P;
RF_ASSERT(bytesPerEU % sizeof(long) == 0);
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 88cfea90ed6..6791a0f9ad4 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.73 2000/03/26 22:38:28 oster Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.74 2000/03/30 12:45:40 augustss Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -644,9 +644,9 @@ raidclose(dev, flags, fmt, p)
void
raidstrategy(bp)
- register struct buf *bp;
+ struct buf *bp;
{
- register int s;
+ int s;
unsigned int raidID = raidunit(bp->b_dev);
RF_Raid_t *raidPtr;
@@ -1756,7 +1756,7 @@ KernelWakeupFunc(vbp)
struct buf *bp;
struct raid_softc *rs;
int unit;
- register int s;
+ int s;
s = splbio();
db1_printf(("recovering the request queue:\n"));
diff --git a/sys/dev/raidframe/rf_nwayxor.c b/sys/dev/raidframe/rf_nwayxor.c
index b76231b5ab3..247587fdcd3 100644
--- a/sys/dev/raidframe/rf_nwayxor.c
+++ b/sys/dev/raidframe/rf_nwayxor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_nwayxor.c,v 1.3 1999/02/05 00:06:13 oster Exp $ */
+/* $NetBSD: rf_nwayxor.c,v 1.4 2000/03/30 12:45:41 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -73,10 +73,10 @@ rf_nWayXor1(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *src = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *dest = (unsigned long *) dest_rb->buffer;
- register unsigned long *end = src + len;
- register unsigned long d0, d1, d2, d3, s0, s1, s2, s3;
+ unsigned long *src = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *dest = (unsigned long *) dest_rb->buffer;
+ unsigned long *end = src + len;
+ unsigned long d0, d1, d2, d3, s0, s1, s2, s3;
callcount[1]++;
while (len >= 4) {
@@ -107,10 +107,10 @@ rf_nWayXor2(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *a = dst;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *a = dst;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[2]++;
@@ -200,10 +200,10 @@ rf_nWayXor3(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[3]++;
@@ -230,11 +230,11 @@ rf_nWayXor4(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[4]++;
@@ -262,12 +262,12 @@ rf_nWayXor5(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
- register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[5]++;
@@ -296,13 +296,13 @@ rf_nWayXor6(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
- register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
- register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
+ unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[6]++;
@@ -332,14 +332,14 @@ rf_nWayXor7(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
- register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
- register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
- register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
+ unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
+ unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[7]++;
@@ -370,15 +370,15 @@ rf_nWayXor8(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
- register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
- register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
- register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
- register unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
+ unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
+ unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
+ unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[8]++;
@@ -411,16 +411,16 @@ rf_nWayXor9(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
- register unsigned long *dst = (unsigned long *) dest_rb->buffer;
- register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
- register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
- register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
- register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
- register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
- register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
- register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
- register unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
- register unsigned long *j = (unsigned long *) src_rbs[8]->buffer;
+ unsigned long *dst = (unsigned long *) dest_rb->buffer;
+ unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
+ unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
+ unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
+ unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
+ unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
+ unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
+ unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
+ unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
+ unsigned long *j = (unsigned long *) src_rbs[8]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[9]++;