diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-28 15:41:22 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-28 15:41:22 -0400 |
| commit | ca8a659394e96a0a0c11693cbaae59e6b027795a (patch) | |
| tree | 79f9509a48359bbc870ae34ce8b6e2fc6bc027de /dev/ide_ctrl.cc | |
| parent | 7bb70e3e30f30c669e475c47b950f0abd24367d0 (diff) | |
| parent | b43d1a00fb69015c751fba57d22a6fa94a292f04 (diff) | |
| download | gem5-ca8a659394e96a0a0c11693cbaae59e6b027795a.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : d6f7c4dd146613eeba39249f2d916a77108bc8c1
Diffstat (limited to 'dev/ide_ctrl.cc')
| -rw-r--r-- | dev/ide_ctrl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc index 638be9c3d..abdbe5d0a 100644 --- a/dev/ide_ctrl.cc +++ b/dev/ide_ctrl.cc @@ -430,7 +430,7 @@ IdeController::read(Packet &pkt) IdeRegType reg_type; int disk; - pkt.time = curTick + pioDelay; + pkt.time += pioDelay; pkt.allocate(); if (pkt.size != 1 && pkt.size != 2 && pkt.size !=4) panic("Bad IDE read size: %d\n", pkt.size); @@ -518,7 +518,7 @@ IdeController::write(Packet &pkt) int disk; uint8_t oldVal, newVal; - pkt.time = curTick + pioDelay; + pkt.time += pioDelay; parseAddr(pkt.addr, offset, channel, reg_type); |