summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files.pc983
-rw-r--r--sys/pc98/cbus/clock.c563
-rw-r--r--sys/pc98/conf/GENERIC.hints4
-rw-r--r--sys/x86/isa/clock.c97
4 files changed, 103 insertions, 564 deletions
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 76e4544..879c4a3 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -227,7 +227,6 @@ libkern/udivdi3.c standard
libkern/umoddi3.c standard
pc98/apm/apm_bioscall.S optional apm
pc98/cbus/cbus_dma.c optional isa
-pc98/cbus/clock.c standard
pc98/cbus/fdc.c optional fdc
pc98/cbus/fdc_cbus.c optional fdc isa
pc98/cbus/gdc.c optional gdc
@@ -253,8 +252,10 @@ pc98/pc98/pc98_machdep.c standard
# x86 shared code between IA32, AMD64 and PC98 architectures
#
x86/isa/atpic.c optional atpic
+x86/isa/clock.c standard
x86/isa/isa.c optional isa
x86/x86/io_apic.c optional apic
x86/x86/local_apic.c optional apic
x86/x86/mca.c standard
x86/x86/msi.c optional apic pci
+x86/x86/timeevents.c standard
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
deleted file mode 100644
index 2596571..0000000
--- a/sys/pc98/cbus/clock.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * 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
- * 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)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * 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.
- */
-
-/*
- * modified for PC98 by Kakefuda
- */
-
-#include "opt_apic.h"
-#include "opt_clock.h"
-#include "opt_kdtrace.h"
-#include "opt_isa.h"
-#include "opt_mca.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/lock.h>
-#include <sys/kdb.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/timetc.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/smp.h>
-#include <sys/sysctl.h>
-
-#include <machine/clock.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/apicvar.h>
-#include <machine/ppireg.h>
-#include <machine/timerreg.h>
-#include <machine/smp.h>
-
-#include <pc98/pc98/pc98_machdep.h>
-#ifdef DEV_ISA
-#include <pc98/cbus/cbus.h>
-#include <isa/isavar.h>
-#endif
-
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
-#endif
-
-#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
-
-int clkintr_pending;
-#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;
-
-/* 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);
-#if 0
-static unsigned i8254_simple_get_timecount(struct timecounter *tc);
-#endif
-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 */
-};
-
-int
-hardclockintr(struct trapframe *frame)
-{
-
- timer1clock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
- return (FILTER_HANDLED);
-}
-
-int
-statclockintr(struct trapframe *frame)
-{
-
- return (FILTER_HANDLED);
-}
-
-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);
- }
-
-#ifdef KDTRACE_HOOKS
- /*
- * If the DTrace hooks are configured and a callback function
- * has been registered, then call it to process the high speed
- * timers.
- */
- int cpu = PCPU_GET(cpuid);
- if (cyclic_clock_func[cpu] != NULL)
- (*cyclic_clock_func[cpu])(frame);
-#endif
-
-#ifdef SMP
- if (smp_started)
- ipi_all_but_self(IPI_HARDCLOCK);
-#endif
- hardclockintr(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 (intr_freq == 0)
- 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.
- */
-void
-cpu_initclocks()
-{
-
- timer1hz = hz;
- 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;
- profhz = hz;
- if (hz < 128)
- stathz = hz;
- else
- stathz = hz / (hz / 128);
- timer2hz = 0;
-
- init_TSC_tc();
-}
-
-void
-cpu_initclocks_ap(void)
-{
-}
-
-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", "");
-
-#if 0
-static unsigned
-i8254_simple_get_timecount(struct timecounter *tc)
-{
-
- return (i8254_max_count - getit());
-}
-#endif
-
-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
- */
-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 */
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index 58a72e7..171c11b 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -42,6 +42,10 @@ hint.ct.0.at="isa"
#hint.ct.0.at="isa"
#hint.ct.0.flags="0x50000"
+hint.attimer.0.at="isa"
+hint.attimer.0.port="0x71"
+hint.attimer.0.irq="0"
+
hint.pcrtc.0.at="isa"
hint.pckbd.0.at="isa"
diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c
index ccd8873..85d2ff1 100644
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -66,9 +66,17 @@ __FBSDID("$FreeBSD$");
#include <machine/ppireg.h>
#include <machine/timerreg.h>
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#else
#include <isa/rtc.h>
+#endif
#ifdef DEV_ISA
+#ifdef PC98
+#include <pc98/cbus/cbus.h>
+#else
#include <isa/isareg.h>
+#endif
#include <isa/isavar.h>
#endif
@@ -78,8 +86,12 @@ __FBSDID("$FreeBSD$");
int clkintr_pending;
#ifndef TIMER_FREQ
+#ifdef PC98
+#define TIMER_FREQ 2457600
+#else
#define TIMER_FREQ 1193182
#endif
+#endif
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
@@ -97,6 +109,10 @@ struct attimer_softc {
int port_rid, intr_rid;
struct resource *port_res;
struct resource *intr_res;
+#ifdef PC98
+ int port_rid2;
+ struct resource *port_res2;
+#endif
void *intr_handler;
struct timecounter tc;
struct eventtimer et;
@@ -150,7 +166,11 @@ timer_spkr_acquire(void)
{
int mode;
+#ifdef PC98
+ mode = TIMER_SEL1 | TIMER_SQWAVE | TIMER_16BIT;
+#else
mode = TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT;
+#endif
if (timer2_state != RELEASED)
return (-1);
@@ -163,7 +183,11 @@ timer_spkr_acquire(void)
* and this is probably good enough for timer2, so we aren't as
* careful with it as with timer0.
*/
+#ifdef PC98
+ outb(TIMER_MODE, TIMER_SEL1 | (mode & 0x3f));
+#else
outb(TIMER_MODE, TIMER_SEL2 | (mode & 0x3f));
+#endif
ppi_spkr_on(); /* enable counter2 output to speaker */
return (0);
}
@@ -175,7 +199,11 @@ timer_spkr_release(void)
if (timer2_state != ACQUIRED)
return (-1);
timer2_state = RELEASED;
+#ifdef PC98
+ outb(TIMER_MODE, TIMER_SEL1 | TIMER_SQWAVE | TIMER_16BIT);
+#else
outb(TIMER_MODE, TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT);
+#endif
ppi_spkr_off(); /* disable counter2 output to speaker */
return (0);
}
@@ -186,8 +214,13 @@ timer_spkr_setfreq(int freq)
freq = i8254_freq / freq;
mtx_lock_spin(&clock_lock);
+#ifdef PC98
+ outb(TIMER_CNTR1, freq & 0xff);
+ outb(TIMER_CNTR1, freq >> 8);
+#else
outb(TIMER_CNTR2, freq & 0xff);
outb(TIMER_CNTR2, freq >> 8);
+#endif
mtx_unlock_spin(&clock_lock);
}
@@ -293,7 +326,11 @@ DELAY(int n)
while (ticks_left > 0) {
#ifdef KDB
if (kdb_active) {
+#ifdef PC98
+ outb(0x5f, 0);
+#else
inb(0x84);
+#endif
tick = prev_tick - 1;
if (tick <= 0)
tick = i8254_max_count;
@@ -377,7 +414,9 @@ timer_restore(void)
{
i8254_restore(); /* restore i8254_freq and hz */
+#ifndef PC98
atrtc_restore(); /* reenable RTC interrupts */
+#endif
}
#endif
@@ -387,6 +426,10 @@ i8254_init(void)
{
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
+#ifdef PC98
+ if (pc98_machine_type & M_8M)
+ i8254_freq = 1996800L; /* 1.9968 MHz */
+#endif
set_i8254_freq(i8254_freq, 0);
}
@@ -506,6 +549,51 @@ static struct isa_pnp_id attimer_ids[] = {
{ 0 }
};
+#ifdef PC98
+static void
+pc98_alloc_resource(device_t dev)
+{
+ static bus_addr_t iat1[] = {0, 2, 4, 6};
+ static bus_addr_t iat2[] = {0, 4};
+ struct attimer_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ sc->port_rid = 0;
+ bus_set_resource(dev, SYS_RES_IOPORT, sc->port_rid, IO_TIMER1, 1);
+ sc->port_res = isa_alloc_resourcev(dev, SYS_RES_IOPORT,
+ &sc->port_rid, iat1, 4, RF_ACTIVE);
+ if (sc->port_res == NULL)
+ device_printf(dev, "Warning: Couldn't map I/O.\n");
+ else
+ isa_load_resourcev(sc->port_res, iat1, 4);
+
+ sc->port_rid2 = 4;
+ bus_set_resource(dev, SYS_RES_IOPORT, sc->port_rid2, TIMER_CNTR1, 1);
+ sc->port_res2 = isa_alloc_resourcev(dev, SYS_RES_IOPORT,
+ &sc->port_rid2, iat2, 2, RF_ACTIVE);
+ if (sc->port_res2 == NULL)
+ device_printf(dev, "Warning: Couldn't map I/O.\n");
+ else
+ isa_load_resourcev(sc->port_res2, iat2, 2);
+}
+
+static void
+pc98_release_resource(device_t dev)
+{
+ struct attimer_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ if (sc->port_res)
+ bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid,
+ sc->port_res);
+ if (sc->port_res2)
+ bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid2,
+ sc->port_res2);
+}
+#endif
+
static int
attimer_probe(device_t dev)
{
@@ -515,6 +603,11 @@ attimer_probe(device_t dev)
/* ENOENT means no PnP-ID, device is hinted. */
if (result == ENOENT) {
device_set_desc(dev, "AT timer");
+#ifdef PC98
+ /* To print resources correctly. */
+ pc98_alloc_resource(dev);
+ pc98_release_resource(dev);
+#endif
return (BUS_PROBE_LOW_PRIORITY);
}
return (result);
@@ -529,9 +622,13 @@ attimer_attach(device_t dev)
attimer_sc = sc = device_get_softc(dev);
bzero(sc, sizeof(struct attimer_softc));
+#ifdef PC98
+ pc98_alloc_resource(dev);
+#else
if (!(sc->port_res = bus_alloc_resource(dev, SYS_RES_IOPORT,
&sc->port_rid, IO_TIMER1, IO_TIMER1 + 3, 4, RF_ACTIVE)))
device_printf(dev,"Warning: Couldn't map I/O.\n");
+#endif
i8254_intsrc = intr_lookup_source(0);
if (i8254_intsrc != NULL)
i8254_pending = i8254_intsrc->is_pic->pic_source_pending;
OpenPOWER on IntegriCloud