lkml.org 
[lkml]   [2011]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 07/16] cciss: get rid of message related magic numbers
    From
    Date
    From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

    Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
    ---
    drivers/block/cciss.c | 8 ++++----
    drivers/block/cciss_cmd.h | 8 ++++++++
    2 files changed, 12 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index d604489..1a4dff0 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -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) {
    switch (cmd) {
    - case 0: /* ABORT message */
    + case CCISS_ABORT_MSG:
    c->Request.CDBLen = 12;
    c->Request.Type.Attribute = ATTR_SIMPLE;
    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,
    /* buff contains the tag of the command to abort */
    memcpy(&c->Request.CDB[4], buff, 8);
    break;
    - case 1: /* RESET message */
    + case CCISS_RESET_MSG:
    c->Request.CDBLen = 16;
    c->Request.Type.Attribute = ATTR_SIMPLE;
    c->Request.Type.Direction = XFER_NONE;
    c->Request.Timeout = 0;
    memset(&c->Request.CDB[0], 0, sizeof(c->Request.CDB));
    c->Request.CDB[0] = cmd; /* reset */
    - c->Request.CDB[1] = 0x03; /* reset a target */
    + c->Request.CDB[1] = CCISS_RESET_TYPE_TARGET;
    break;
    - case 3: /* No-Op message */
    + case CCISS_NOOP_MSG:
    c->Request.CDBLen = 1;
    c->Request.Type.Attribute = ATTR_SIMPLE;
    c->Request.Type.Direction = XFER_WRITE;
    diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h
    index a2e68d2..3b20c31 100644
    --- a/drivers/block/cciss_cmd.h
    +++ b/drivers/block/cciss_cmd.h
    @@ -142,6 +142,14 @@ typedef struct _ReadCapdata_struct_16
    #define BMIC_CACHE_FLUSH 0xc2
    #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 */
    #define CTLR_LUNID "\0\0\0\0\0\0\0\0"



    \
     
     \ /
      Last update: 2011-05-03 21:55    [W:0.031 / U:0.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site