diff options
| author | phk <phk@FreeBSD.org> | 2006-10-02 15:42:02 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2006-10-02 15:42:02 +0000 |
| commit | 84cc0f277fd9e49e824e8ae9424d9a976b7f21bd (patch) | |
| tree | 0bb3ea96259ad035c87da7424d8294bbca513c8b /sys/pc98 | |
| parent | 81bdd4b32997569134b13c7951c97dd500d71623 (diff) | |
| download | FreeBSD-src-84cc0f277fd9e49e824e8ae9424d9a976b7f21bd.zip FreeBSD-src-84cc0f277fd9e49e824e8ae9424d9a976b7f21bd.tar.gz | |
Second part of a little cleanup in the calendar/timezone/RTC handling.
Split subr_clock.c in two parts (by repo-copy):
subr_clock.c contains generic RTC and calendaric stuff. etc.
subr_rtc.c contains the newbus'ified RTC interface.
Centralize the machdep.{adjkerntz,disable_rtc_set,wall_cmos_clock}
sysctls and associated variables into subr_clock.c. They are
not machine dependent and we have generic code that relies on being
present so they are not even optional.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 3 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 3 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 20 |
3 files changed, 0 insertions, 26 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 2e2fc2e..2867380 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -100,9 +100,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -112,7 +110,6 @@ int statclock_disable; u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; static int beeping = 0; diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 2e2fc2e..2867380 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -100,9 +100,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -112,7 +110,6 @@ int statclock_disable; u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; static int beeping = 0; diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 6c1adda..e2ee385 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -1254,26 +1254,6 @@ cpu_setregs(void) load_gs(_udatasel); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - u_long bootdev; /* not a struct cdev *- encoding is different */ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); |
