- Move timerreg.h to <arch>/include and split i8253 specific defines into

  i8253reg.h, and add some defines to control a speaker.
- Move PPI related defines from i386/isa/spkr.c into ppireg.h and use them.
- Move IO_{PPI,TIMER} defines into ppireg.h and timerreg.h respectively.
- Use isa/isareg.h rather than <arch>/isa/isa.h.

Tested on: i386, pc98

6 files changed, 136 insertions, 26 deletions

diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 31a35b0..8adcce8 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -57,9 +57,7 @@
 #define	IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
 #define	IO_RTC		0x020		/* 4990A RTC */
 #define	IO_SYSPORT	0x031		/* 8255A System Port */
-#define	IO_PPI		0x035		/* Programmable Peripheral Interface */
 #define	IO_KBD		0x041		/* 8251A Keyboard */
-#define	IO_TIMER1	0x071		/* 8253C Timer */
 #define	IO_COM2		0x0B1		/* 8251A RS232C serial I/O (ext) */
 #define	IO_COM3		0x0B9		/* 8251A RS232C serial I/O (ext) */
 #define	IO_FDPORT	0x0BE		/* FD I/F port (1M<->640K,EMTON) */
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index f3d956b..ee75914 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -79,6 +79,8 @@
 #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>
@@ -86,7 +88,6 @@
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
-#include <i386/isa/timerreg.h>
 
 /*
  * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we
@@ -357,8 +358,8 @@ DELAY(int n)
 static void
 sysbeepstop(void *chan)
 {
-	outb(IO_PPI, inb(IO_PPI)|0x08);	/* disable counter1 output to speaker */
-	release_timer1();
+	ppi_spkr_off();		/* disable counter1 output to speaker */
+	timer_spkr_release();
 	beeping = 0;
 }
 
@@ -367,19 +368,18 @@ sysbeep(int pitch, int period)
 {
 	int x = splclock();
 
-	if (acquire_timer1(TIMER_SQWAVE|TIMER_16BIT))
+	if (timer_spkr_acquire())
 		if (!beeping) {
 			/* Something else owns it. */
 			splx(x);
 			return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */
 		}
 	disable_intr();
-	outb(0x3fdb, pitch);
-	outb(0x3fdb, (pitch>>8));
+	spkr_set_pitch(pitch);
 	enable_intr();
 	if (!beeping) {
 		/* enable counter1 output to speaker */
-		outb(IO_PPI, (inb(IO_PPI) & 0xf7));
+		ppi_spkr_on();
 		beeping = period;
 		timeout(sysbeepstop, (void *)NULL, period);
 	}
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index f3d956b..ee75914 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -79,6 +79,8 @@
 #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>
@@ -86,7 +88,6 @@
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
-#include <i386/isa/timerreg.h>
 
 /*
  * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we
@@ -357,8 +358,8 @@ DELAY(int n)
 static void
 sysbeepstop(void *chan)
 {
-	outb(IO_PPI, inb(IO_PPI)|0x08);	/* disable counter1 output to speaker */
-	release_timer1();
+	ppi_spkr_off();		/* disable counter1 output to speaker */
+	timer_spkr_release();
 	beeping = 0;
 }
 
