aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/tmscsim.h
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2007-06-17 14:32:27 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-06-19 22:52:18 -0400
commit4a904a65fab83bcdd6b00470ac6c4aa80518e6a9 (patch)
tree16ebdbe481fc16bd495882ef8f5ff23db2ec6b05 /drivers/scsi/tmscsim.h
parent462b7859a07c9c2b060fa2b5b1d49f8b33706d4e (diff)
[SCSI] tmscsim: clean-up status codes
Remove redundant defines from the header, replace all occurances in the code with standard SAM_STAT_ macros. Also fix what seems to be a typo in testing for (status == H_OVER_UNDER_RUN)... Signed-off-by: G. Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/tmscsim.h')
-rw-r--r--drivers/scsi/tmscsim.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h
index c3d8c80cfb38..c74c72aadb08 100644
--- a/drivers/scsi/tmscsim.h
+++ b/drivers/scsi/tmscsim.h
@@ -258,13 +258,6 @@ struct dc390_srb SRB_array[MAX_SRB_CNT]; /* 50 SRBs */
258#define H_BAD_CCB_OR_SG 0x1A 258#define H_BAD_CCB_OR_SG 0x1A
259#define H_ABORT 0x0FF 259#define H_ABORT 0x0FF
260 260
261/*; SCSI Status byte codes*/
262/* The values defined in include/scsi/scsi.h, to be shifted << 1 */
263
264#define SCSI_STAT_UNEXP_BUS_F 0xFD /*; Unexpect Bus Free */
265#define SCSI_STAT_BUS_RST_DETECT 0xFE /*; Scsi Bus Reset detected */
266#define SCSI_STAT_SEL_TIMEOUT 0xFF /*; Selection Time out */
267
268/* cmd->result */ 261/* cmd->result */
269#define RES_TARGET 0x000000FF /* Target State */ 262#define RES_TARGET 0x000000FF /* Target State */
270#define RES_TARGET_LNX STATUS_MASK /* Only official ... */ 263#define RES_TARGET_LNX STATUS_MASK /* Only official ... */
@@ -273,7 +266,7 @@ struct dc390_srb SRB_array[MAX_SRB_CNT]; /* 50 SRBs */
273#define RES_DRV 0xFF000000 /* DRIVER_ codes */ 266#define RES_DRV 0xFF000000 /* DRIVER_ codes */
274 267
275#define MK_RES(drv,did,msg,tgt) ((int)(drv)<<24 | (int)(did)<<16 | (int)(msg)<<8 | (int)(tgt)) 268#define MK_RES(drv,did,msg,tgt) ((int)(drv)<<24 | (int)(did)<<16 | (int)(msg)<<8 | (int)(tgt))
276#define MK_RES_LNX(drv,did,msg,tgt) ((int)(drv)<<24 | (int)(did)<<16 | (int)(msg)<<8 | (int)(tgt)<<1) 269#define MK_RES_LNX(drv,did,msg,tgt) ((int)(drv)<<24 | (int)(did)<<16 | (int)(msg)<<8 | (int)(tgt))
277 270
278#define SET_RES_TARGET(who, tgt) do { who &= ~RES_TARGET; who |= (int)(tgt); } while (0) 271#define SET_RES_TARGET(who, tgt) do { who &= ~RES_TARGET; who |= (int)(tgt); } while (0)
279#define SET_RES_TARGET_LNX(who, tgt) do { who &= ~RES_TARGET_LNX; who |= (int)(tgt) << 1; } while (0) 272#define SET_RES_TARGET_LNX(who, tgt) do { who &= ~RES_TARGET_LNX; who |= (int)(tgt) << 1; } while (0)