summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/advansys/advansys.c4
-rw-r--r--sys/dev/advansys/adwcam.c4
-rw-r--r--sys/dev/aha/aha.c4
-rw-r--r--sys/dev/ahb/ahb.c4
-rw-r--r--sys/dev/aic7xxx/aic79xx_osm.c4
-rw-r--r--sys/dev/aic7xxx/aic7xxx_osm.c4
-rw-r--r--sys/dev/amd/amd.c4
-rw-r--r--sys/dev/buslogic/bt.c4
-rw-r--r--sys/dev/dpt/dpt_scsi.c4
-rw-r--r--sys/dev/ida/ida.c6
-rw-r--r--sys/dev/mpt/mpt_freebsd.c6
-rw-r--r--sys/dev/trm/trm.c2
12 files changed, 25 insertions, 25 deletions
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index ad12847dc261b..ed820aa7e1e6d 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 ac802867ffda1..4085f3bfa89d8 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;
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 75cff3466f126..7fe6f25b56af5 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -1115,7 +1115,7 @@ ahaexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg != 0) {
aha_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1254,7 +1254,7 @@ ahadone(struct aha_softc *aha, struct aha_ccb *accb, aha_mbi_comp_code_t comp_co
}
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/ahb/ahb.c b/sys/dev/ahb/ahb.c
index a60097ffe73c6..e6d715bfce266 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -788,7 +788,7 @@ ahbdone(struct ahb_softc *ahb, u_int32_t mbox, u_int intstat)
LIST_REMOVE(&ccb->ccb_h, sim_links.le);
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;
@@ -912,7 +912,7 @@ ahbexecuteecb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg != 0) {
ahb_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index c1650b31ec4b8..c2bb23b1f1979 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -215,7 +215,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
untimeout(ahd_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
@@ -1056,7 +1056,7 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments,
scb->sg_count = 0;
if (nsegments != 0) {
void *sg;
- /*bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
u_int i;
/* Copy the segments into our SG list */
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index 2cdeb348d1c58..91af8ddbede8e 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -284,7 +284,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb)
untimeout(ahc_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
@@ -1107,7 +1107,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments,
if (nsegments != 0) {
struct ahc_dma_seg *sg;
bus_dma_segment_t *end_seg;
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nsegments;
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index e611acc4c44ff..ae8b8a8a57ea2 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -328,7 +328,7 @@ amdexecutesrb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg != 0) {
struct amd_sg *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1888,7 +1888,7 @@ SRBdone(struct amd_softc *amd, struct amd_srb *pSRB)
("SRBdone - TagNumber %d\n", pSRB->TagNumber));
if ((pccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index d7eb21380a94d..cfcf2e66995f1 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -1471,7 +1471,7 @@ btexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg != 0) {
bt_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1608,7 +1608,7 @@ btdone(struct bt_softc *bt, struct bt_ccb *bccb, bt_mbi_comp_code_t comp_code)
}
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/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 2c75285b2ea0b..33420aa8bb268 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -746,7 +746,7 @@ dptexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg != 0) {
dpt_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1695,7 +1695,7 @@ dpt_intr(void *arg)
ccb = dccb->ccb;
untimeout(dpttimeout, dccb, 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/ida/ida.c b/sys/dev/ida/ida.c
index d45e74a1f20ab..c1417495d2064 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -324,7 +324,7 @@ ida_command(struct ida_softc *ida, int command, void *data, int datasize,
{
struct ida_hardware_qcb *hwqcb;
struct ida_qcb *qcb;
- int op;
+ bus_dmasync_op_t op;
int s, error;
s = splbio();
@@ -377,7 +377,7 @@ ida_construct_qcb(struct ida_softc *ida)
{
struct ida_hardware_qcb *hwqcb;
struct ida_qcb *qcb;
- int op;
+ bus_dmasync_op_t op;
struct bio *bp;
bp = bioq_first(&ida->bio_queue);
@@ -501,7 +501,7 @@ ida_done(struct ida_softc *ida, struct ida_qcb *qcb)
* finish up command
*/
if (qcb->flags & DMA_DATA_TRANSFER) {
- int op;
+ bus_dmasync_op_t op;
op = qcb->flags & DMA_DATA_IN ?
BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE;
diff --git a/sys/dev/mpt/mpt_freebsd.c b/sys/dev/mpt/mpt_freebsd.c
index 63615749222bf..926ab3a2b56d4 100644
--- a/sys/dev/mpt/mpt_freebsd.c
+++ b/sys/dev/mpt/mpt_freebsd.c
@@ -224,7 +224,7 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
if (nseg > MPT_NSGL_FIRST(mpt)) {
int i, nleft = nseg;
u_int32_t flags;
- int op;
+ bus_dmamap_sync_t op;
SGE_CHAIN32 *ce;
mpt_req->DataLength = ccb->csio.dxfer_len;
@@ -305,7 +305,7 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
} else if (nseg > 0) {
int i;
u_int32_t flags;
- int op;
+ bus_dmamap_sync_t op;
mpt_req->DataLength = ccb->csio.dxfer_len;
flags = MPI_SGE_FLAGS_SIMPLE_ELEMENT;
@@ -878,7 +878,7 @@ mpt_done(mpt_softc_t *mpt, u_int32_t reply)
untimeout(mpttimeout, ccb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmamap_sync_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
op = BUS_DMASYNC_POSTREAD;
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 058fcde15b613..3cb9e4f0ba000 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -2504,7 +2504,7 @@ trm_SRBdone(PACB pACB, PDCB pDCB, PSRB pSRB)
target_id = pSRB->pccb->ccb_h.target_id;
target_lun = pSRB->pccb->ccb_h.target_lun;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 00:59:18 +0000