2c2
< * Copyright (c) 2010 ARM Limited
---
> * Copyright (c) 2010-2012 ARM Limited
66a67
> pixelClock(p->pixel_clock),
443c444
< startTime = curCycle();
---
> startTime = curTick();
449,450d449
< dmaPendingNum = 0;
<
478c477
< Cycles maxFrameTime(lcdTiming2.cpl * height);
---
> DPRINTF(PL111, "DMA Done\n");
479a479,480
> Tick maxFrameTime = lcdTiming2.cpl * height * pixelClock;
>
483,484c484,485
< if ((curCycle() - startTime) > maxFrameTime) {
< warn("CLCD controller buffer underrun, took %d cycles when should"
---
> if ((curTick() - startTime) > maxFrameTime) {
> warn("CLCD controller buffer underrun, took %d ticks when should"
503,504c504
< // argument into a relative number of cycles in the future by
< // subtracting curCycle()
---
> // argument into a relative number of cycles in the future
506,510c506,508
< // @todo: This is a terrible way of doing the time
< // keeping, make it all relative
< schedule(readEvent,
< clockEdge(Cycles(startTime - curCycle() +
< maxFrameTime)));
---
> schedule(readEvent, clockEdge(ticksToCycles(startTime -
> curTick() +
> maxFrameTime)));