Commit ea23b8ba authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ns87415: add ->tf_read method 



Add ->tf_read method so out{b,w}(), in{b,w}() and superio_ide_inb()
can be used directly.

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent db2432c4

drivers/ide/pci/ns87415.c

+44 −0
Original line number Diff line number Diff line
@@ -63,6 +63,48 @@ static u8 superio_ide_inb (unsigned long port) 
	return inb(port);

}



static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)

{

	struct ide_io_ports *io_ports = &drive->hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

		u16 data = inw(io_ports->data_addr);



		tf->data = data & 0xff;

		tf->hob_data = (data >> 8) & 0xff;

	}



	/* be sure we're looking at the low order bits */

	outb(drive->ctl & ~0x80, io_ports->ctl_addr);



	if (task->tf_flags & IDE_TFLAG_IN_NSECT)

		tf->nsect  = inb(io_ports->nsect_addr);

	if (task->tf_flags & IDE_TFLAG_IN_LBAL)

		tf->lbal   = inb(io_ports->lbal_addr);

	if (task->tf_flags & IDE_TFLAG_IN_LBAM)

		tf->lbam   = inb(io_ports->lbam_addr);

	if (task->tf_flags & IDE_TFLAG_IN_LBAH)

		tf->lbah   = inb(io_ports->lbah_addr);

	if (task->tf_flags & IDE_TFLAG_IN_DEVICE)

		tf->device = superio_ide_inb(io_ports->device_addr);



	if (task->tf_flags & IDE_TFLAG_LBA48) {

		outb(drive->ctl | 0x80, io_ports->ctl_addr);



		if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = inb(io_ports->feature_addr);

		if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

			tf->hob_nsect   = inb(io_ports->nsect_addr);

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

			tf->hob_lbal    = inb(io_ports->lbal_addr);

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

			tf->hob_lbam    = inb(io_ports->lbam_addr);

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

			tf->hob_lbah    = inb(io_ports->lbah_addr);

	}

}



static void __devinit superio_ide_init_iops (struct hwif_s *hwif)

{

	struct pci_dev *pdev = to_pci_dev(hwif->dev);
@@ -80,6 +122,8 @@ static void __devinit superio_ide_init_iops (struct hwif_s *hwif) 
	tmp = superio_ide_inb(superio_ide_dma_status[port]);

	outb(tmp | 0x66, superio_ide_dma_status[port]);



	hwif->tf_read = superio_tf_read;



	/* We need to override inb to workaround a SuperIO errata */

	hwif->INB = superio_ide_inb;

}