|
@@ -231,7 +231,7 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
|
|
|
(unsigned char) ((buflen >> 8) & 0xFF));
|
|
|
ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
|
|
|
- ide_outb(device, ATA_COMMAND, ATAPI_CMD_PACKET);
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_PACKET);
|
|
|
udelay(50);
|
|
|
|
|
|
mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
@@ -570,7 +570,7 @@ static void ide_ident(struct blk_desc *dev_desc)
|
|
|
/*
|
|
|
* Start Ident Command
|
|
|
*/
|
|
|
- ide_outb(device, ATA_COMMAND, ATAPI_CMD_IDENT);
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATAPI);
|
|
|
/*
|
|
|
* Wait for completion - ATAPI devices need more time
|
|
|
* to become ready
|
|
@@ -582,7 +582,7 @@ static void ide_ident(struct blk_desc *dev_desc)
|
|
|
/*
|
|
|
* Start Ident Command
|
|
|
*/
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_IDENT);
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATA);
|
|
|
|
|
|
/*
|
|
|
* Wait for completion
|
|
@@ -966,7 +966,7 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
|
|
|
/* first check if the drive is in Powersaving mode, if yes,
|
|
|
* increase the timeout value */
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_PWR);
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_POWER);
|
|
|
udelay(50);
|
|
|
|
|
|
c = ide_wait(device, IDE_TIME_OUT); /* can't take over 500 ms */
|