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:

committed by
Bartlomiej Zolnierkiewicz

父節點
ecf3a31d2a
當前提交
6762511934
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user