aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/amr/amrvar.h
diff options
context:
space:
mode:
authorScott Long <scottl@FreeBSD.org>2005-01-16 07:34:26 +0000
committerScott Long <scottl@FreeBSD.org>2005-01-16 07:34:26 +0000
commit5b4a781b96ffc9526a18dd0d5576dbda89bffa8a (patch)
treebfdf6effed4ced3ac3ccec00ef9ddd7f6c13681e /sys/dev/amr/amrvar.h
parent835e0fa318d85113643e78fceff2f806f6c34fc4 (diff)
Notes
Diffstat (limited to 'sys/dev/amr/amrvar.h')
-rw-r--r--sys/dev/amr/amrvar.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 6dc68387da8ea..a36b68405a95a 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -57,8 +57,9 @@
*/
#if __FreeBSD_version >= 500005
-# include <sys/taskqueue.h>
# include <geom/geom_disk.h>
+# include <sys/lock.h>
+# include <sys/mutex.h>
#endif
#ifdef AMR_DEBUG
@@ -174,6 +175,7 @@ struct amr_softc
bus_dmamap_t amr_sg_dmamap; /* map for s/g buffers */
/* controller limits and features */
+ int amr_nextslot; /* Next slot to use for newly allocated commands */
int amr_maxio; /* maximum number of I/O transactions */
int amr_maxdrives; /* max number of logical drives */
int amr_maxchan; /* count of SCSI channels */
@@ -222,9 +224,7 @@ struct amr_softc
/* misc glue */
struct intr_config_hook amr_ich; /* wait-for-interrupts probe hook */
struct callout_handle amr_timeout; /* periodic status check */
-#if __FreeBSD_version >= 500005
- struct task amr_task_complete; /* deferred-completion task */
-#endif
+ struct mtx amr_io_lock;
};
/*