MFi386: Merge yet another the RTC related work.

Split the pcrtc driver into pcrtc.c which is repo-copied from clock.c

2 files changed, 15 insertions, 739 deletions

diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 81f61b9..ff4bd8f 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -40,13 +40,6 @@ __FBSDID("$FreeBSD$");
  */
 
 /*
- * inittodr, settodr and support routines written
- * by Christoph Robitschko <chmr@edvz.tu-graz.ac.at>
- *
- * reintroduced and updated by Chris Stenton <chris@gnome.co.uk> 8/10/94
- */
-
-/*
  * modified for PC98 by Kakefuda
  */
 
@@ -63,32 +56,25 @@ __FBSDID("$FreeBSD$");
 #include <sys/kdb.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/kernel.h>
-#include <sys/limits.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
-#include <sys/power.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
-#include <machine/psl.h>
 #ifdef DEV_APIC
 #include <machine/apicvar.h>
 #endif
-#include <machine/specialreg.h>
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
 
-#include <i386/isa/icu.h>
-#include <pc98/cbus/cbus.h>
 #include <pc98/pc98/pc98_machdep.h>
 #ifdef DEV_ISA
+#include <pc98/cbus/cbus.h>
 #include <isa/isavar.h>
 #endif
 
@@ -356,7 +342,6 @@ i8254_restore(void)
 	mtx_unlock_spin(&clock_lock);
 }
 
-
 /*
  * Restore all the timers non-atomically (XXX: should be atomically).
  *
@@ -544,209 +529,3 @@ static devclass_t attimer_devclass;
 DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0);
 
 #endif /* DEV_ISA */
