svn commit: r237308 - stable/9/sbin/camcontrol

[Alexander Motin]

Author: mav
Date: Wed Jun 20 14:14:27 2012
New Revision: 237308
URL: http://svn.freebsd.org/changeset/base/237308

Log:
  MFC r236555:
  Add -p argument for `camcontrol debug` to allow enabling CAM_DEBUG_PROBE
  added at r208911.

Modified:
  stable/9/sbin/camcontrol/camcontrol.8
  stable/9/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.8
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.8	Wed Jun 20 14:13:07 2012	(r237307)
+++ stable/9/sbin/camcontrol/camcontrol.8	Wed Jun 20 14:14:27 2012	(r237308)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 30, 2010
+.Dd June 4, 2012
 .Dt CAMCONTROL 8
 .Os
 .Sh NAME
@@ -175,6 +175,7 @@
 .Op Fl S
 .Op Fl X
 .Op Fl c
+.Op Fl p
 .Aq all|off|bus Ns Op :target Ns Op :lun
 .Nm
 .Ic tags
@@ -789,6 +790,8 @@ Enable CAM_DEBUG_XPT printfs.
 Enable CAM_DEBUG_CDB printfs.
 This will cause the kernel to print out the
 SCSI CDBs sent to the specified device(s).
+.It Fl p
+Enable CAM_DEBUG_PROBE printfs.
 .It all
 Enable debugging for all devices.
 .It off

Modified: stable/9/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 20 14:13:07 2012	(r237307)
+++ stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 20 14:14:27 2012	(r237308)
@@ -122,6 +122,7 @@ typedef enum {
 	CAM_ARG_DEBUG_CDB	= 0x08000000,
 	CAM_ARG_DEBUG_XPT	= 0x10000000,
 	CAM_ARG_DEBUG_PERIPH	= 0x20000000,
+	CAM_ARG_DEBUG_PROBE	= 0x40000000,
 } cam_argmask;
 
 struct camcontrol_opts {
@@ -175,7 +176,7 @@ struct camcontrol_opts option_table[] = 
 	{"tags", CAM_CMD_TAG, CAM_ARG_NONE, "N:q"},
 	{"negotiate", CAM_CMD_RATE, CAM_ARG_NONE, negotiate_opts},
 	{"rate", CAM_CMD_RATE, CAM_ARG_NONE, negotiate_opts},
-	{"debug", CAM_CMD_DEBUG, CAM_ARG_NONE, "IPTSXc"},
+	{"debug", CAM_CMD_DEBUG, CAM_ARG_NONE, "IPTSXcp"},
 	{"format", CAM_CMD_FORMAT, CAM_ARG_NONE, "qrwy"},
 	{"idle", CAM_CMD_IDLE, CAM_ARG_NONE, "t:"},
 	{"standby", CAM_CMD_STANDBY, CAM_ARG_NONE, "t:"},
@@ -2640,6 +2641,10 @@ camdebug(int argc, char **argv, char *co
 			arglist |= CAM_ARG_DEBUG_CDB;
 			ccb.cdbg.flags |= CAM_DEBUG_CDB;
 			break;
+		case 'p':
+			arglist |= CAM_ARG_DEBUG_PROBE;
+			ccb.cdbg.flags |= CAM_DEBUG_PROBE;
+			break;
 		default:
 			break;
 		}
@@ -2669,7 +2674,7 @@ camdebug(int argc, char **argv, char *co
 		ccb.cdbg.flags = CAM_DEBUG_NONE;
 		arglist &= ~(CAM_ARG_DEBUG_INFO|CAM_ARG_DEBUG_PERIPH|
 			     CAM_ARG_DEBUG_TRACE|CAM_ARG_DEBUG_SUBTRACE|
-			     CAM_ARG_DEBUG_XPT);
+			     CAM_ARG_DEBUG_XPT|CAM_ARG_DEBUG_PROBE);
 	} else if (strncmp(tstr, "all", 3) != 0) {
 		tmpstr = (char *)strtok(tstr, ":");
 		if ((tmpstr != NULL) && (*tmpstr != '\0')){