From bd3fd815a7fbc96f1506dfdcac840b94cff28d00 Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Thu, 2 Nov 2006 00:54:38 +0000 Subject: 2nd and final commit that moves us to CAM_NEW_TRAN_CODE as the default. Reviewed by multitudes. --- sys/dev/twa/tw_osl_cam.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'sys/dev/twa') diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c index 1dfa60f90d4b..6b6afebf8d35 100644 --- a/sys/dev/twa/tw_osl_cam.c +++ b/sys/dev/twa/tw_osl_cam.c @@ -420,7 +420,6 @@ twa_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 struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; struct ccb_trans_settings_spi *spi = @@ -435,10 +434,6 @@ twa_action(struct cam_sim *sim, union ccb *ccb) spi->flags = CTS_SPI_FLAGS_DISC_ENB; scsi->valid = CTS_SCSI_VALID_TQ; scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; -#else - cts->valid = (CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID); - cts->flags &= ~(CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); -#endif tw_osli_dbg_dprintf(3, sc, "XPT_GET_TRAN_SETTINGS"); ccb_h->status = CAM_REQ_CMP; xpt_done(ccb); @@ -471,12 +466,10 @@ twa_action(struct cam_sim *sim, union ccb *ccb) strncpy(path_inq->sim_vid, "FreeBSD", SIM_IDLEN); strncpy(path_inq->hba_vid, "3ware", HBA_IDLEN); strncpy(path_inq->dev_name, cam_sim_name(sim), DEV_IDLEN); -#ifdef CAM_NEW_TRAN_CODE path_inq->transport = XPORT_SPI; path_inq->transport_version = 2; path_inq->protocol = PROTO_SCSI; path_inq->protocol_version = SCSI_REV_2; -#endif ccb_h->status = CAM_REQ_CMP; xpt_done(ccb); break; -- cgit v1.2.3