summaryrefslogtreecommitdiffstats
path: root/lib/time.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-15 04:38:33 -0600
committerTom Rini <trini@ti.com>2014-10-27 11:04:01 -0400
commit19ea4678ca5ce4c3a626039ed7642d4e0fbfdee1 (patch)
tree53e1cb6aee24f9b406766be6e32d3f56e9b6e4e0 /lib/time.c
parentaac618a32b89a3b753625cfa87aab815efd6f601 (diff)
downloadtalos-obmc-uboot-19ea4678ca5ce4c3a626039ed7642d4e0fbfdee1.tar.gz
talos-obmc-uboot-19ea4678ca5ce4c3a626039ed7642d4e0fbfdee1.zip
Use uint64_t for time types
Unfortunately 'unsigned long long' and 'uint64_t' are not necessarily compatible on 64-bit machines. Use the correct typedef instead of writing the supposed type out in full. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/time.c')
-rw-r--r--lib/time.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/time.c b/lib/time.c
index 5ebd1be48f..477440de16 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -37,7 +37,7 @@ unsigned long notrace timer_read_counter(void)
extern unsigned long __weak timer_read_counter(void);
#endif
-unsigned long long __weak notrace get_ticks(void)
+uint64_t __weak notrace get_ticks(void)
{
unsigned long now = timer_read_counter();
@@ -45,11 +45,11 @@ unsigned long long __weak notrace get_ticks(void)
if (now < gd->timebase_l)
gd->timebase_h++;
gd->timebase_l = now;
- return ((unsigned long long)gd->timebase_h << 32) | gd->timebase_l;
+ return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
}
/* Returns time in milliseconds */
-static unsigned long long notrace tick_to_time(unsigned long long tick)
+static uint64_t notrace tick_to_time(uint64_t tick)
{
ulong div = get_tbclk();
@@ -74,9 +74,9 @@ unsigned long __weak notrace timer_get_us(void)
return tick_to_time(get_ticks() * 1000);
}
-static unsigned long long usec_to_tick(unsigned long usec)
+static uint64_t usec_to_tick(unsigned long usec)
{
- unsigned long long tick = usec;
+ uint64_t tick = usec;
tick *= get_tbclk();
do_div(tick, 1000000);
return tick;
@@ -84,7 +84,7 @@ static unsigned long long usec_to_tick(unsigned long usec)
void __weak __udelay(unsigned long usec)
{
- unsigned long long tmp;
+ uint64_t tmp;
tmp = get_ticks() + usec_to_tick(usec); /* get current timestamp */
OpenPOWER on IntegriCloud