summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2008-03-26 20:09:21 +0000
committerphk <phk@FreeBSD.org>2008-03-26 20:09:21 +0000
commitfa71439e44b745e751add3bebee1fdf492212897 (patch)
treee91c04a22676482787a397cde06c51737c92138e /sys/sparc64
parentf5a614e94615c27d79bb9bac74fcc58341eb8884 (diff)
downloadFreeBSD-src-fa71439e44b745e751add3bebee1fdf492212897.zip
FreeBSD-src-fa71439e44b745e751add3bebee1fdf492212897.tar.gz
The "free-lance" timer in the i8254 is only used for the speaker
these days, so de-generalize the acquire_timer/release_timer api to just deal with speakers. The new (optional) MD functions are: timer_spkr_acquire() timer_spkr_release() and timer_spkr_setfreq() the last of which configures the timer to generate a tone of a given frequency, in Hz instead of 1/1193182th of seconds. Drop entirely timer2 on pc98, it is not used anywhere at all. Move sysbeep() to kern/tty_cons.c and use the timer_spkr*() if they exist, and do nothing otherwise. Remove prototypes and empty acquire-/release-timer() and sysbeep() functions from the non-beeping archs. This eliminate the need for the speaker driver to know about i8254frequency at all. In theory this makes the speaker driver MI, contingent on the timer_spkr_*() functions existing but the driver does not know this yet and still attaches to the ISA bus. Syscons is more tricky, in one function, sc_tone(), it knows the hz and things are just fine. In the other function, sc_bell() it seems to get the period from the KDMKTONE ioctl in terms if 1/1193182th second, so we hardcode the 1193182 and leave it at that. It's probably not important. Change a few other sysbeep() uses which obviously knew that the argument was in terms of i8254 frequency, and leave alone those that look like people thought sysbeep() took frequency in hertz. This eliminates the knowledge of i8254_freq from all but the actual clock.c code and the prof_machdep.c on amd64 and i386, where I think it would be smart to ask for help from the timecounters anyway [TBD].
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/include/clock.h2
-rw-r--r--sys/sparc64/sparc64/clock.c9
2 files changed, 0 insertions, 11 deletions
diff --git a/sys/sparc64/include/clock.h b/sys/sparc64/include/clock.h
index c98b024..b0e4c0b 100644
--- a/sys/sparc64/include/clock.h
+++ b/sys/sparc64/include/clock.h
@@ -33,6 +33,4 @@ extern u_long tick_increment;
extern u_long tick_freq;
extern u_long tick_MHz;
-int sysbeep(int, int);
-
#endif /* !_MACHINE_CLOCK_H_ */
diff --git a/sys/sparc64/sparc64/clock.c b/sys/sparc64/sparc64/clock.c
index 37341fd..a73ed35 100644
--- a/sys/sparc64/sparc64/clock.c
+++ b/sys/sparc64/sparc64/clock.c
@@ -56,12 +56,3 @@ void
cpu_stopprofclock(void)
{
}
-
-int
-sysbeep(int pitch, int period)
-{
- /*
- * XXX: function exists to enable RAID drivers to compile at the moment.
- */
- return (0);
-}
OpenPOWER on IntegriCloud