diff options
| author | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-02-22 11:16:40 -0800 |
|---|---|---|
| committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-02-22 11:16:40 -0800 |
| commit | 63a25a56ccc93c24703fec87f830c833974e7060 (patch) | |
| tree | a0f12244a32eb7da2963ca974ab49a993aee2cfc /src/dev/arm/timer_sp804.cc | |
| parent | 8ea71c3907a411de9c203b45bfd6eab24e3ad849 (diff) | |
| parent | 77eed184f529c4ccbef59ad2018d18ff3fbb54af (diff) | |
| download | gem5-63a25a56ccc93c24703fec87f830c833974e7060.tar.xz | |
m5: merged in hammer fix
Diffstat (limited to 'src/dev/arm/timer_sp804.cc')
| -rw-r--r-- | src/dev/arm/timer_sp804.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc index 04668d268..e6d2657ea 100644 --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -178,11 +178,11 @@ Sp804::Timer::restartCounter(uint32_t val) if (!control.timerEnable) return; - Tick time = clock << power(16, control.timerPrescale); + Tick time = clock * power(16, control.timerPrescale); if (control.timerSize) - time *= bits(val,15,0); - else time *= val; + else + time *= bits(val,15,0); if (zeroEvent.scheduled()) { DPRINTF(Timer, "-- Event was already schedule, de-scheduling\n"); |