-
-#ifdef DEV_ISA
-
-/**********************************************************************
- * RTC driver for subr_rtc
- */
-
-#include "clock_if.h"
-
-#include <sys/rman.h>
-
-static void rtc_serialcombit(int);
-static void rtc_serialcom(int);
-static int rtc_inb(void);
-static void rtc_outb(int);
-
-static void
-rtc_serialcombit(int i)
-{
-	outb(IO_RTC, ((i&0x01)<<5)|0x07);
-	DELAY(1);
-	outb(IO_RTC, ((i&0x01)<<5)|0x17);
-	DELAY(1);
-	outb(IO_RTC, ((i&0x01)<<5)|0x07);
-	DELAY(1);
-}
-
-static void
-rtc_serialcom(int i)
-{
-	rtc_serialcombit(i&0x01);
-	rtc_serialcombit((i&0x02)>>1);
-	rtc_serialcombit((i&0x04)>>2);
-	rtc_serialcombit((i&0x08)>>3);
-	outb(IO_RTC, 0x07);
-	DELAY(1);
-	outb(IO_RTC, 0x0f);
-	DELAY(1);
-	outb(IO_RTC, 0x07);
- 	DELAY(1);
-}
-
-static void
-rtc_outb(int val)
-{
-	int s;
-	int sa = 0;
-
-	for (s=0;s<8;s++) {
-	    sa = ((val >> s) & 0x01) ? 0x27 : 0x07;
-	    outb(IO_RTC, sa);		/* set DI & CLK 0 */
-	    DELAY(1);
-	    outb(IO_RTC, sa | 0x10);	/* CLK 1 */
-	    DELAY(1);
-	}
-	outb(IO_RTC, sa & 0xef);	/* CLK 0 */
-}
-
-static int
-rtc_inb(void)
-{
-	int s;
-	int sa = 0;
-
-	for (s=0;s<8;s++) {
-	    sa |= ((inb(0x33) & 0x01) << s);
-	    outb(IO_RTC, 0x17);	/* CLK 1 */
-	    DELAY(1);
-	    outb(IO_RTC, 0x07);	/* CLK 0 */
-	    DELAY(2);
-	}
-	return sa;
-}
-
-struct pcrtc_softc {
-	int port_rid1, port_rid2;
-	struct resource *port_res1, *port_res2;
-};
-
-/*
- * Attach to the ISA PnP descriptors for the timer and realtime clock.
- */
-static struct isa_pnp_id pcrtc_ids[] = {
-	{ 0x000bd041 /* PNP0B00 */, "AT realtime clock" },
-	{ 0 }
-};
-
-static int
-pcrtc_probe(device_t dev)
-{
-	int result;
-
-	device_set_desc(dev, "PC Real Time Clock");
-	result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcrtc_ids);
-	/* ENXIO if wrong PnP-ID, ENOENT ifno PnP-ID, zero if good PnP-iD */
-	if (result != ENOENT)
-		return(result);
-	/* All PC's have an RTC, and we're hosed without it, so... */
-	return (BUS_PROBE_LOW_PRIORITY);
-}
-
-static int
-pcrtc_attach(device_t dev)
-{
-	struct pcrtc_softc *sc;
-
-	/*
-	 * Not that we need them or anything, but grab our resources
-	 * so they show up, correctly attributed, in the big picture.
-	 */
-	sc = device_get_softc(dev);
-	sc->port_rid1 = 0;
-	bus_set_resource(dev, SYS_RES_IOPORT, sc->port_rid1, IO_RTC, 1);
-	if (!(sc->port_res1 = bus_alloc_resource(dev, SYS_RES_IOPORT,
-	    &sc->port_rid1, IO_RTC, IO_RTC, 1, RF_ACTIVE)))
-		device_printf(dev, "Warning: Couldn't map I/O.\n");
-	sc->port_rid2 = 1;
-	bus_set_resource(dev, SYS_RES_IOPORT, sc->port_rid2, 0x33, 1);
-	if (!(sc->port_res2 = bus_alloc_resource(dev, SYS_RES_IOPORT,
-	    &sc->port_rid2, 0x33, 0x33, 1, RF_ACTIVE)))
-		device_printf(dev, "Warning: Couldn't map I/O.\n");
-
-	clock_register(dev, 1000000);
-	return(0);
-}
-
-static int
-pcrtc_settime(device_t dev __unused, struct timespec *ts)
-{
-	struct clocktime ct;
-
-	clock_ts_to_ct(ts, &ct);
-
-	rtc_serialcom(0x01);	/* Register shift command. */
-
-	rtc_outb(bin2bcd(ct.sec)); 		/* Write back Seconds */
-	rtc_outb(bin2bcd(ct.min)); 		/* Write back Minutes */
-	rtc_outb(bin2bcd(ct.hour)); 		/* Write back Hours   */
-
-	rtc_outb(bin2bcd(ct.day));		/* Write back Day     */
-	rtc_outb((ct.mon << 4) | ct.dow);	/* Write back Month and DOW */
-	rtc_outb(bin2bcd(ct.year % 100));	/* Write back Year    */
-
-	rtc_serialcom(0x02);	/* Time set & Counter hold command. */
-	rtc_serialcom(0x00);	/* Register hold command. */
-
-	return (0);
-}
-
-static int
-pcrtc_gettime(device_t dev, struct timespec *ts)
-{
-	struct clocktime ct;
-	int i;
-
-	rtc_serialcom(0x03);	/* Time Read */
-	rtc_serialcom(0x01);	/* Register shift command. */
-	DELAY(20);
-
-	ct.nsec = 0;
-	ct.sec = bcd2bin(rtc_inb() & 0xff);		/* sec */
-	ct.min = bcd2bin(rtc_inb() & 0xff);		/* min */
-	ct.hour = bcd2bin(rtc_inb() & 0xff);		/* hour */
-	ct.day = bcd2bin(rtc_inb() & 0xff);		/* date */
-	i = rtc_inb();
-	ct.dow = i & 0x0f;				/* dow */
-	ct.mon = (i >> 4) & 0x0f;			/* month */
-	ct.year = bcd2bin(rtc_inb() & 0xff) + 1900;	/* year */
-	if (ct.year < 1995)
-		ct.year += 100;
-
-	/* Set dow = -1 because some clocks don't set it correctly. */
-	ct.dow = -1;
-
-	return (clock_ct_to_ts(&ct, ts));
-}
-
-static device_method_t pcrtc_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		pcrtc_probe),
-	DEVMETHOD(device_attach,	pcrtc_attach),
-	DEVMETHOD(device_detach,	bus_generic_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-		/* XXX stop statclock? */
-	DEVMETHOD(device_resume,	bus_generic_resume),
-		/* XXX restart statclock? */
-
-	/* clock interface */
-	DEVMETHOD(clock_gettime,	pcrtc_gettime),
-	DEVMETHOD(clock_settime,	pcrtc_settime),
-
-	{ 0, 0 }
-};
-
-static driver_t pcrtc_driver = {
-	"pcrtc",
-	pcrtc_methods,
-	sizeof(struct pcrtc_softc),
-};
-
-static devclass_t pcrtc_devclass;
-
-DRIVER_MODULE(pcrtc, isa, pcrtc_driver, pcrtc_devclass, 0, 0);
-
-#endif /* DEV_ISA */
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 81f61b9..6fcbf57 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -1,10 +1,7 @@
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 2008 TAKAHASHI Yoshihiro
  * All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz and Don Ahn.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,14 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -29,531 +23,28 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/*
- * Routines to handle clock hardware.
- */
-
-/*
- * inittodr, settodr and support routines written
- * by Christoph Robitschko <chmr@edvz.tu-graz.ac.at>
- *
- * reintroduced and updated by Chris Stenton <chris@gnome.co.uk> 8/10/94
- */
-
-/*
- * modified for PC98 by Kakefuda
- */
-
-#include "opt_apic.h"
-#include "opt_clock.h"
-#include "opt_isa.h"
-#include "opt_mca.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/clock.h>
-#include <sys/lock.h>
-#include <sys/kdb.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/timetc.h>
 #include <sys/kernel.h>
