Commit 8f71bb82 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe

cciss: get rid of message related magic numbers

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent e363e014
...@@ -2569,7 +2569,7 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff, ...@@ -2569,7 +2569,7 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
} }
} else if (cmd_type == TYPE_MSG) { } else if (cmd_type == TYPE_MSG) {
switch (cmd) { switch (cmd) {
case 0: /* ABORT message */ case CCISS_ABORT_MSG:
c->Request.CDBLen = 12; c->Request.CDBLen = 12;
c->Request.Type.Attribute = ATTR_SIMPLE; c->Request.Type.Attribute = ATTR_SIMPLE;
c->Request.Type.Direction = XFER_WRITE; c->Request.Type.Direction = XFER_WRITE;
...@@ -2579,16 +2579,16 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff, ...@@ -2579,16 +2579,16 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
/* buff contains the tag of the command to abort */ /* buff contains the tag of the command to abort */
memcpy(&c->Request.CDB[4], buff, 8); memcpy(&c->Request.CDB[4], buff, 8);
break; break;
case 1: /* RESET message */ case CCISS_RESET_MSG:
c->Request.CDBLen = 16; c->Request.CDBLen = 16;
c->Request.Type.Attribute = ATTR_SIMPLE; c->Request.Type.Attribute = ATTR_SIMPLE;
c->Request.Type.Direction = XFER_NONE; c->Request.Type.Direction = XFER_NONE;
c->Request.Timeout = 0; c->Request.Timeout = 0;
memset(&c->Request.CDB[0], 0, sizeof(c->Request.CDB)); memset(&c->Request.CDB[0], 0, sizeof(c->Request.CDB));
c->Request.CDB[0] = cmd; /* reset */ c->Request.CDB[0] = cmd; /* reset */
c->Request.CDB[1] = 0x03; /* reset a target */ c->Request.CDB[1] = CCISS_RESET_TYPE_TARGET;
break; break;
case 3: /* No-Op message */ case CCISS_NOOP_MSG:
c->Request.CDBLen = 1; c->Request.CDBLen = 1;
c->Request.Type.Attribute = ATTR_SIMPLE; c->Request.Type.Attribute = ATTR_SIMPLE;
c->Request.Type.Direction = XFER_WRITE; c->Request.Type.Direction = XFER_WRITE;
......
...@@ -142,6 +142,14 @@ typedef struct _ReadCapdata_struct_16 ...@@ -142,6 +142,14 @@ typedef struct _ReadCapdata_struct_16
#define BMIC_CACHE_FLUSH 0xc2 #define BMIC_CACHE_FLUSH 0xc2
#define CCISS_CACHE_FLUSH 0x01 /* C2 was already being used by CCISS */ #define CCISS_CACHE_FLUSH 0x01 /* C2 was already being used by CCISS */
#define CCISS_ABORT_MSG 0x00
#define CCISS_RESET_MSG 0x01
#define CCISS_RESET_TYPE_CONTROLLER 0x00
#define CCISS_RESET_TYPE_BUS 0x01
#define CCISS_RESET_TYPE_TARGET 0x03
#define CCISS_RESET_TYPE_LUN 0x04
#define CCISS_NOOP_MSG 0x03
/* Command List Structure */ /* Command List Structure */
#define CTLR_LUNID "\0\0\0\0\0\0\0\0" #define CTLR_LUNID "\0\0\0\0\0\0\0\0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment