Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a workaround for annoying

Browse Source 
"WARNING: negative runtime; monotonic clock has gone backwards"
message. Partially taken from hp300.
This commit is contained in:
tsutsui 2009-07-07 15:15:08 +00:00
parent e234b387dc
commit 77d3988d38
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/atari/dev/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.46 2009/03/18 10:22:24 cegger Exp $ */
/* $NetBSD: clock.c,v 1.47 2009/07/07 15:15:08 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.46 2009/03/18 10:22:24 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.47 2009/07/07 15:15:08 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -314,21 +314,29 @@ statintr(struct clockframe frame)
static u_int
clk_getcounter(struct timecounter *tc)
{
u_int delta;
u_char ipra, tadr;
int s, cur_hardclock;
uint32_t delta, count, cur_hardclock;
uint8_t ipra, tadr;
int s;
static uint32_t lastcount;
s = splhigh();
cur_hardclock = hardclock_ticks;
ipra = MFP->mf_ipra;
tadr = MFP->mf_tadr;
delta = divisor - tadr;
if (ipra & IA_TIMA)
delta += divisor;
cur_hardclock = hardclock_ticks;
splx(s);
return (divisor - tadr) + divisor * cur_hardclock;
count = (divisor * cur_hardclock) + delta;
if ((int32_t)(count - lastcount) < 0) {
/* XXX wrapped; maybe hardclock() is blocked more than 2/HZ */
count = lastcount + 1;
}
lastcount = count;
return count;
}
#define TIMB_FREQ 614400