summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorhannken <hannken@NetBSD.org>2002-07-20 16:30:18 +0000
committerhannken <hannken@NetBSD.org>2002-07-20 16:30:18 +0000
commit856bd17f6605e7b0bfbca5e644e7e24d5d5db114 (patch)
tree18db8f6a1e61653014811b9895529436504bfc10 /sys/dev/mca
parentc4557301414f802295a8ede3bfcb69d671131993 (diff)
Convert to new device buffer queue interface.
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/ed_mca.c8
-rw-r--r--sys/dev/mca/edc_mca.c7
-rw-r--r--sys/dev/mca/edvar.h4
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index d4ef8877976..8f0d8eaa8b3 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.11 2002/03/29 20:10:46 jdolecek Exp $ */
+/* $NetBSD: ed_mca.c,v 1.12 2002/07/20 16:30:18 hannken Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.11 2002/03/29 20:10:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.12 2002/07/20 16:30:18 hannken Exp $");
#include "rnd.h"
#include "locators.h"
@@ -150,7 +150,7 @@ ed_mca_attach(parent, self, aux)
ed->sc_devno = eda->edc_drive;
edc_add_disk(sc, ed);
- BUFQ_INIT(&ed->sc_q);
+ bufq_init(&ed->sc_q, BUFQ_DISKSORT|BUFQ_SORT_RAWBLOCK);
simple_lock_init(&ed->sc_q_lock);
snprintf(lckname, sizeof(lckname), "%slck", ed->sc_dev.dv_xname);
lockinit(&ed->sc_lock, PRIBIO | PCATCH, lckname, 0, 0);
@@ -248,7 +248,7 @@ edmcastrategy(bp)
/* Queue transfer on drive, activate drive and controller if idle. */
simple_lock(&ed->sc_q_lock);
- disksort_blkno(&ed->sc_q, bp);
+ BUFQ_PUT(&ed->sc_q, bp);
simple_unlock(&ed->sc_q_lock);
/* Ring the worker thread */
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index bed68bb5c8b..e5c0d76d417 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.16 2002/03/31 10:01:26 jdolecek Exp $ */
+/* $NetBSD: edc_mca.c,v 1.17 2002/07/20 16:30:19 hannken Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.16 2002/03/31 10:01:26 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.17 2002/07/20 16:30:19 hannken Exp $");
#include "rnd.h"
@@ -855,12 +855,11 @@ edcworker(arg)
/* Is there a buf for us ? */
simple_lock(&ed->sc_q_lock);
- if ((bp = BUFQ_FIRST(&ed->sc_q)) == NULL) {
+ if ((bp = BUFQ_GET(&ed->sc_q)) == NULL) {
simple_unlock(&ed->sc_q_lock);
i++;
continue;
}
- BUFQ_REMOVE(&ed->sc_q, bp);
simple_unlock(&ed->sc_q_lock);
/* Instrumentation. */
diff --git a/sys/dev/mca/edvar.h b/sys/dev/mca/edvar.h
index ebe6bfbca18..4ffb747b592 100644
--- a/sys/dev/mca/edvar.h
+++ b/sys/dev/mca/edvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edvar.h,v 1.6 2001/11/24 12:46:15 jdolecek Exp $ */
+/* $NetBSD: edvar.h,v 1.7 2002/07/20 16:30:19 hannken Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@ struct ed_softc {
/* General disk infos */
struct disk sc_dk;
- struct buf_queue sc_q;
+ struct bufq_state sc_q;
struct simplelock sc_q_lock;
struct edc_mca_softc *edc_softc; /* pointer to our controller */