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

Commit 92fcaaa8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-h8300: add ->tf_{load,read} methods 



Add ->tf_{load,read} methods so outb()/inb() and mm_outw()/mm_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 6dbceb8c

drivers/ide/h8300/ide-h8300.c

+88 −0
Original line number Diff line number Diff line
@@ -42,6 +42,91 @@ static u16 mm_inw(unsigned long a) 
	return r;

}



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

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &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)

		mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

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



	if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)

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

	if (task->tf_flags & IDE_TFLAG_OUT_NSECT)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAL)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAM)

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

	if (task->tf_flags & IDE_TFLAG_OUT_LBAH)

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



	if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)

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

		     io_ports->device_addr);

}



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

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;



	if (task->tf_flags & IDE_TFLAG_IN_DATA) {

		u16 data = mm_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 = 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 mm_outsw(unsigned long addr, void *buf, u32 len)

{

	unsigned short *bp = (unsigned short *)buf;
@@ -86,6 +171,9 @@ static inline void hwif_setup(ide_hwif_t *hwif) 
{

	default_hwif_iops(hwif);



	hwif->tf_load = h8300_tf_load;

	hwif->tf_read = h8300_tf_read;



	hwif->input_data  = h8300_input_data;

	hwif->output_data = h8300_output_data;