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

scc_pata: add ->tf_{load,read} methods 



Add ->tf_{load,read} methods so scc_ide_{outb,outw,inb,inw}()
can be used directly.

There should be no functional changes caused by this patch.

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

drivers/ide/pci/scc_pata.c

+87 −0
Original line number Diff line number Diff line
@@ -618,6 +618,90 @@ static int __devinit init_setup_scc(struct pci_dev *dev, 
	return rc;

}



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

{

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

	struct ide_taskfile *tf = &task->tf;

	u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

		HIHI = 0xFF;



	ide_set_irq(drive, 1);



	if (task->tf_flags & IDE_TFLAG_OUT_DATA)

		scc_ide_outw((tf->hob_data << 8) | tf->data,

			     io_ports->data_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

		scc_ide_outb(tf->hob_feature, io_ports->feature_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

		scc_ide_outb(tf->hob_nsect, io_ports->nsect_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

		scc_ide_outb(tf->hob_lbal, io_ports->lbal_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

		scc_ide_outb(tf->hob_lbam, io_ports->lbam_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

		scc_ide_outb(tf->hob_lbah, io_ports->lbah_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)

		scc_ide_outb(tf->feature, io_ports->feature_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_NSECT)

		scc_ide_outb(tf->nsect, io_ports->nsect_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_LBAL)

		scc_ide_outb(tf->lbal, io_ports->lbal_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_LBAM)

		scc_ide_outb(tf->lbam, io_ports->lbam_addr);

	if (task->tf_flags & IDE_TFLAG_OUT_LBAH)

		scc_ide_outb(tf->lbah, io_ports->lbah_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)

		scc_ide_outb((tf->device & HIHI) | drive->select.all,

			     io_ports->device_addr);

}



static void scc_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 = scc_ide_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 */

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



	if (task->tf_flags & IDE_TFLAG_IN_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_IN_LBAH)

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

	if (task->tf_flags & IDE_TFLAG_IN_DEVICE)

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



	if (task->tf_flags & IDE_TFLAG_LBA48) {

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



		if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

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

		if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

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

	}

}



static void scc_input_data(ide_drive_t *drive, struct request *rq,

			   void *buf, unsigned int len)

{
@@ -664,6 +748,9 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) 


	ide_set_hwifdata(hwif, ports);



	hwif->tf_load = scc_tf_load;

	hwif->tf_read = scc_tf_read;



	hwif->input_data  = scc_input_data;

	hwif->output_data = scc_output_data;