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

Convert prep to MI todr

Browse Source
This commit is contained in:
garbled 2006-09-05 06:32:21 +00:00
parent 14c9ea00e0
commit 38209f62b7
2 changed files with 4 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/prep/include/types.h
View File

@ -1,7 +1,8 @@
/* $NetBSD: types.h,v 1.8 2006/09/03 13:51:23 bjh21 Exp $ */
/* $NetBSD: types.h,v 1.9 2006/09/05 06:32:21 garbled Exp $ */
#define __HAVE_DEVICE_REGISTER
#define __HAVE_GENERIC_SOFT_INTERRUPTS
#define __HAVE_TIMECOUNTER
#define __HAVE_GENERIC_TODR
#include <powerpc/types.h>

103
sys/arch/prep/prep/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.17 2006/06/20 05:49:09 garbled Exp $ */
/* $NetBSD: clock.c,v 1.18 2006/09/05 06:32:22 garbled Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2006/06/20 05:49:09 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.18 2006/09/05 06:32:22 garbled Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -43,12 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2006/06/20 05:49:09 garbled Exp $");
#include <uvm/uvm_extern.h>
#include <dev/clock_subr.h>
#include <powerpc/spr.h>
#define MINYEAR 1990
void decr_intr(struct clockframe *);
void init_prep_tc(void);
static u_int get_prep_timecount(struct timecounter *);
@ -57,11 +53,6 @@ u_long ticks_per_sec;
u_long ns_per_tick;
static long ticks_per_intr;
struct device *clockdev;
const struct clockfns *clockfns;
static todr_chip_handle_t todr_handle;
static struct timecounter prep_timecounter = {
get_prep_timecount, /* get_timecount */
0, /* no poll_pps */
@ -71,16 +62,6 @@ static struct timecounter prep_timecounter = {
0 /* quality */
};
void
todr_attach(todr_chip_handle_t handle)
{
if (todr_handle)
panic("todr_attach: to many todclock configured");
todr_handle = handle;
}
/*
* Start the real-time and statistics clocks. Leave stathz 0 since there
* are no other timers available.
@ -100,86 +81,6 @@ cpu_initclocks(void)
init_prep_tc();
}
/*
* Initialize the time of day register, based on the time base which is, e.g.
* from a filesystem.
*/
void
inittodr(time_t base)
{
int badbase, waszero;
struct timeval time;
struct timespec ts;
badbase = 0;
waszero = (base == 0);
time.tv_sec = 0;
time.tv_usec = 0;
if (base < (MINYEAR - 1970) * SECYR) {
if (base != 0)
printf("WARNING: preposterous time in file system\n");
/* read the system clock anyway */
base = (MINYEAR - 1970) * SECYR + 186 * SECDAY + SECDAY / 2;
badbase = 1;
}
if (todr_gettime(todr_handle, &time) != 0 ||
time.tv_sec == 0) {
printf("WARNING: bad date in battery clock");
/*
* Believe the time in the file system for lack of
* anything better, resetting the clock.
*/
ts.tv_sec = base;
ts.tv_nsec = 0;
tc_setclock(&ts);
if (!badbase)
resettodr();
} else {
/*
* See if we gained/lost two or more days;
* if so, assume something is amiss.
*/
int deltat = time.tv_sec - base;
ts.tv_sec = time.tv_sec;
ts.tv_nsec = time.tv_usec * 1000;
tc_setclock(&ts);
if (deltat < 0)
deltat = -deltat;
if (waszero || deltat < 2 * SECDAY)
return;
printf("WARNING: clock %s %d days",
time.tv_sec < base ? "lost" : "gained", deltat / SECDAY);
}
printf(" -- CHECK AND RESET THE DATE!\n");
}
/*
* Reset the TODR based on the time value; used when the TODR
* has a preposterous value and also when the time is reset
* by the stime system call. Also called when the TODR goes past
* TODRZERO + 100*(SECYEAR+2*SECDAY) (e.g. on Jan 2 just after midnight)
* to wrap the TODR around.
*/
void
resettodr(void)
{
struct timeval time;
getmicrotime(&time);
if (time.tv_sec == 0)
return;
if (todr_settime(todr_handle, &time) != 0)
printf("resettodr: cannot set time in time-of-day clock\n");
}
/*
* We assume newhz is either stathz or profhz, and that neither will
* change after being set up above. Could recalculate intervals here