lkml.org 
[lkml]   [2008]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/7] isd200: WIN_* -> ATA_CMD_*
    Date
    * Use ATA_CMD_* defines instead of WIN_* ones.

    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/usb/storage/isd200.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    Index: b/drivers/usb/storage/isd200.c
    ===================================================================
    --- a/drivers/usb/storage/isd200.c
    +++ b/drivers/usb/storage/isd200.c
    @@ -501,14 +501,14 @@ static int isd200_action( struct us_data
    ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5;
    ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND;
    ata.write.DeviceHeadByte = info->DeviceHead;
    - ata.write.CommandByte = WIN_SRST;
    + ata.write.CommandByte = ATA_CMD_DEV_RESET;
    isd200_set_srb(info, DMA_NONE, NULL, 0);
    break;

    case ACTION_IDENTIFY:
    US_DEBUGP(" isd200_action(IDENTIFY)\n");
    ata.generic.RegisterSelect = REG_COMMAND;
    - ata.write.CommandByte = WIN_IDENTIFY;
    + ata.write.CommandByte = ATA_CMD_ID_ATA;
    isd200_set_srb(info, DMA_FROM_DEVICE, info->id,
    ATA_ID_WORDS * 2);
    break;
    @@ -1288,7 +1288,7 @@ static int isd200_scsi_to_ata(struct scs
    ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
    ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
    ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
    - ataCdb->write.CommandByte = WIN_READ;
    + ataCdb->write.CommandByte = ATA_CMD_PIO_READ;
    break;

    case WRITE_10:
    @@ -1320,7 +1320,7 @@ static int isd200_scsi_to_ata(struct scs
    ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
    ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
    ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
    - ataCdb->write.CommandByte = WIN_WRITE;
    + ataCdb->write.CommandByte = ATA_CMD_PIO_WRITE;
    break;

    case ALLOW_MEDIUM_REMOVAL:
    @@ -1334,7 +1334,7 @@ static int isd200_scsi_to_ata(struct scs
    ataCdb->generic.TransferBlockSize = 1;
    ataCdb->generic.RegisterSelect = REG_COMMAND;
    ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ?
    - WIN_DOORLOCK : WIN_DOORUNLOCK;
    + ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;
    isd200_srb_set_bufflen(srb, 0);
    } else {
    US_DEBUGP(" Not removeable media, just report okay\n");

    \
     
     \ /
      Last update: 2008-07-23 20:55    [W:0.029 / U:5.800 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site