diff options
| author | scottl <scottl@FreeBSD.org> | 2003-05-27 04:59:59 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2003-05-27 04:59:59 +0000 |
| commit | f26aca7b718b2d8b17889ad8eb0c65281493cc06 (patch) | |
| tree | aaea1de6e07eae55f5e31e6ae4f5d42cc5ae59a1 /sys/dev/advansys | |
| parent | 5fd5bdfb84667ef474531ecc19cceafdf2ef5e36 (diff) | |
| download | FreeBSD-src-f26aca7b718b2d8b17889ad8eb0c65281493cc06.zip FreeBSD-src-f26aca7b718b2d8b17889ad8eb0c65281493cc06.tar.gz | |
Bring back bus_dmasync_op_t. It is now a typedef to an int, though the
BUS_DMASYNC_ definitions remain as before. The does not change the ABI,
and reverts the API to be a bit more compatible and flexible. This has
survived a full 'make universe'.
Approved by: re (bmah)
Diffstat (limited to 'sys/dev/advansys')
| -rw-r--r-- | sys/dev/advansys/advansys.c | 4 | ||||
| -rw-r--r-- | sys/dev/advansys/adwcam.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c index ad12847..ed820aa 100644 --- a/sys/dev/advansys/advansys.c +++ b/sys/dev/advansys/advansys.c @@ -568,7 +568,7 @@ adv_execute_ccb(void *arg, bus_dma_segment_t *dm_segs, scsiq.q2.vm_id = 0; if (nsegments != 0) { - int op; + bus_dmasync_op_t op; scsiq.q1.data_addr = dm_segs->ds_addr; scsiq.q1.data_cnt = dm_segs->ds_len; @@ -1130,7 +1130,7 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat, LIST_REMOVE(&ccb->ccb_h, sim_links.le); untimeout(adv_timeout, ccb, ccb->ccb_h.timeout_ch); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - int op; + bus_dmasync_op_t op; if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) op = BUS_DMASYNC_POSTREAD; diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index ac80286..4085f3b 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -255,7 +255,7 @@ adwexecuteacb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error) } if (nseg != 0) { - int op; + bus_dmasync_op_t op; acb->queue.data_addr = dm_segs[0].ds_addr; acb->queue.data_cnt = ccb->csio.dxfer_len; @@ -1334,7 +1334,7 @@ adw_intr(void *arg) ccb = acb->ccb; untimeout(adwtimeout, acb, ccb->ccb_h.timeout_ch); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - int op; + bus_dmasync_op_t op; if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) op = BUS_DMASYNC_POSTREAD; |
