sync with NetBSD

- removed threadid stuff
- removed unused files
- general tidyup
- you can no longer configure the same unit twice (without
de-configuring first of course).

Again, this has only been tested locally on IDE disks. Further testing
and feedback would be appreciated.

1 files changed, 8 insertions, 14 deletions

diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 317f3887a27..411f1b65cc8 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rf_fifo.c,v 1.3 1999/08/04 13:10:54 peter Exp $	*/
-/*	$NetBSD: rf_fifo.c,v 1.3 1999/02/05 00:06:11 oster Exp $	*/
+/*	$OpenBSD: rf_fifo.c,v 1.4 2000/01/11 18:02:22 peter Exp $	*/
+/*	$NetBSD: rf_fifo.c,v 1.4 2000/01/08 23:45:05 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -44,8 +44,9 @@
 #include "rf_fifo.h"
 #include "rf_debugMem.h"
 #include "rf_general.h"
-#include "rf_threadid.h"
 #include "rf_options.h"
+#include "rf_raid.h"
+#include "rf_types.h"
 
 /* just malloc a header, zero it (via calloc), and return it */
 /*ARGSUSED*/
@@ -86,9 +87,8 @@ rf_FifoEnqueue(q_in, elem, priority)
 	} else {
 		RF_ASSERT(elem->next == NULL);
 		if (rf_fifoDebug) {
-			int     tid;
-			rf_get_threadid(tid);
-			printf("[%d] fifo: ENQ lopri\n", tid);
+			printf("raid%d: fifo: ENQ lopri\n", 
+			       elem->raidPtr->raidid);
 		}
 		if (!q->lq_tail) {
 			RF_ASSERT(q->lq_count == 0 && q->lq_head == NULL);
@@ -138,9 +138,8 @@ rf_FifoDequeue(q_in)
 			nd->next = NULL;
 			q->lq_count--;
 			if (rf_fifoDebug) {
-				int     tid;
-				rf_get_threadid(tid);
-				printf("[%d] fifo: DEQ lopri %lx\n", tid, (long) nd);
+				printf("raid%d: fifo: DEQ lopri %lx\n", 
+				       nd->raidPtr->raidid, (long) nd);
 			}
 		} else {
 			RF_ASSERT(q->hq_count == 0 && q->lq_count == 0 && q->hq_tail == NULL && q->lq_tail == NULL);
@@ -319,10 +318,5 @@ rf_FifoPromote(q_in, parityStripeID, which_ru)
 	/* sanity check.  delete this if you ever put more than one entry in
 	 * the low-pri queue */
 	RF_ASSERT(retval == 0 || retval == 1);
-	if (rf_fifoDebug) {
-		int     tid;
-		rf_get_threadid(tid);
-		printf("[%d] fifo: promote %d\n", tid, retval);
-	}
 	return (retval);
 }