diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2020-02-27 18:28:00 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-17 12:32:36 -0400 |
| commit | e6e9a4f0a9e74a079c10f7650c0386ee49e04e44 (patch) | |
| tree | 28030b76592bee02ec838f27ff3fba3eedbb6c74 /drivers/block/ide.c | |
| parent | fd0e30b43b6b2401e68dc32c357869c617d4fdd1 (diff) | |
| download | u-boot-e6e9a4f0a9e74a079c10f7650c0386ee49e04e44.zip u-boot-e6e9a4f0a9e74a079c10f7650c0386ee49e04e44.tar.gz u-boot-e6e9a4f0a9e74a079c10f7650c0386ee49e04e44.tar.bz2 | |
block: ide: use definitions from include/libata.h
Currently ATA commands are defined both in include/libata.h and
include/ata.h. Use the command definitions from include/libata.h where
applicable.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/block/ide.c')
| -rw-r--r-- | drivers/block/ide.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 4b8a4ea..67cc4fb 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -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 */ |