diff options
Diffstat (limited to 'src/dev')
-rw-r--r-- | src/dev/arm/pl111.cc | 16 | ||||
-rw-r--r-- | src/dev/i8254xGBe.cc | 4 | ||||
-rw-r--r-- | src/dev/ns_gige.cc | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc index d79a1cf39..7990e02ed 100644 --- a/src/dev/arm/pl111.cc +++ b/src/dev/arm/pl111.cc @@ -440,7 +440,7 @@ Pl111::readFramebuffer() schedule(intEvent, nextCycle()); curAddr = 0; - startTime = curTick(); + startTime = curCycle(); maxAddr = static_cast<Addr>(length * bytesPerPixel); @@ -475,12 +475,12 @@ Pl111::fillFifo() void Pl111::dmaDone() { - Tick maxFrameTime = lcdTiming2.cpl * height * clock; + Tick maxFrameTime = lcdTiming2.cpl * height; --dmaPendingNum; if (maxAddr == curAddr && !dmaPendingNum) { - if ((curTick() - startTime) > maxFrameTime) { + if ((curCycle() - startTime) > maxFrameTime) { warn("CLCD controller buffer underrun, took %d cycles when should" " have taken %d\n", curTick() - startTime, maxFrameTime); lcdRis.underflow = 1; @@ -498,11 +498,13 @@ Pl111::dmaDone() pic->seekp(0); bmp->write(pic); - DPRINTF(PL111, "-- schedule next dma read event at %d tick \n", - maxFrameTime + curTick()); - + // schedule the next read based on when the last frame started + // and the desired fps (i.e. maxFrameTime), we turn the + // argument into a relative number of cycles in the future by + // subtracting curCycle() if (lcdControl.lcden) - schedule(readEvent, nextCycle(startTime + maxFrameTime)); + schedule(readEvent, clockEdge(startTime + maxFrameTime - + curCycle())); } if (dmaPendingNum > (maxOutstandingDma - waterMark)) diff --git a/src/dev/i8254xGBe.cc b/src/dev/i8254xGBe.cc index f7f6a1178..3ba140bce 100644 --- a/src/dev/i8254xGBe.cc +++ b/src/dev/i8254xGBe.cc @@ -2052,7 +2052,7 @@ IGbE::restartClock() { if (!tickEvent.scheduled() && (rxTick || txTick || txFifoTick) && getState() == SimObject::Running) - schedule(tickEvent, (curTick() / ticks(1)) * ticks(1) + ticks(1)); + schedule(tickEvent, clockEdge(1)); } unsigned int @@ -2434,7 +2434,7 @@ IGbE::tick() if (rxTick || txTick || txFifoTick) - schedule(tickEvent, curTick() + ticks(1)); + schedule(tickEvent, curTick() + clockPeriod()); } void diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc index 6a55516c5..583cdb140 100644 --- a/src/dev/ns_gige.cc +++ b/src/dev/ns_gige.cc @@ -1147,7 +1147,7 @@ NSGigE::rxKick() } // Go to the next state machine clock tick. - rxKickTick = curTick() + ticks(1); + rxKickTick = curTick() + clockPeriod(); } switch(rxDmaState) { @@ -1594,7 +1594,7 @@ NSGigE::txKick() } // Go to the next state machine clock tick. - txKickTick = curTick() + ticks(1); + txKickTick = curTick() + clockPeriod(); } switch(txDmaState) { @@ -2015,7 +2015,7 @@ NSGigE::transferDone() DPRINTF(Ethernet, "transfer complete: data in txFifo...schedule xmit\n"); - reschedule(txEvent, curTick() + ticks(1), true); + reschedule(txEvent, curTick() + clockPeriod(), true); } bool |