summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2000-09-11 02:23:14 +0000
committeroster <oster@NetBSD.org>2000-09-11 02:23:14 +0000
commit32802fc83f6cd99cc7c2111c61497dfdc7554e08 (patch)
treec43a2388c2eb81d145252211a875935f389a6393 /sys/dev/raidframe
parent15c84d56e5507e43d30ab1cb8d22902bd7e954ff (diff)
Be consistent: use mcpair->cond instead of mcpair->flag.
This also lets us clean up a bunch of cruft.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_mcpair.c11
-rw-r--r--sys/dev/raidframe/rf_mcpair.h5
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c
index 60393aa678f..be96cd653d8 100644
--- a/sys/dev/raidframe/rf_mcpair.c
+++ b/sys/dev/raidframe/rf_mcpair.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.c,v 1.3 1999/02/05 00:06:13 oster Exp $ */
+/* $NetBSD: rf_mcpair.c,v 1.4 2000/09/11 02:23:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -135,13 +135,6 @@ rf_MCPairWakeupFunc(mcpair)
{
RF_LOCK_MUTEX(mcpair->mutex);
mcpair->flag = 1;
-#if 0
- printf("MCPairWakeupFunc called!\n");
-#endif
- wakeup(&(mcpair->flag));/* XXX Does this do anything useful!! GO */
- /* XXX Looks like the following is needed to truly get the
- * functionality they were looking for here... This could be a
- * side-effect of my using a tsleep in the NetBSD port though... XXX */
- wakeup(&(mcpair->cond));/* XXX XXX XXX GO */
+ wakeup(&(mcpair->cond));
RF_UNLOCK_MUTEX(mcpair->mutex);
}
diff --git a/sys/dev/raidframe/rf_mcpair.h b/sys/dev/raidframe/rf_mcpair.h
index 244529d2b75..a0dd0477114 100644
--- a/sys/dev/raidframe/rf_mcpair.h
+++ b/sys/dev/raidframe/rf_mcpair.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.h,v 1.4 1999/03/14 21:53:31 oster Exp $ */
+/* $NetBSD: rf_mcpair.h,v 1.5 2000/09/11 02:23:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -42,7 +42,8 @@ struct RF_MCPair_s {
int flag;
RF_MCPair_t *next;
};
-#define RF_WAIT_MCPAIR(_mcp) tsleep(&((_mcp)->flag), PRIBIO, "mcpair", 0)
+#define RF_WAIT_MCPAIR(_mcp) \
+ tsleep(&((_mcp)->cond), PRIBIO, "mcpair", 0)
int rf_ConfigureMCPair(RF_ShutdownList_t ** listp);
RF_MCPair_t *rf_AllocMCPair(void);