summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2006-03-15 14:31:30 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2006-03-15 14:31:30 +0000
commite27bc17fa6910f4591272cf751209d537ee8e303 (patch)
treee9e5c74643110c33714ef477dadea21a7b92ac65 /sys/dev
parenta97a2f66ef45acc162c5da5fd531a7d85d9ff599 (diff)
switch the ioctl paths to using ami_start instead of ami_cmd. now the only
things left using ami_cmd are the scsi paths.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ami.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index e0237a7621d..983e9597e2f 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.118 2006/03/15 13:51:04 dlg Exp $ */
+/* $OpenBSD: ami.c,v 1.119 2006/03/15 14:31:29 dlg Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -1726,7 +1726,7 @@ ami_drv_inq(struct ami_softc *sc, u_int8_t ch, u_int8_t tg, u_int8_t page,
return (ENOMEM);
}
- if (ami_cmd(ccb, BUS_DMA_WAITOK, 0) != 0)
+ if (ami_start(sc, ccb) != 0)
return (EIO);
while (ccb->ccb_wakeup)
@@ -1792,7 +1792,7 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2,
cmd->acc_io.aio_data = am ? htole32(AMIMEM_DVA(am)) : 0;
- if (ami_cmd(ccb, BUS_DMA_WAITOK, 0) == 0) {
+ if (ami_start(sc, ccb) == 0) {
while (ccb->ccb_wakeup)
tsleep(ccb, PRIBIO,"ami_mgmt", 0);