diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-11-02 00:54:38 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-11-02 00:54:38 +0000 |
| commit | 19b599de4af959c5287bac69d61c3810ae390dfe (patch) | |
| tree | 9b84492a0966128feabcb74bbcc277bbdb6640c1 /sys/dev/iir | |
| parent | e6e29e358bcae4e62ea9a2d72c5b2501c75a1850 (diff) | |
| download | FreeBSD-src-19b599de4af959c5287bac69d61c3810ae390dfe.zip FreeBSD-src-19b599de4af959c5287bac69d61c3810ae390dfe.tar.gz | |
2nd and final commit that moves us to CAM_NEW_TRAN_CODE
as the default.
Reviewed by multitudes.
Diffstat (limited to 'sys/dev/iir')
| -rw-r--r-- | sys/dev/iir/iir.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 885400d..51a636c 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -1349,7 +1349,6 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; -#ifdef CAM_NEW_TRAN_CODE struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; @@ -1375,24 +1374,6 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) } else { ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; } -#else - if ((cts->flags & CCB_TRANS_USER_SETTINGS) != 0) { - cts->flags = CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB; - cts->bus_width = MSG_EXT_WDTR_BUS_16_BIT; - cts->sync_period = 25; /* 10MHz */ - if (cts->sync_period != 0) - cts->sync_offset = 15; - - cts->valid = CCB_TRANS_SYNC_RATE_VALID - | CCB_TRANS_SYNC_OFFSET_VALID - | CCB_TRANS_BUS_WIDTH_VALID - | CCB_TRANS_DISC_VALID - | CCB_TRANS_TQ_VALID; - ccb->ccb_h.status = CAM_REQ_CMP; - } else { - ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; - } -#endif --gdt_stat.io_count_act; xpt_done(ccb); break; @@ -1454,12 +1435,10 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) else strncpy(cpi->hba_vid, "ICP vortex ", HBA_IDLEN); strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); -#ifdef CAM_NEW_TRAN_CODE cpi->transport = XPORT_SPI; cpi->transport_version = 2; cpi->protocol = PROTO_SCSI; cpi->protocol_version = SCSI_REV_2; -#endif cpi->ccb_h.status = CAM_REQ_CMP; --gdt_stat.io_count_act; xpt_done(ccb); |
