diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-01-07 21:50:29 -0800 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-01-07 21:50:29 -0800 |
| commit | 6f1187943cf78c2fd0334bd7e4372ae79a587fa4 (patch) | |
| tree | 8d0eac2e2f4d55d48245266d3930ad4e7f92030f /src/dev/ide_disk.cc | |
| parent | c22be9f2f016872b05d65c82055ddc936b4aa075 (diff) | |
| download | gem5-6f1187943cf78c2fd0334bd7e4372ae79a587fa4.tar.xz | |
Replace curTick global variable with accessor functions.
This step makes it easy to replace the accessor functions
(which still access a global variable) with ones that access
per-thread curTick values.
Diffstat (limited to 'src/dev/ide_disk.cc')
| -rw-r--r-- | src/dev/ide_disk.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dev/ide_disk.cc b/src/dev/ide_disk.cc index fe93924f9..a30811d4e 100644 --- a/src/dev/ide_disk.cc +++ b/src/dev/ide_disk.cc @@ -323,7 +323,7 @@ IdeDisk::doDmaTransfer() dmaState, devState); if (ctrl->dmaPending() || ctrl->getState() != SimObject::Running) { - schedule(dmaTransferEvent, curTick + DMA_BACKOFF_PERIOD); + schedule(dmaTransferEvent, curTick() + DMA_BACKOFF_PERIOD); return; } else ctrl->dmaRead(curPrdAddr, sizeof(PrdEntry_t), &dmaPrdReadEvent, @@ -357,7 +357,7 @@ IdeDisk::doDmaDataRead() DPRINTF(IdeDisk, "doDmaRead, diskDelay: %d totalDiskDelay: %d\n", diskDelay, totalDiskDelay); - schedule(dmaReadWaitEvent, curTick + totalDiskDelay); + schedule(dmaReadWaitEvent, curTick() + totalDiskDelay); } void @@ -403,7 +403,7 @@ IdeDisk::doDmaRead() } if (ctrl->dmaPending() || ctrl->getState() != SimObject::Running) { - schedule(dmaReadWaitEvent, curTick + DMA_BACKOFF_PERIOD); + schedule(dmaReadWaitEvent, curTick() + DMA_BACKOFF_PERIOD); return; } else if (!dmaReadCG->done()) { assert(dmaReadCG->complete() < MAX_DMA_SIZE); @@ -465,7 +465,7 @@ IdeDisk::doDmaDataWrite() cmdBytesLeft -= SectorSize; } - schedule(dmaWriteWaitEvent, curTick + totalDiskDelay); + schedule(dmaWriteWaitEvent, curTick() + totalDiskDelay); } void @@ -478,7 +478,7 @@ IdeDisk::doDmaWrite() curPrd.getByteCount(), TheISA::PageBytes); } if (ctrl->dmaPending() || ctrl->getState() != SimObject::Running) { - schedule(dmaWriteWaitEvent, curTick + DMA_BACKOFF_PERIOD); + schedule(dmaWriteWaitEvent, curTick() + DMA_BACKOFF_PERIOD); return; } else if (!dmaWriteCG->done()) { assert(dmaWriteCG->complete() < MAX_DMA_SIZE); @@ -553,7 +553,7 @@ IdeDisk::startDma(const uint32_t &prdTableBase) dmaState = Dma_Transfer; // schedule dma transfer (doDmaTransfer) - schedule(dmaTransferEvent, curTick + 1); + schedule(dmaTransferEvent, curTick() + 1); } void |