diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-10-31 05:53:29 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-10-31 05:53:29 +0000 |
| commit | 7e1db24f987a0a59d6a2ddc84ab0ef69d9d0370e (patch) | |
| tree | 8b3b2da053646664eaa8096add01ca22cc513072 /sys/dev/usb | |
| parent | 21803ea6f1397d03bf63a4e7bf9f4aac1f9f505d (diff) | |
| download | FreeBSD-src-7e1db24f987a0a59d6a2ddc84ab0ef69d9d0370e.zip FreeBSD-src-7e1db24f987a0a59d6a2ddc84ab0ef69d9d0370e.tar.gz | |
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
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/umass.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 9ad1d5d..2169920 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -2606,13 +2606,21 @@ umass_cam_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_USB; + cts->transport_version = XPORT_VERSION_UNSPECIFIED; + cts->xport_specific.valid = 0; +#else DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n", device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim), ccb->ccb_h.target_id, ccb->ccb_h.target_lun)); cts->valid = 0; cts->flags = 0; /* no disconnection, tagging */ +#endif ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); |
