svn commit: r296604 - in head/sys: cam cam/ctl dev/isp

[Warner Losh]

Author: imp
Date: Thu Mar 10 06:25:05 2016
New Revision: 296604
URL: https://svnweb.freebsd.org/changeset/base/296604

Log:
  Move to new value for XPT_GET_SIM_KNOB to avoid clash with XPT_ATA_IO.

Modified:
  head/sys/cam/cam_ccb.h
  head/sys/cam/cam_xpt.c
  head/sys/cam/ctl/scsi_ctl.c
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h	Thu Mar 10 06:15:31 2016	(r296603)
+++ head/sys/cam/cam_ccb.h	Thu Mar 10 06:25:05 2016	(r296604)
@@ -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 */
 

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Thu Mar 10 06:15:31 2016	(r296603)
+++ head/sys/cam/cam_xpt.c	Thu Mar 10 06:25:05 2016	(r296604)
@@ -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:

Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c	Thu Mar 10 06:15:31 2016	(r296603)
+++ head/sys/cam/ctl/scsi_ctl.c	Thu Mar 10 06:25:05 2016	(r296604)
@@ -1557,6 +1557,7 @@ ctlfedone(struct cam_periph *periph, uni
 		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__,

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Thu Mar 10 06:15:31 2016	(r296603)
+++ head/sys/dev/isp/isp_freebsd.c	Thu Mar 10 06:25:05 2016	(r296604)
@@ -3944,6 +3944,7 @@ isp_action(struct cam_sim *sim, union cc
 		xpt_done(ccb);
 		break;
 	}
+	case XPT_GET_SIM_KNOB_OLD:	/* Get SIM knobs -- compat value */
 	case XPT_GET_SIM_KNOB:		/* Get SIM knobs */
 	{
 		struct ccb_sim_knob *kp = &ccb->knob;