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/firewire | |
| 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/firewire')
| -rw-r--r-- | sys/dev/firewire/sbp.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index d112ffc..07bf416 100644 --- a/sys/dev/firewire/sbp.c +++ b/sys/dev/firewire/sbp.c @@ -2527,12 +2527,10 @@ END_DEBUG strncpy(cpi->hba_vid, "SBP", HBA_IDLEN); strncpy(cpi->dev_name, sim->sim_name, DEV_IDLEN); cpi->unit_number = sim->unit_number; -#ifdef CAM_NEW_TRAN_CODE cpi->transport = XPORT_SPI; /* XX should have a FireWire */ cpi->transport_version = 2; cpi->protocol = PROTO_SCSI; cpi->protocol_version = SCSI_REV_2; -#endif cpi->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); @@ -2541,7 +2539,6 @@ END_DEBUG case XPT_GET_TRAN_SETTINGS: { 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 = @@ -2555,11 +2552,6 @@ END_DEBUG spi->flags = CTS_SPI_FLAGS_DISC_ENB; scsi->valid = CTS_SCSI_VALID_TQ; scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; -#else - /* Enable disconnect and tagged queuing */ - cts->valid = CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID; - cts->flags = CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB; -#endif SBP_DEBUG(1) printf("%s:%d:%d XPT_GET_TRAN_SETTINGS:.\n", device_get_nameunit(sbp->fd.dev), |
