Module Name: src Committed By: mlelstv Date: Sun Oct 30 23:35:10 UTC 2016
Modified Files: src/sys/dev/ic: aic7xxx_cam.h Log Message: CAM status values are used as xs_status and must be mapped to XS values. Add the missing mapping for CAM_CMD_TIMEOUT. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/aic7xxx_cam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/aic7xxx_cam.h diff -u src/sys/dev/ic/aic7xxx_cam.h:1.4 src/sys/dev/ic/aic7xxx_cam.h:1.5 --- src/sys/dev/ic/aic7xxx_cam.h:1.4 Tue Mar 14 15:24:30 2006 +++ src/sys/dev/ic/aic7xxx_cam.h Sun Oct 30 23:35:10 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx_cam.h,v 1.4 2006/03/14 15:24:30 tsutsui Exp $ */ +/* $NetBSD: aic7xxx_cam.h,v 1.5 2016/10/30 23:35:10 mlelstv Exp $ */ /* * Data structures and definitions for the CAM system. @@ -71,7 +71,7 @@ typedef enum { CAM_REQ_INVALID = XS_DRIVER_STUFFUP, /* CCB request was invalid */ CAM_PATH_INVALID, /* Supplied Path ID is invalid */ CAM_SEL_TIMEOUT = XS_SELTIMEOUT, /* Target Selection Timeout */ - CAM_CMD_TIMEOUT, /* Command timeout */ + CAM_CMD_TIMEOUT = XS_TIMEOUT, /* Command timeout */ CAM_SCSI_STATUS_ERROR, /* SCSI error, look at error code in CCB */ CAM_SCSI_BUS_RESET = XS_RESET, /* SCSI Bus Reset Sent/Received */ CAM_UNCOR_PARITY = XS_DRIVER_STUFFUP, /* Uncorrectable parity error occurred */