ide: WIN_* -> ATA_CMD_*
* Use ATA_CMD_* defines instead of WIN_* ones. While at it: * EXABYTE_ENABLE_NEXT -> ATA_EXABYTE_ENABLE_NEST * SETFEATURES_{EN,DIS}_WCACHE -> SETFEATURES_WC_{ON,OFF} * SETFEATURES_{EN,DIS}_AAM -> SETFEATURES_AAM_{ON,OFF} * SMART_* -> ATA_SMART_* * Remove stale comment from ide-proc.c. Partially based on earlier work by Chris Wedgwood. Acked-by: Chris Wedgwood <cw@f00f.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Este cometimento está contido em:
@@ -188,13 +188,13 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
|
||||
return ide_stopped;
|
||||
}
|
||||
if (ide_id_has_flush_cache_ext(drive->id))
|
||||
args->tf.command = WIN_FLUSH_CACHE_EXT;
|
||||
args->tf.command = ATA_CMD_FLUSH_EXT;
|
||||
else
|
||||
args->tf.command = WIN_FLUSH_CACHE;
|
||||
args->tf.command = ATA_CMD_FLUSH;
|
||||
goto out_do_tf;
|
||||
|
||||
case idedisk_pm_standby: /* Suspend step 2 (standby) */
|
||||
args->tf.command = WIN_STANDBYNOW1;
|
||||
args->tf.command = ATA_CMD_STANDBYNOW1;
|
||||
goto out_do_tf;
|
||||
|
||||
case idedisk_pm_restore_pio: /* Resume step 1 (restore PIO) */
|
||||
@@ -209,7 +209,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
|
||||
return ide_stopped;
|
||||
|
||||
case idedisk_pm_idle: /* Resume step 2 (idle) */
|
||||
args->tf.command = WIN_IDLEIMMEDIATE;
|
||||
args->tf.command = ATA_CMD_IDLEIMMEDIATE;
|
||||
goto out_do_tf;
|
||||
|
||||
case ide_pm_restore_dma: /* Resume step 3 (restore DMA) */
|
||||
@@ -380,8 +380,8 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
|
||||
/* err has different meaning on cdrom and tape */
|
||||
if (err == ABRT_ERR) {
|
||||
if (drive->select.b.lba &&
|
||||
/* some newer drives don't support WIN_SPECIFY */
|
||||
hwif->tp_ops->read_status(hwif) == WIN_SPECIFY)
|
||||
/* some newer drives don't support ATA_CMD_INIT_DEV_PARAMS */
|
||||
hwif->tp_ops->read_status(hwif) == ATA_CMD_INIT_DEV_PARAMS)
|
||||
return ide_stopped;
|
||||
} else if ((err & BAD_CRC) == BAD_CRC) {
|
||||
/* UDMA crc error, just retry the operation */
|
||||
@@ -436,7 +436,7 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u
|
||||
|
||||
if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
|
||||
/* force an abort */
|
||||
hwif->tp_ops->exec_command(hwif, WIN_IDLEIMMEDIATE);
|
||||
hwif->tp_ops->exec_command(hwif, ATA_CMD_IDLEIMMEDIATE);
|
||||
|
||||
if (rq->errors >= ERROR_MAX) {
|
||||
ide_kill_rq(drive, rq);
|
||||
@@ -509,19 +509,19 @@ static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
|
||||
tf->lbam = drive->cyl;
|
||||
tf->lbah = drive->cyl >> 8;
|
||||
tf->device = ((drive->head - 1) | drive->select.all) & ~ATA_LBA;
|
||||
tf->command = WIN_SPECIFY;
|
||||
tf->command = ATA_CMD_INIT_DEV_PARAMS;
|
||||
}
|
||||
|
||||
static void ide_tf_set_restore_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
|
||||
{
|
||||
tf->nsect = drive->sect;
|
||||
tf->command = WIN_RESTORE;
|
||||
tf->command = ATA_CMD_RESTORE;
|
||||
}
|
||||
|
||||
static void ide_tf_set_setmult_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
|
||||
{
|
||||
tf->nsect = drive->mult_req;
|
||||
tf->command = WIN_SETMULT;
|
||||
tf->command = ATA_CMD_SET_MULTI;
|
||||
}
|
||||
|
||||
static ide_startstop_t ide_disk_special(ide_drive_t *drive)
|
||||
@@ -584,9 +584,10 @@ static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)
|
||||
* do_special - issue some special commands
|
||||
* @drive: drive the command is for
|
||||
*
|
||||
* do_special() is used to issue WIN_SPECIFY, WIN_RESTORE, and WIN_SETMULT
|
||||
* commands to a drive. It used to do much more, but has been scaled
|
||||
* back.
|
||||
* do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,
|
||||
* ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.
|
||||
*
|
||||
* It used to do much more, but has been scaled back.
|
||||
*/
|
||||
|
||||
static ide_startstop_t do_special (ide_drive_t *drive)
|
||||
|
Criar uma nova questão referindo esta
Bloquear um utilizador