From: Thomas Veerman Date: Fri, 22 Feb 2013 13:56:25 +0000 (+0000) Subject: Remove unintentionally commited file X-Git-Tag: v3.3.0~1131 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=4de18d528bc976c2594c15a665b6caf459b704fe;p=minix.git Remove unintentionally commited file Change-Id: I2e0f66f5d8033e98c4e9e20d60773548af9e8c35 --- diff --git a/lib/libsys/arch/i386/frclock_util.c b/lib/libsys/arch/i386/frclock_util.c deleted file mode 100644 index 8d81e7857..000000000 --- a/lib/libsys/arch/i386/frclock_util.c +++ /dev/null @@ -1,89 +0,0 @@ -/* Some utility functions around the free running clock on ARM. The clock is - * 32-bits wide, but we provide 64-bit wrapper functions to make it look - * similar to the read_tsc functions. On hardware we could actually make use - * of the timer overflow counter, but emulator doesn't emulate it. */ - -#include "omap_timer_registers.h" -#include -#include -#include -#include -#include - - -static u64_t calib_hz = 1625000, Hz; -#define MICROHZ 1000000ULL /* number of micros per second */ -#define MICROSPERTICK(h) (MICROHZ/(h)) /* number of micros per HZ tick */ - -int -micro_delay(u32_t micros) -{ - u64_t start, delta, delta_end; - - Hz = sys_hz(); - - /* Start of delay. */ - start = read_frclock_64(); - delta_end = (calib_hz * micros) / MICROHZ; - - /* If we have to wait for at least one HZ tick, use the regular - * tickdelay first. Round downwards on purpose, so the average - * half-tick we wait short (depending on where in the current tick - * we call tickdelay). We can correct for both overhead of tickdelay - * itself and the short wait in the busywait later. - */ - if (micros >= MICROSPERTICK(Hz)) - tickdelay(micros*Hz/MICROHZ); - - /* Wait (the rest) of the delay time using busywait. */ - do { - delta = read_frclock_64(); - } while (delta_frclock_64(start, delta) < delta_end); - - - return 0; -} - -u32_t frclock_64_to_micros(u64_t tsc) -{ - return (u32_t) tsc / calib_hz; -} - -u32_t -read_frclock(void) -{ - extern struct minix_kerninfo *_minix_kerninfo; - volatile u32_t *frclock; - frclock = (u32_t *)((u8_t *) _minix_kerninfo->minix_frclock+OMAP3_TCRR); - return (u64_t) *frclock; -} - -u32_t -delta_frclock(u32_t base, u32_t cur) -{ - u32_t delta; - - if (cur < base) { - /* We have wrapped around, so delta is base to wrapping point - * plus starting point (0) to cur. This supports wrapping once - * only. */ - delta = (UINT_MAX - base) + cur; - } else { - delta = cur - base; - } - - return delta; -} - -u64_t -read_frclock_64(void) -{ - return (u64_t) read_frclock(); -} - -u64_t -delta_frclock_64(u64_t base, u64_t cur) -{ - return delta_frclock((u32_t) base, (u32_t) cur); -} -