-#include <sys/limits.h>
 #include <sys/module.h>
-#include <sys/sysctl.h>
-#include <sys/power.h>
-
-#include <machine/clock.h>
-#include <machine/cpu.h>
-#include <machine/cputypes.h>
-#include <machine/frame.h>
-#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/psl.h>
-#ifdef DEV_APIC
-#include <machine/apicvar.h>
-#endif
-#include <machine/specialreg.h>
-#include <machine/ppireg.h>
-#include <machine/timerreg.h>
-
-#include <i386/isa/icu.h>
+
 #include <pc98/cbus/cbus.h>
-#include <pc98/pc98/pc98_machdep.h>
-#ifdef DEV_ISA
 #include <isa/isavar.h>
-#endif
-
-#define	TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
-
-int	clkintr_pending;
-int	statclock_disable;
-#ifndef TIMER_FREQ
-#define TIMER_FREQ   2457600
-#endif
-u_int	i8254_freq = TIMER_FREQ;
-TUNABLE_INT("hw.i8254.freq", &i8254_freq);
-int	i8254_max_count;
-static int i8254_real_max_count;
-
-static	struct mtx clock_lock;
-static	struct intsrc *i8254_intsrc;
-static	u_int32_t i8254_lastcount;
-static	u_int32_t i8254_offset;
-static	int	(*i8254_pending)(struct intsrc *);
-static	int	i8254_ticked;
-static	int	using_lapic_timer;
-
-/* Values for timerX_state: */
-#define	RELEASED	0
-#define	RELEASE_PENDING	1
-#define	ACQUIRED	2
-#define	ACQUIRE_PENDING	3
-
-static	u_char	timer1_state;
-
-static	unsigned i8254_get_timecount(struct timecounter *tc);
-static	unsigned i8254_simple_get_timecount(struct timecounter *tc);
-static	void	set_i8254_freq(u_int freq, int intr_freq);
-
-static struct timecounter i8254_timecounter = {
-	i8254_get_timecount,	/* get_timecount */
-	0,			/* no poll_pps */
-	~0u,			/* counter_mask */
-	0,			/* frequency */
-	"i8254",		/* name */
-	0			/* quality */
-};
-
-static int
-clkintr(struct trapframe *frame)
-{
-
-	if (timecounter->tc_get_timecount == i8254_get_timecount) {
-		mtx_lock_spin(&clock_lock);
-		if (i8254_ticked)
-			i8254_ticked = 0;
-		else {
-			i8254_offset += i8254_max_count;
-			i8254_lastcount = 0;
-		}
-		clkintr_pending = 0;
-		mtx_unlock_spin(&clock_lock);
-	}
-	KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer"));
-	hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
-	return (FILTER_HANDLED);
-}
-
-int
-timer_spkr_acquire(void)
-{
-	int mode;
-
-	mode = TIMER_SEL1 | TIMER_SQWAVE | TIMER_16BIT;
-
-	if (timer1_state != RELEASED)
-		return (-1);
-	timer1_state = ACQUIRED;
-
-	/*
-	 * This access to the timer registers is as atomic as possible
-	 * because it is a single instruction.  We could do better if we
-	 * knew the rate.  Use of splclock() limits glitches to 10-100us,
-	 * and this is probably good enough for timer2, so we aren't as
-	 * careful with it as with timer0.
-	 */
-	outb(TIMER_MODE, TIMER_SEL1 | (mode & 0x3f));
-	ppi_spkr_on();		/* enable counter1 output to speaker */
-
-	return (0);
-}
-
-int
-timer_spkr_release(void)
-{
-
-	if (timer1_state != ACQUIRED)
-		return (-1);
-	timer1_state = RELEASED;
-	outb(TIMER_MODE, TIMER_SEL1 | TIMER_SQWAVE | TIMER_16BIT);
-	ppi_spkr_off();		/* disable counter1 output to speaker */
-	return (0);
-}
-
-void
-timer_spkr_setfreq(int freq)
-{
-
-	freq = i8254_freq / freq;
-	mtx_lock_spin(&clock_lock);
-	outb(TIMER_CNTR1, (freq) & 0xff);
-	outb(TIMER_CNTR1, (freq) >> 8);
-	mtx_unlock_spin(&clock_lock);
-}
-
-
-static int
-getit(void)
-{
-	int high, low;
-
-	mtx_lock_spin(&clock_lock);
-
-	/* Select timer0 and latch counter value. */
-	outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH);
-
-	low = inb(TIMER_CNTR0);
-	high = inb(TIMER_CNTR0);
-
-	mtx_unlock_spin(&clock_lock);
-	return ((high << 8) | low);
-}
-
-/*
- * Wait "n" microseconds.
- * Relies on timer 1 counting down from (i8254_freq / hz)
- * Note: timer had better have been programmed before this is first used!
- */
-void
-DELAY(int n)
-{
-	int delta, prev_tick, tick, ticks_left;
-
-#ifdef DELAYDEBUG
-	int getit_calls = 1;
-	int n1;
-	static int state = 0;
-
-	if (state == 0) {
-		state = 1;
-		for (n1 = 1; n1 <= 10000000; n1 *= 10)
-			DELAY(n1);
-		state = 2;
-	}
-	if (state == 1)
-		printf("DELAY(%d)...", n);
-#endif
-	/*
-	 * Read the counter first, so that the rest of the setup overhead is
-	 * counted.  Guess the initial overhead is 20 usec (on most systems it
-	 * takes about 1.5 usec for each of the i/o's in getit().  The loop
-	 * takes about 6 usec on a 486/33 and 13 usec on a 386/20.  The
-	 * multiplications and divisions to scale the count take a while).
-	 *
-	 * However, if ddb is active then use a fake counter since reading
-	 * the i8254 counter involves acquiring a lock.  ddb must not do
-	 * locking for many reasons, but it calls here for at least atkbd
-	 * input.
-	 */
-#ifdef KDB
-	if (kdb_active)
-		prev_tick = 1;
-	else
-#endif
-		prev_tick = getit();
-	n -= 0;			/* XXX actually guess no initial overhead */
-	/*
-	 * Calculate (n * (i8254_freq / 1e6)) without using floating point
-	 * and without any avoidable overflows.
-	 */
-	if (n <= 0)
-		ticks_left = 0;
-	else if (n < 256)
-		/*
-		 * Use fixed point to avoid a slow division by 1000000.
-		 * 39099 = 1193182 * 2^15 / 10^6 rounded to nearest.
-		 * 2^15 is the first power of 2 that gives exact results
-		 * for n between 0 and 256.
-		 */
-		ticks_left = ((u_int)n * 39099 + (1 << 15) - 1) >> 15;
-	else
-		/*
-		 * Don't bother using fixed point, although gcc-2.7.2
-		 * generates particularly poor code for the long long
-		 * division, since even the slow way will complete long
-		 * before the delay is up (unless we're interrupted).
-		 */
-		ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
-			     / 1000000;
-
-	while (ticks_left > 0) {
-#ifdef KDB
-		if (kdb_active) {
-			outb(0x5f, 0);
-			tick = prev_tick - 1;
-			if (tick <= 0)
-				tick = i8254_max_count;
-		} else
-#endif
-			tick = getit();
-#ifdef DELAYDEBUG
-		++getit_calls;
-#endif
-		delta = prev_tick - tick;
-		prev_tick = tick;
-		if (delta < 0) {
-			delta += i8254_max_count;
-			/*
-			 * Guard against i8254_max_count being wrong.
-			 * This shouldn't happen in normal operation,
-			 * but it may happen if set_i8254_freq() is
-			 * traced.
-			 */
-			if (delta < 0)
-				delta = 0;
-		}
-		ticks_left -= delta;
-	}
-#ifdef DELAYDEBUG
-	if (state == 1)
-		printf(" %d calls to getit() at %d usec each\n",
-		       getit_calls, (n + 5) / getit_calls);
-#endif
-}
-
-static void
-set_i8254_freq(u_int freq, int intr_freq)
-{
-	int new_i8254_real_max_count;
-
-	i8254_timecounter.tc_frequency = freq;
-	mtx_lock_spin(&clock_lock);
-	i8254_freq = freq;
-	if (using_lapic_timer)
-		new_i8254_real_max_count = 0x10000;
-	else
-		new_i8254_real_max_count = TIMER_DIV(intr_freq);
-	if (new_i8254_real_max_count != i8254_real_max_count) {
-		i8254_real_max_count = new_i8254_real_max_count;
-		if (i8254_real_max_count == 0x10000)
-			i8254_max_count = 0xffff;
-		else
-			i8254_max_count = i8254_real_max_count;
-		outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
-		outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
-		outb(TIMER_CNTR0, i8254_real_max_count >> 8);
-	}
-	mtx_unlock_spin(&clock_lock);
-}
-
-static void
-i8254_restore(void)
-{
-
-	mtx_lock_spin(&clock_lock);
-	outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
-	outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
-	outb(TIMER_CNTR0, i8254_real_max_count >> 8);
-	mtx_unlock_spin(&clock_lock);
-}
-
-
-/*
- * Restore all the timers non-atomically (XXX: should be atomically).
- *
- * This function is called from pmtimer_resume() to restore all the timers.
- * This should not be necessary, but there are broken laptops that do not
- * restore all the timers on resume.
- */
-void
-timer_restore(void)
-{
-
-	i8254_restore();		/* restore i8254_freq and hz */
-}
-
-/* This is separate from startrtclock() so that it can be called early. */
-void
-i8254_init(void)
-{
-
-	mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
-
-	if (pc98_machine_type & M_8M)
-		i8254_freq = 1996800L; /* 1.9968 MHz */
-	else
-		i8254_freq = 2457600L; /* 2.4576 MHz */
-
-	set_i8254_freq(i8254_freq, hz);
-}
-
-void
-startrtclock()
-{
-
-	set_i8254_freq(i8254_freq, hz);
-	tc_init(&i8254_timecounter);
-
-	init_TSC();
-}
 
 /*
- * Start both clocks running.
+ * modified for PC98 by Kakefuda
  */
