diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2006-10-31 05:53:29 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2006-10-31 05:53:29 +0000 |
| commit | fa9ed865067ef325f013a8174c94eff345a4f4ed (patch) | |
| tree | 8b3b2da053646664eaa8096add01ca22cc513072 /sys/dev/iir | |
| parent | 9df92bda761535b468b198dc0bc23dc059051e8a (diff) | |
Notes
Diffstat (limited to 'sys/dev/iir')
| -rw-r--r-- | sys/dev/iir/iir.c | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index ebbaa1098d81..885400d4fb68 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -1348,11 +1348,34 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) case XPT_GET_TRAN_SETTINGS: /* Get default/user set transfer settings for the target */ { - struct ccb_trans_settings *cts; - u_int target_mask; - - cts = &ccb->cts; - target_mask = 0x01 << 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; + + cts->protocol = PROTO_SCSI; + cts->protocol_version = SCSI_REV_2; + cts->transport = XPORT_SPI; + cts->transport_version = 2; + + if (cts->type == CTS_TYPE_USER_SETTINGS) { + spi->flags = CTS_SPI_FLAGS_DISC_ENB; + scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; + spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT; + spi->sync_period = 25; /* 10MHz */ + if (spi->sync_period != 0) + spi->sync_offset = 15; + + spi->valid = CTS_SPI_VALID_SYNC_RATE + | CTS_SPI_VALID_SYNC_OFFSET + | CTS_SPI_VALID_BUS_WIDTH + | CTS_SPI_VALID_DISC; + scsi->valid = CTS_SCSI_VALID_TQ; + ccb->ccb_h.status = CAM_REQ_CMP; + } 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; @@ -1369,6 +1392,7 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) } else { ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; } +#endif --gdt_stat.io_count_act; xpt_done(ccb); break; @@ -1430,6 +1454,12 @@ 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); |