aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-01 15:42:24 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-01 15:42:24 -0400
commitf08f31f7c77b5537c099c2566b490eb8255f4c49 (patch)
tree9cd96f858aeef3ab9e5e4fdcb9d153a5d0072fb9 /drivers/usb
parent6fd5c665d8fe9da5f2081f0b3ca8054f0f730b1a (diff)
isd200: WIN_* -> ATA_CMD_*
* Use ATA_CMD_* defines instead of WIN_* ones. Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/storage/isd200.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 241eb35a15a0..38caed84c993 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -548,14 +548,14 @@ static int isd200_action( struct us_data *us, int action,
548 ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5; 548 ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5;
549 ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND; 549 ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND;
550 ata.write.DeviceHeadByte = info->DeviceHead; 550 ata.write.DeviceHeadByte = info->DeviceHead;
551 ata.write.CommandByte = WIN_SRST; 551 ata.write.CommandByte = ATA_CMD_DEV_RESET;
552 isd200_set_srb(info, DMA_NONE, NULL, 0); 552 isd200_set_srb(info, DMA_NONE, NULL, 0);
553 break; 553 break;
554 554
555 case ACTION_IDENTIFY: 555 case ACTION_IDENTIFY:
556 US_DEBUGP(" isd200_action(IDENTIFY)\n"); 556 US_DEBUGP(" isd200_action(IDENTIFY)\n");
557 ata.generic.RegisterSelect = REG_COMMAND; 557 ata.generic.RegisterSelect = REG_COMMAND;
558 ata.write.CommandByte = WIN_IDENTIFY; 558 ata.write.CommandByte = ATA_CMD_ID_ATA;
559 isd200_set_srb(info, DMA_FROM_DEVICE, info->id, 559 isd200_set_srb(info, DMA_FROM_DEVICE, info->id,
560 ATA_ID_WORDS * 2); 560 ATA_ID_WORDS * 2);
561 break; 561 break;
@@ -1335,7 +1335,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
1335 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8); 1335 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
1336 ataCdb->write.CylinderLowByte = (unsigned char)cylinder; 1336 ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
1337 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD); 1337 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
1338 ataCdb->write.CommandByte = WIN_READ; 1338 ataCdb->write.CommandByte = ATA_CMD_PIO_READ;
1339 break; 1339 break;
1340 1340
1341 case WRITE_10: 1341 case WRITE_10:
@@ -1367,7 +1367,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
1367 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8); 1367 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
1368 ataCdb->write.CylinderLowByte = (unsigned char)cylinder; 1368 ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
1369 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD); 1369 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
1370 ataCdb->write.CommandByte = WIN_WRITE; 1370 ataCdb->write.CommandByte = ATA_CMD_PIO_WRITE;
1371 break; 1371 break;
1372 1372
1373 case ALLOW_MEDIUM_REMOVAL: 1373 case ALLOW_MEDIUM_REMOVAL:
@@ -1381,7 +1381,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
1381 ataCdb->generic.TransferBlockSize = 1; 1381 ataCdb->generic.TransferBlockSize = 1;
1382 ataCdb->generic.RegisterSelect = REG_COMMAND; 1382 ataCdb->generic.RegisterSelect = REG_COMMAND;
1383 ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ? 1383 ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ?
1384 WIN_DOORLOCK : WIN_DOORUNLOCK; 1384 ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;
1385 isd200_srb_set_bufflen(srb, 0); 1385 isd200_srb_set_bufflen(srb, 0);
1386 } else { 1386 } else {
1387 US_DEBUGP(" Not removeable media, just report okay\n"); 1387 US_DEBUGP(" Not removeable media, just report okay\n");