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

Commit 8a97206e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-pmac: convert to use ide_timing_find_mode() 



Also update my Copyrights while at it.

There should be no functional changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b96f7384

drivers/ide/ppc/pmac.c

+6 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * for doing DMA.

 *

 *  Copyright (C) 1998-2003 Paul Mackerras & Ben. Herrenschmidt

 *  Copyright (C)      2007 Bartlomiej Zolnierkiewicz

 *  Copyright (C) 2007-2008 Bartlomiej Zolnierkiewicz

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License
@@ -493,6 +493,7 @@ static void pmac_outbsync(ide_hwif_t *hwif, u8 value, unsigned long port) 
static void

pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	struct ide_timing *tim = ide_timing_find_mode(XFER_PIO_0 + pio);

	u32 *timings, t;

	unsigned accessTicks, recTicks;

	unsigned accessTime, recTime;
@@ -524,10 +525,9 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) 
		}

	case controller_kl_ata4:

		/* 66Mhz cell */

		recTime = cycle_time - ide_pio_timings[pio].active_time

				- ide_pio_timings[pio].setup_time;

		recTime = cycle_time - tim->active - tim->setup;

		recTime = max(recTime, 150U);

		accessTime = ide_pio_timings[pio].active_time;

		accessTime = tim->active;

		accessTime = max(accessTime, 150U);

		accessTicks = SYSCLK_TICKS_66(accessTime);

		accessTicks = min(accessTicks, 0x1fU);
@@ -540,10 +540,9 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	default: {

		/* 33Mhz cell */

		int ebit = 0;

		recTime = cycle_time - ide_pio_timings[pio].active_time

				- ide_pio_timings[pio].setup_time;

		recTime = cycle_time - tim->active - tim->setup;

		recTime = max(recTime, 150U);

		accessTime = ide_pio_timings[pio].active_time;

		accessTime = tim->active;

		accessTime = max(accessTime, 150U);

		accessTicks = SYSCLK_TICKS(accessTime);

		accessTicks = min(accessTicks, 0x1fU);