-void
-cpu_initclocks()
-{
 
-#ifdef DEV_APIC
-	using_lapic_timer = lapic_setup_clock();
-#endif
-	/*
-	 * If we aren't using the local APIC timer to drive the kernel
-	 * clocks, setup the interrupt handler for the 8254 timer 0 so
-	 * that it can drive hardclock().  Otherwise, change the 8254
-	 * timecounter to user a simpler algorithm.
-	 */
-	if (!using_lapic_timer) {
-		intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL,
-		    NULL, INTR_TYPE_CLK, NULL);
-		i8254_intsrc = intr_lookup_source(0);
-		if (i8254_intsrc != NULL)
-			i8254_pending =
-			    i8254_intsrc->is_pic->pic_source_pending;
-	} else {
-		i8254_timecounter.tc_get_timecount =
-		    i8254_simple_get_timecount;
-		i8254_timecounter.tc_counter_mask = 0xffff;
-		set_i8254_freq(i8254_freq, hz);
-	}
-
-	init_TSC_tc();
-}
-
-void
-cpu_startprofclock(void)
-{
-}
-
-void
-cpu_stopprofclock(void)
-{
-}
-
-static int
-sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
-{
-	int error;
-	u_int freq;
-
-	/*
-	 * Use `i8254' instead of `timer' in external names because `timer'
-	 * is is too generic.  Should use it everywhere.
-	 */
-	freq = i8254_freq;
-	error = sysctl_handle_int(oidp, &freq, 0, req);
-	if (error == 0 && req->newptr != NULL)
-		set_i8254_freq(freq, hz);
-	return (error);
-}
-
-SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW,
-    0, sizeof(u_int), sysctl_machdep_i8254_freq, "IU", "");
-
-static unsigned
-i8254_simple_get_timecount(struct timecounter *tc)
-{
-
-	return (i8254_max_count - getit());
-}
-
-static unsigned
-i8254_get_timecount(struct timecounter *tc)
-{
-	u_int count;
-	u_int high, low;
-	u_int eflags;
-
-	eflags = read_eflags();
-	mtx_lock_spin(&clock_lock);
-
-	/* Select timer0 and latch counter value. */
-	outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH);
-
-	low = inb(TIMER_CNTR0);
-	high = inb(TIMER_CNTR0);
-	count = i8254_max_count - ((high << 8) | low);
-	if (count < i8254_lastcount ||
-	    (!i8254_ticked && (clkintr_pending ||
-	    ((count < 20 || (!(eflags & PSL_I) &&
-	    count < i8254_max_count / 2u)) &&
-	    i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
-		i8254_ticked = 1;
-		i8254_offset += i8254_max_count;
-	}
-	i8254_lastcount = count;
-	count += i8254_offset;
-	mtx_unlock_spin(&clock_lock);
-	return (count);
-}
-
-#ifdef DEV_ISA
 /*
- * Attach to the ISA PnP descriptors for the timer
+ * RTC support routines
  */
-static struct isa_pnp_id attimer_ids[] = {
-	{ 0x0001d041 /* PNP0100 */, "AT timer" },
-	{ 0 }
-};
-
-static int
-attimer_probe(device_t dev)
-{
-	int result;
-	
-	result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids);
-	if (result <= 0)
-		device_quiet(dev);
-	return(result);
-}
-
-static int
-attimer_attach(device_t dev)
-{
-	return(0);
-}
-
-static device_method_t attimer_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		attimer_probe),
-	DEVMETHOD(device_attach,	attimer_attach),
-	DEVMETHOD(device_detach,	bus_generic_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-	{ 0, 0 }
-};
-
-static driver_t attimer_driver = {
-	"attimer",
-	attimer_methods,
-	1,		/* no softc */
-};
-
-static devclass_t attimer_devclass;
-
-DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0);
-
-#endif /* DEV_ISA */
-
-#ifdef DEV_ISA
-
-/**********************************************************************
- * RTC driver for subr_rtc
- */
-
-#include "clock_if.h"
-
-#include <sys/rman.h>
 
 static void rtc_serialcombit(int);
 static void rtc_serialcom(int);
@@ -618,6 +109,14 @@ rtc_inb(void)
 	return sa;
 }
 
+/**********************************************************************
+ * RTC driver for subr_rtc
+ */
+
+#include "clock_if.h"
+
+#include <sys/rman.h>
+
 struct pcrtc_softc {
 	int port_rid1, port_rid2;
 	struct resource *port_res1, *port_res2;
@@ -748,5 +247,3 @@ static driver_t pcrtc_driver = {
 static devclass_t pcrtc_devclass;
 
 DRIVER_MODULE(pcrtc, isa, pcrtc_driver, pcrtc_devclass, 0, 0);
-
-#endif /* DEV_ISA */