From c7e38e413ae69120d3e51f132c7cb1d6b3514d03 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Thu, 5 Jun 2008 22:28:59 +0900 Subject: [PATCH] [MIPS] lib_mips/time.c: Replace CP0 access functions with existing macros We already have many pre-defined CP0 access macros in . This patch replaces mips_{compare,count}_set and mips_count_get with existing macros. Signed-off-by: Shinya Kuribayashi --- lib_mips/time.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/lib_mips/time.c b/lib_mips/time.c index cd8dc721e2..2c696b709d 100644 --- a/lib_mips/time.c +++ b/lib_mips/time.c @@ -22,26 +22,7 @@ */ #include - - -static inline void mips_compare_set(u32 v) -{ - asm volatile ("mtc0 %0, $11" : : "r" (v)); -} - -static inline void mips_count_set(u32 v) -{ - asm volatile ("mtc0 %0, $9" : : "r" (v)); -} - - -static inline u32 mips_count_get(void) -{ - u32 count; - - asm volatile ("mfc0 %0, $9" : "=r" (count) :); - return count; -} +#include /* * timer without interrupts @@ -49,25 +30,25 @@ static inline u32 mips_count_get(void) int timer_init(void) { - mips_compare_set(0); - mips_count_set(0); + write_c0_compare(0); + write_c0_count(0); return 0; } void reset_timer(void) { - mips_count_set(0); + write_c0_count(0); } ulong get_timer(ulong base) { - return mips_count_get() - base; + return read_c0_count() - base; } void set_timer(ulong t) { - mips_count_set(t); + write_c0_count(t); } void udelay (unsigned long usec) @@ -76,7 +57,7 @@ void udelay (unsigned long usec) ulong start = get_timer(0); tmo = usec * (CFG_HZ / 1000000); - while ((ulong)((mips_count_get() - start)) < tmo) + while ((ulong)((read_c0_count() - start)) < tmo) /*NOP*/; } @@ -86,7 +67,7 @@ void udelay (unsigned long usec) */ unsigned long long get_ticks(void) { - return mips_count_get(); + return read_c0_count(); } /* -- 2.39.5