diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-04-07 16:34:02 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-04-07 16:34:02 -0400 |
| commit | dcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (patch) | |
| tree | fee54c1dcea007dc2e1256b8b56e87d812c5fd3d /dev/ns_gige.cc | |
| parent | d261ee86c461a5feaefb432a54d56e2a393f4081 (diff) | |
| parent | 9f2568f966a0ce36bfd7b3114aac1fcf419566c4 (diff) | |
| download | gem5-dcedd7866e35adc1e0fbc081188b259ffc7bbdf5.tar.xz | |
Hand merge
base/traceflags.py:
Include new flags
--HG--
extra : convert_revision : 8017cbe256860dce8b1efc1b4e1e81e883895b90
Diffstat (limited to 'dev/ns_gige.cc')
| -rw-r--r-- | dev/ns_gige.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc index 53a881ef7..bc3103540 100644 --- a/dev/ns_gige.cc +++ b/dev/ns_gige.cc @@ -138,7 +138,7 @@ NSGigE::NSGigE(Params *p) } - intrDelay = US2Ticks(p->intr_delay); + intrDelay = p->intr_delay * Clock::Int::us; dmaReadDelay = p->dma_read_delay; dmaWriteDelay = p->dma_write_delay; dmaReadFactor = p->dma_read_factor; |