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/ata | |
| 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/ata')
| -rw-r--r-- | sys/dev/ata/atapi-cam.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c index e9ef578..28a95d0 100644 --- a/sys/dev/ata/atapi-cam.c +++ b/sys/dev/ata/atapi-cam.c @@ -363,12 +363,10 @@ atapi_action(struct cam_sim *sim, union ccb *ccb) cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = cam_sim_bus(sim); cpi->base_transfer_speed = 3300; -#ifdef CAM_NEW_TRAN_CODE cpi->transport = XPORT_ATA; cpi->transport_version = 2; cpi->protocol = PROTO_SCSI; cpi->protocol_version = SCSI_REV_2; -#endif if (softc->ata_ch && tid != CAM_TARGET_WILDCARD) { mtx_lock(&softc->state_lock); @@ -442,7 +440,6 @@ atapi_action(struct cam_sim *sim, union ccb *ccb) case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; -#ifdef CAM_NEW_TRAN_CODE cts->protocol = PROTO_SCSI; cts->protocol_version = SCSI_REV_2; cts->transport = XPORT_ATA; @@ -450,15 +447,6 @@ atapi_action(struct cam_sim *sim, union ccb *ccb) cts->proto_specific.valid = 0; cts->xport_specific.valid = 0; /* nothing more to do */ -#else - /* - * The default CAM transport code is very SCSI-specific and - * doesn't understand IDE speeds very well. Be silent about it - * here and let it default to what is set in XPT_PATH_INQ - */ - cts->valid = (CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID); - cts->flags &= ~(CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); -#endif ccb->ccb_h.status = CAM_REQ_CMP; CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_SUBTRACE, ("GET_TRAN_SETTINGS\n")); xpt_done(ccb); |
