x86: Deduplicate clock.h
The headers were mostly identical on amd64 and i386. No functional change intended. Reviewed by: cperciva, mav, imp, kib, jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33205
This commit is contained in:
parent
dbf05458e3
commit
f06f1d1fdb
@ -1,46 +1,5 @@
|
|||||||
/*-
|
/*
|
||||||
* Kernel interface to machine-dependent clock driver.
|
|
||||||
* Garrett Wollman, September 1994.
|
|
||||||
* This file is in the public domain.
|
* This file is in the public domain.
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _MACHINE_CLOCK_H_
|
#include <x86/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 u_int i8254_freq;
|
|
||||||
extern int i8254_max_count;
|
|
||||||
extern uint64_t tsc_freq;
|
|
||||||
extern int tsc_is_invariant;
|
|
||||||
extern int tsc_perf_stat;
|
|
||||||
#ifdef SMP
|
|
||||||
extern int smp_tsc;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void i8254_init(void);
|
|
||||||
void i8254_delay(int);
|
|
||||||
void clock_init(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Driver to clock driver interface.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void startrtclock(void);
|
|
||||||
void init_TSC(void);
|
|
||||||
void resume_TSC(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_ */
|
|
||||||
|
@ -1,43 +1,5 @@
|
|||||||
/*-
|
/*
|
||||||
* Kernel interface to machine-dependent clock driver.
|
|
||||||
* Garrett Wollman, September 1994.
|
|
||||||
* This file is in the public domain.
|
* This file is in the public domain.
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _MACHINE_CLOCK_H_
|
#include <x86/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 u_int i8254_freq;
|
|
||||||
extern int i8254_max_count;
|
|
||||||
extern uint64_t tsc_freq;
|
|
||||||
extern int tsc_is_invariant;
|
|
||||||
extern int tsc_perf_stat;
|
|
||||||
|
|
||||||
void i8254_init(void);
|
|
||||||
void i8254_delay(int);
|
|
||||||
void clock_init(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Driver to clock driver interface.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void startrtclock(void);
|
|
||||||
void init_TSC(void);
|
|
||||||
void resume_TSC(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_ */
|
|
||||||
|
46
sys/x86/include/clock.h
Normal file
46
sys/x86/include/clock.h
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
/*-
|
||||||
|
* 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 u_int i8254_freq;
|
||||||
|
extern int i8254_max_count;
|
||||||
|
extern uint64_t tsc_freq;
|
||||||
|
extern int tsc_is_invariant;
|
||||||
|
extern int tsc_perf_stat;
|
||||||
|
#ifdef SMP
|
||||||
|
extern int smp_tsc;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void i8254_init(void);
|
||||||
|
void i8254_delay(int);
|
||||||
|
void clock_init(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Driver to clock driver interface.
|
||||||
|
*/
|
||||||
|
|
||||||
|
void startrtclock(void);
|
||||||
|
void init_TSC(void);
|
||||||
|
void resume_TSC(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_ */
|
Loading…
Reference in New Issue
Block a user