The first of 3 major steps to move the CAM layer forward to using

the CAM_NEW_TRAN_CODE that has been in the tree for some years now.

This first step consists solely of adding to or correcting
CAM_NEW_TRAN_CODE pieces in the kernel source tree such
that a both a GENERIC (at least on i386) and a LINT build
with CAM_NEW_TRAN_CODE as an option will compile correctly
and run (at least with some the h/w I have).

After a short settle time, the other pieces (making
CAM_NEW_TRAN_CODE the default and updating libcam
and camcontrol) will be brought in.

This will be an incompatible change in that the size of structures
related to XPT_PATH_INQ and XPT_{GET,SET}_TRAN_SETTINGS change
in both size and content. However, basic system operation and
basic system utilities work well enough with this change.

Reviewed by:	freebsd-scsi and specific stakeholders

1 files changed, 32 insertions, 2 deletions

diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index 251ec6b..7b37ec0 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -291,6 +291,12 @@ amr_cam_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 = 132 * 1024;  /* XXX get from controller? */
+#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;
 
 	break;
@@ -314,12 +320,35 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb)
 
     case XPT_GET_TRAN_SETTINGS:
     {
-	struct ccb_trans_settings	*cts;
+	struct ccb_trans_settings	*cts = &(ccb->cts);
 
 	debug(3, "XPT_GET_TRAN_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) {
+		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
+		break;
+	}
+
+	spi->flags = CTS_SPI_FLAGS_DISC_ENB;
+	spi->bus_width = MSG_EXT_WDTR_BUS_32_BIT;
+	spi->sync_period = 6;   /* 40MHz how wide is this bus? */
+	spi->sync_offset = 31;  /* How to extract this from board? */
+
+	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;
+#else
 	if ((cts->flags & CCB_TRANS_USER_SETTINGS) == 0) {
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		break;
@@ -335,6 +364,7 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb)
 	    | CCB_TRANS_BUS_WIDTH_VALID
 	    | CCB_TRANS_DISC_VALID
 	    | CCB_TRANS_TQ_VALID;
+#endif
 	ccb->ccb_h.status = CAM_REQ_CMP;
 	break;
     }