e465985885
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].
44 lines
873 B
C
44 lines
873 B
C
/*-
|
|
* Kernel interface to machine-dependent clock driver.
|
|
* Garrett Wollman, September 1994.
|
|
* This file is in the public domain.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_CLOCK_H_
|
|
#define _MACHINE_CLOCK_H_
|
|
|
|
#ifdef _KERNEL
|
|
/*
|
|
* i386 to clock driver interface.
|
|
* XXX large parts of the driver and its interface are misplaced.
|
|
*/
|
|
extern int clkintr_pending;
|
|
extern int statclock_disable;
|
|
extern u_int i8254_freq;
|
|
extern int i8254_max_count;
|
|
extern uint64_t tsc_freq;
|
|
extern int tsc_is_broken;
|
|
|
|
void i8254_init(void);
|
|
|
|
/*
|
|
* Driver to clock driver interface.
|
|
*/
|
|
|
|
int rtcin(int reg);
|
|
void writertc(int reg, unsigned char val);
|
|
void timer_restore(void);
|
|
void init_TSC(void);
|
|
void init_TSC_tc(void);
|
|
|
|
#define HAS_TIMER_SPKR 1
|
|
int timer_spkr_acquire(void);
|
|
int timer_spkr_release(void);
|
|
void timer_spkr_setfreq(int freq);
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
#endif /* !_MACHINE_CLOCK_H_ */
|