diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:33:32 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:33:32 +0200 |
| commit | e58ade3a5c0df399f13dffb897ee9ddbc30d7302 (patch) | |
| tree | 5e6e1e7cd2b97e3ca9c4eed122327327d09dfda8 /cpu/microblaze/timer.c | |
| parent | 95df6f4ebaaa3972e312be1acf7650a18b84bf3d (diff) | |
| parent | 636400198228d96983c06657b17f760f5989958e (diff) | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/microblaze/timer.c')
| -rw-r--r-- | cpu/microblaze/timer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c index ab1cb12749..b350453443 100644 --- a/cpu/microblaze/timer.c +++ b/cpu/microblaze/timer.c @@ -33,10 +33,17 @@ void reset_timer (void) timestamp = 0; } +#ifdef CFG_TIMER_0 ulong get_timer (ulong base) { return (timestamp - base); } +#else +ulong get_timer (ulong base) +{ + return (timestamp++ - base); +} +#endif void set_timer (ulong t) { |