From e282cfaf5fdf7f4e5111c403b9f768637b85f021 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Wed, 11 Jul 2001 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2001-07-11 --- bitsy/fns.h | 1 + bitsy/mem.h | 1 - pc/clock.c | 12 ------------ port/portclock.c | 13 +++++++++++++ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bitsy/fns.h b/bitsy/fns.h index 019de497ebfa912d275890ea9e398bc172e662fe..9c9bada25eec2b74cf0661c5b477f030734d59af 100644 --- a/bitsy/fns.h +++ b/bitsy/fns.h @@ -101,6 +101,7 @@ int unsac(uchar*, uchar*, int, int); void vectors(void); void vtable(void); void wbflush(void); +ulong TK2MS(ulong); /* ticks to milliseconds */ #define KADDR(a) (void*)mmu_kaddr((ulong)(a)) #define PADDR(a) mmu_paddr((ulong)(a)) diff --git a/bitsy/mem.h b/bitsy/mem.h index cebb68746e8e15b510ebee2bd84de6893b9e311b..3a47ade0f9caa4857f670c438c8957ce275b58f8 100644 --- a/bitsy/mem.h +++ b/bitsy/mem.h @@ -24,7 +24,6 @@ #define HZ (20) /* clock frequency */ #define MS2HZ (1000/HZ) /* millisec per clock tick */ #define TK2SEC(t) ((t)/HZ) /* ticks to seconds */ -#define TK2MS(t) ((((ulong)(t))*1000)/HZ) /* ticks to milliseconds */ #define MS2TK(t) ((((ulong)(t))*HZ)/1000) /* milliseconds to ticks */ /* diff --git a/pc/clock.c b/pc/clock.c index f7266088aca71cc0b9a5a2fe9baf83924c893f90..f20e88087ffce6b99738a71775da545bd07f4f72 100644 --- a/pc/clock.c +++ b/pc/clock.c @@ -41,15 +41,3 @@ microdelay(int microsecs) aamloop(microsecs); } -ulong -TK2MS(ulong ticks) -{ - uvlong t, hz; - - t = ticks; - hz = HZ; - t *= 1000L; - t = t/hz; - ticks = t; - return ticks; -} diff --git a/port/portclock.c b/port/portclock.c index edc1917470ba0fa0aba72db21aae37dea74f34bb..c546fc0a83bbc27b920ea3f4da400394107e93e7 100644 --- a/port/portclock.c +++ b/port/portclock.c @@ -86,3 +86,16 @@ portclock(Ureg *ur) segclock(ur->pc); } } + +ulong +TK2MS(ulong ticks) +{ + uvlong t, hz; + + t = ticks; + hz = HZ; + t *= 1000L; + t = t/hz; + ticks = t; + return ticks; +}