svn commit: r246294 - projects/physbio/sys/cam

[Konstantin Belousov]

Author: kib
Date: Sun Feb  3 19:17:44 2013
New Revision: 246294
URL: http://svnweb.freebsd.org/changeset/base/246294

Log:
  Restore the ABI of the cam ccb_flags. Carve the needed set of bits from
  the flags which were removed and which are never passed from the usermode.

Modified:
  projects/physbio/sys/cam/cam_ccb.h

Modified: projects/physbio/sys/cam/cam_ccb.h
==============================================================================
--- projects/physbio/sys/cam/cam_ccb.h	Sun Feb  3 18:42:20 2013	(r246293)
+++ projects/physbio/sys/cam/cam_ccb.h	Sun Feb  3 19:17:44 2013	(r246294)
@@ -64,33 +64,31 @@ typedef enum {
 					      * Perform transport negotiation
 					      * with this command.
 					      */
-	CAM_DIS_AUTOSENSE	= 0x00000010,/* Disable autosense feature     */
+	CAM_DATA_ISPHYS		= 0x00000010,/* Data type with physical addrs */
+	CAM_DIS_AUTOSENSE	= 0x00000020,/* Disable autosense feature     */
 	CAM_DIR_BOTH		= 0x00000000,/* Data direction (00:IN/OUT)    */
-	CAM_DIR_IN		= 0x00000020,/* Data direction (01:DATA IN)   */
-	CAM_DIR_OUT		= 0x00000040,/* Data direction (10:DATA OUT)  */
-	CAM_DIR_NONE		= 0x00000060,/* Data direction (11:no data)   */
-	CAM_DIR_MASK		= 0x00000060,/* Data direction Mask	      */
-	CAM_DATA_ISPHYS		= 0x00000080,/* Data type with physical addrs */
+	CAM_DIR_IN		= 0x00000040,/* Data direction (01:DATA IN)   */
+	CAM_DIR_OUT		= 0x00000080,/* Data direction (10:DATA OUT)  */
+	CAM_DIR_NONE		= 0x000000C0,/* Data direction (11:no data)   */
+	CAM_DIR_MASK		= 0x000000C0,/* Data direction Mask	      */
 	CAM_DATA_VADDR		= 0x00000000,/* Data type (000:Virtual)       */
-	CAM_DATA_PADDR		= 0x00000080,/* Data type (001:Physical)      */
-	CAM_DATA_SG		= 0x00000100,/* Data type (010:sglist)        */
-	CAM_DATA_SG_PADDR	= 0x00000180,/* Data type (011:sglist phys)   */
-	CAM_DATA_BIO		= 0x00000200,/* Data type (100:bio)           */
-	CAM_DATA_MASK		= 0x00000380,/* Data type mask                */
-	CAM_SOFT_RST_OP		= 0x00000400,/* Use Soft reset alternative    */
-	CAM_ENG_SYNC		= 0x00000800,/* Flush resid bytes on complete */
-	CAM_DEV_QFRZDIS		= 0x00001000,/* Disable DEV Q freezing	      */
-	CAM_DEV_QFREEZE		= 0x00002000,/* Freeze DEV Q on execution     */
-	CAM_HIGH_POWER		= 0x00004000,/* Command takes a lot of power  */
-	CAM_SENSE_PTR		= 0x00008000,/* Sense data is a pointer	      */
-	CAM_SENSE_PHYS		= 0x00010000,/* Sense pointer is physical addr*/
-	CAM_TAG_ACTION_VALID	= 0x00020000,/* Use the tag action in this ccb*/
-	CAM_PASS_ERR_RECOVER	= 0x00040000,/* Pass driver does err. recovery*/
-	CAM_DIS_DISCONNECT	= 0x00080000,/* Disable disconnect	      */
-	CAM_MSG_BUF_PHYS	= 0x00100000,/* Message buffer ptr is physical*/
-	CAM_SNS_BUF_PHYS	= 0x00200000,/* Autosense data ptr is physical*/
-
-
+	CAM_DATA_PADDR		= 0x00000010,/* Data type (001:Physical)      */
+	CAM_DATA_SG		= 0x00040000,/* Data type (010:sglist)        */
+	CAM_DATA_SG_PADDR	= 0x00040010,/* Data type (011:sglist phys)   */
+	CAM_DATA_BIO		= 0x00200000,/* Data type (100:bio)           */
+	CAM_DATA_MASK		= 0x00240010,/* Data type mask                */
+	CAM_SOFT_RST_OP		= 0x00000100,/* Use Soft reset alternative    */
+	CAM_ENG_SYNC		= 0x00000200,/* Flush resid bytes on complete */
+	CAM_DEV_QFRZDIS		= 0x00000400,/* Disable DEV Q freezing	      */
+	CAM_DEV_QFREEZE		= 0x00000800,/* Freeze DEV Q on execution     */
+	CAM_HIGH_POWER		= 0x00001000,/* Command takes a lot of power  */
+	CAM_SENSE_PTR		= 0x00002000,/* Sense data is a pointer	      */
+	CAM_SENSE_PHYS		= 0x00004000,/* Sense pointer is physical addr*/
+	CAM_TAG_ACTION_VALID	= 0x00008000,/* Use the tag action in this ccb*/
+	CAM_PASS_ERR_RECOVER	= 0x00010000,/* Pass driver does err. recovery*/
+	CAM_DIS_DISCONNECT	= 0x00020000,/* Disable disconnect	      */
+	CAM_MSG_BUF_PHYS	= 0x00080000,/* Message buffer ptr is physical*/
+	CAM_SNS_BUF_PHYS	= 0x00100000,/* Autosense data ptr is physical*/
 	CAM_CDB_PHYS		= 0x00400000,/* CDB poiner is physical	      */
 	CAM_ENG_SGLIST		= 0x00800000,/* SG list is for the HBA engine */