ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
The feature register has never been readable -- when its location is read, one gets the error register value; hence rename IDE_TFLAG_IN_[HOB_]FEATURE into IDE_TFLAG_IN_[HOB_]ERROR and introduce the 'hob_error' field into the 'struct ide_taskfile' (despite the error register not really depending on the HOB bit). Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:

کامیت شده توسط
Bartlomiej Zolnierkiewicz

والد
ecf3a31d2a
کامیت
6762511934
@@ -244,8 +244,8 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = ide_mm_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = ide_mm_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = ide_mm_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -260,16 +260,16 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
ide_mm_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature = ide_mm_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = ide_mm_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = ide_mm_inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = ide_mm_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = ide_mm_inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = ide_mm_inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = ide_mm_inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = ide_mm_inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = ide_mm_inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = ide_mm_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -100,8 +100,8 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -116,16 +116,16 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -159,8 +159,8 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = tf_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = tf_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = tf_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -175,16 +175,16 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature = tf_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = tf_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = tf_inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = tf_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = tf_inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = tf_inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = tf_inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = tf_inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = tf_inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = tf_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ide_tf_read);
|
||||
|
@@ -55,7 +55,7 @@ u8 ide_read_error(ide_drive_t *drive)
|
||||
struct ide_cmd cmd;
|
||||
|
||||
memset(&cmd, 0, sizeof(cmd));
|
||||
cmd.tf_flags = IDE_TFLAG_IN_FEATURE;
|
||||
cmd.tf_flags = IDE_TFLAG_IN_ERROR;
|
||||
|
||||
drive->hwif->tp_ops->tf_read(drive, &cmd);
|
||||
|
||||
|
@@ -76,8 +76,8 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -92,16 +92,16 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -702,8 +702,8 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = scc_ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = scc_ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = scc_ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -718,16 +718,16 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature = scc_ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = scc_ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = scc_ide_inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = scc_ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = scc_ide_inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = scc_ide_inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = scc_ide_inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = scc_ide_inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = scc_ide_inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = scc_ide_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -144,8 +144,8 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = tx4938ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = tx4938ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = tx4938ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -160,17 +160,16 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature =
|
||||
tx4938ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = tx4938ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = tx4938ide_inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = tx4938ide_inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = tx4938ide_inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = tx4938ide_inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = tx4938ide_inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = tx4938ide_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -511,8 +511,8 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
/* be sure we're looking at the low order bits */
|
||||
tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = tx4939ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
|
||||
tf->error = tx4939ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = tx4939ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
@@ -527,17 +527,16 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature =
|
||||
tx4939ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
|
||||
tf->hob_error = tx4939ide_inb(io_ports->feature_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr);
|
||||
tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = tx4939ide_inb(io_ports->lbal_addr);
|
||||
tf->hob_lbal = tx4939ide_inb(io_ports->lbal_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = tx4939ide_inb(io_ports->lbam_addr);
|
||||
tf->hob_lbam = tx4939ide_inb(io_ports->lbam_addr);
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = tx4939ide_inb(io_ports->lbah_addr);
|
||||
tf->hob_lbah = tx4939ide_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
مرجع در شماره جدید
Block a user