Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67625119 authored Mar 31, 2009 by Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz Mar 31, 2009

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>

parent ecf3a31d

drivers/ide/at91_ide.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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 */		/* be sure we're looking at the low order bits */
	ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);		ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
	tf->feature = ide_mm_inb(io_ports->feature_addr);		tf->error = ide_mm_inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)		if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
	tf->nsect = ide_mm_inb(io_ports->nsect_addr);		tf->nsect = ide_mm_inb(io_ports->nsect_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)		if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
	@@ -260,8 +260,8 @@ static void at91_ide_tf_read(ide_drive_t drive, struct ide_cmd cmd)
	if (cmd->tf_flags & IDE_TFLAG_LBA48) {		if (cmd->tf_flags & IDE_TFLAG_LBA48) {
	ide_mm_outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);		ide_mm_outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
	tf->hob_feature = ide_mm_inb(io_ports->feature_addr);		tf->hob_error = ide_mm_inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)		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)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

drivers/ide/ide-h8300.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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 */		/* be sure we're looking at the low order bits */
	outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);		outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
	tf->feature = inb(io_ports->feature_addr);		tf->error = inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)		if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
	tf->nsect = inb(io_ports->nsect_addr);		tf->nsect = inb(io_ports->nsect_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)		if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
	@@ -116,8 +116,8 @@ static void h8300_tf_read(ide_drive_t drive, struct ide_cmd cmd)
	if (cmd->tf_flags & IDE_TFLAG_LBA48) {		if (cmd->tf_flags & IDE_TFLAG_LBA48) {
	outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);		outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
	tf->hob_feature = inb(io_ports->feature_addr);		tf->hob_error = inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)		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)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

drivers/ide/ide-io-std.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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 */		/* be sure we're looking at the low order bits */
	tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);		tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
	tf->feature = tf_inb(io_ports->feature_addr);		tf->error = tf_inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)		if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
	tf->nsect = tf_inb(io_ports->nsect_addr);		tf->nsect = tf_inb(io_ports->nsect_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)		if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
	@@ -175,8 +175,8 @@ void ide_tf_read(ide_drive_t drive, struct ide_cmd cmd)
	if (cmd->tf_flags & IDE_TFLAG_LBA48) {		if (cmd->tf_flags & IDE_TFLAG_LBA48) {
	tf_outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);		tf_outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
	tf->hob_feature = tf_inb(io_ports->feature_addr);		tf->hob_error = tf_inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)		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)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

drivers/ide/ide-iops.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,7 @@ u8 ide_read_error(ide_drive_t *drive)
	struct ide_cmd cmd;		struct ide_cmd cmd;

	memset(&cmd, 0, sizeof(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);		drive->hwif->tp_ops->tf_read(drive, &cmd);

drivers/ide/ns87415.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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 */		/* be sure we're looking at the low order bits */
	outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);		outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
	tf->feature = inb(io_ports->feature_addr);		tf->error = inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)		if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
	tf->nsect = inb(io_ports->nsect_addr);		tf->nsect = inb(io_ports->nsect_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)		if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
	@@ -92,8 +92,8 @@ static void superio_tf_read(ide_drive_t drive, struct ide_cmd cmd)
	if (cmd->tf_flags & IDE_TFLAG_LBA48) {		if (cmd->tf_flags & IDE_TFLAG_LBA48) {
	outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);		outb(ATA_HOB \| ATA_DEVCTL_OBS, io_ports->ctl_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
	tf->hob_feature = inb(io_ports->feature_addr);		tf->hob_error = inb(io_ports->feature_addr);
	if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)		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)		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)