diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-05-04 21:10:51 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-05-04 21:10:51 -0400 |
| commit | de8eba689164b59679a3e3ef3550bc7abb5ecdce (patch) | |
| tree | 357184f755ef18190b97547cf5bff888344066ba /dev/ide_ctrl.cc | |
| parent | 2e7e844768e160bf81be53d6b633f3851bb4ea80 (diff) | |
| parent | 8a9d270f6c17efa79f38e629c7cbcafa51aa8494 (diff) | |
| download | gem5-de8eba689164b59679a3e3ef3550bc7abb5ecdce.tar.xz | |
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision : c48a8857f5a520ff8061eb3d8f08dcd43661e68c
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); |