@@ -367,19 +368,18 @@ sysbeep(int pitch, int period)
 {
 	int x = splclock();
 
-	if (acquire_timer1(TIMER_SQWAVE|TIMER_16BIT))
+	if (timer_spkr_acquire())
 		if (!beeping) {
 			/* Something else owns it. */
 			splx(x);
 			return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */
 		}
 	disable_intr();
-	outb(0x3fdb, pitch);
-	outb(0x3fdb, (pitch>>8));
+	spkr_set_pitch(pitch);
 	enable_intr();
 	if (!beeping) {
 		/* enable counter1 output to speaker */
-		outb(IO_PPI, (inb(IO_PPI) & 0xf7));
+		ppi_spkr_on();
 		beeping = period;
 		timeout(sysbeepstop, (void *)NULL, period);
 	}
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index fc430e9..7247f48 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -38,14 +38,14 @@
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
+#include <machine/ppireg.h>
+#include <machine/timerreg.h>
 
 #include <pc98/cbus/cbus.h>
 #include <pc98/pc98/pc98_machdep.h>
 
 #include <dev/syscons/syscons.h>
 
-#include <i386/isa/timerreg.h>
-
 #include <isa/isavar.h>
 
 static devclass_t	sc_devclass;
@@ -227,22 +227,19 @@ sc_get_bios_values(bios_values_t *values)
 int
 sc_tone(int herz)
 {
-	int pitch;
 
 	if (herz) {
 		/* enable counter 1 */
-		outb(0x35, inb(0x35) & 0xf7);
+		ppi_spkr_on();
 		/* set command for counter 1, 2 byte write */
-		if (acquire_timer1(TIMER_16BIT | TIMER_SQWAVE))
+		if (timer_spkr_acquire())
 			return EBUSY;
 		/* set pitch */
-		pitch = timer_freq/herz;
-		outb(TIMER_CNTR1, pitch);
-		outb(TIMER_CNTR1, pitch >> 8);
+		spkr_set_pitch(timer_freq / herz);
 	} else {
 		/* disable counter 1 */
-		outb(0x35, inb(0x35) | 0x08);
-		release_timer1();
+		ppi_spkr_off();
+		timer_spkr_release();
 	}
 	return 0;
 }
diff --git a/sys/pc98/include/ppireg.h b/sys/pc98/include/ppireg.h
new file mode 100644
index 0000000..e2f9146
--- /dev/null
+++ b/sys/pc98/include/ppireg.h
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY 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 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)
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MACHINE_PPIREG_H_
+#define _MACHINE_PPIREG_H_
+
+#ifdef _KERNEL
+
+#define	IO_PPI		0x35	/* Programmable Peripheral Interface */
+
+/*
+ * PPI speaker control values
+ */
+
+#define	PIT_ENABLETMR1	0x08	/* Enable timer/counter 1 */
+
+#define	PIT_SPKR	(PIT_ENABLETMR1)
+
+#define	ppi_spkr_on()	outb(IO_PPI, inb(IO_PPI) & ~PIT_SPKR)
+#define	ppi_spkr_off()	outb(IO_PPI, inb(IO_PPI) | PIT_SPKR)
+
+#endif /* _KERNEL */
+
+#endif /* _MACHINE_PPIREG_H_ */
diff --git a/sys/pc98/include/timerreg.h b/sys/pc98/include/timerreg.h
new file mode 100644
index 0000000..f9a36b7
--- /dev/null
+++ b/sys/pc98/include/timerreg.h
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY 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 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)
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * The outputs of the three timers are connected as follows:
+ *
+ *	 timer 0 -> irq 0
+ *	 timer 1 -> speaker (via keyboard controller)
+ * 	 timer 2 -> RS-232C
+ *
+ * Timer 0 is used to call hardclock.
+ * Timer 1 is used to generate console beeps.
+ */
+
+#ifndef _MACHINE_TIMERREG_H_
+#define _MACHINE_TIMERREG_H_
+
+#ifdef _KERNEL
+
+#include <dev/ic/i8253reg.h>
+
+#define	IO_TIMER1	0x71		/* 8253C Timer */
+#define	TIMER_CNTR0	(IO_TIMER1 + TIMER_REG_CNTR0 * 2)
+#define	TIMER_CNTR1	0x3fdb
+#define	TIMER_CNTR2	(IO_TIMER1 + TIMER_REG_CNTR2 * 2)
+#define	TIMER_MODE	(IO_TIMER1 + TIMER_REG_MODE * 2)
+
+#define	timer_spkr_acquire() \
+	acquire_timer1(TIMER_SEL1 | TIMER_SQWAVE | TIMER_16BIT)
+#define	timer_spkr_release() \
+	release_timer1()
+
+static __inline void
+spkr_set_pitch(u_int16_t pitch)
+{
+
+	outb(TIMER_CNTR1, pitch & 0xff);
+	outb(TIMER_CNTR1, pitch >> 8);
+}
+
+#endif /* _KERNEL */
+
+#endif /* _MACHINE_TIMERREG_H_ */