diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-21 19:29:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-21 19:29:34 +0000 |
| commit | a205b96b9ba7c0105afa7f4a0a4e662c789aebe2 (patch) | |
| tree | 92650f2361cbbcf7dfe87db570e48ad032507ae5 | |
| parent | 2007-05-21 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-a205b96b9ba7c0105afa7f4a0a4e662c789aebe2.tar.bz2 | |
2007-05-21 Joel Sherrill <joel.sherrill@oarcorp.com>
* mpc6xx/clock/c_clock.c: Tinker with math so it does not overflow on
psim and give a negative nanoseconds since last tick.
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 457243cf66..99bbaa1fc7 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2007-05-21 Joel Sherrill <joel.sherrill@oarcorp.com> + + * mpc6xx/clock/c_clock.c: Tinker with math so it does not overflow on + psim and give a negative nanoseconds since last tick. + 2007-05-07 Ralf Corsépius <ralf.corsepius@rtems.org> * mpc8xx/clock/clock.c: Remove unused var extclk_value. diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c index caf5bc87af..708f2ccb1a 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c @@ -136,10 +136,14 @@ uint32_t Clock_driver_nanoseconds_since_last_tick(void) PPC_Get_decrementer( clicks ); - tmp = (Clock_Decrementer_value - clicks) * 1000000; + /* + * Multiply by 1000 here separately from below so we do not overflow + * and get a negative value. + */ + tmp = (Clock_Decrementer_value - clicks) * 1000; tmp /= (BSP_bus_frequency/BSP_time_base_divisor); - return tmp; + return tmp * 1000; } /* |