diff options
| author | imp <imp@FreeBSD.org> | 2016-03-10 06:25:05 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2016-03-10 06:25:05 +0000 |
| commit | 95982d7b7a4921dd302e9b3f3223c9e2228e1918 (patch) | |
| tree | 332ee14c9fce0d0a7b99f6f297c95752056a0838 /sys/cam | |
| parent | a2eea2e32af1b77021c962ca06b796cfb24c5d04 (diff) | |
| download | FreeBSD-src-95982d7b7a4921dd302e9b3f3223c9e2228e1918.zip FreeBSD-src-95982d7b7a4921dd302e9b3f3223c9e2228e1918.tar.gz | |
Move to new value for XPT_GET_SIM_KNOB to avoid clash with XPT_ATA_IO.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/cam_ccb.h | 10 | ||||
| -rw-r--r-- | sys/cam/cam_xpt.c | 1 | ||||
| -rw-r--r-- | sys/cam/ctl/scsi_ctl.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 28abc30..4e1e6a2 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -189,16 +189,18 @@ typedef enum { XPT_ATA_IO = 0x18 | XPT_FC_DEV_QUEUED, /* Execute the requested ATA I/O operation */ - XPT_GET_SIM_KNOB = 0x18, - /* - * Get SIM specific knob values. - */ + XPT_GET_SIM_KNOB_OLD = 0x18, /* Compat only */ XPT_SET_SIM_KNOB = 0x19, /* * Set SIM specific knob values. */ + XPT_GET_SIM_KNOB = 0x1a, + /* + * Get SIM specific knob values. + */ + XPT_SMP_IO = 0x1b | XPT_FC_DEV_QUEUED, /* Serial Management Protocol */ diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index c2dd6a5..e811fe6 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -2610,6 +2610,7 @@ xpt_action_default(union ccb *start_ccb) case XPT_RESET_BUS: case XPT_IMMEDIATE_NOTIFY: case XPT_NOTIFY_ACKNOWLEDGE: + case XPT_GET_SIM_KNOB_OLD: case XPT_GET_SIM_KNOB: case XPT_SET_SIM_KNOB: case XPT_GET_TRAN_SETTINGS: diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 2705240..98966e8 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -1557,6 +1557,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb) break; case XPT_SET_SIM_KNOB: case XPT_GET_SIM_KNOB: + case XPT_GET_SIM_KNOB_OLD: break; default: panic("%s: unexpected CCB type %#x", __func__, |
