Page MenuHomeFreeBSD
Files F175445267

D33205.id99565.diff
No OneTemporary
Actions

D33205.id99565.diff
View Options

diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -1,46 +1,5 @@
-/*-
- * 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.
+ * This file is in the public domain.
*/
-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_ */
+#include <x86/clock.h>
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -1,43 +1,5 @@
-/*-
- * 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;
-
-void i8254_init(void);
-void i8254_delay(int);
-void clock_init(void);
-
/*
- * Driver to clock driver interface.
+ * This file is in the public domain.
*/
-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_ */
+#include <x86/clock.h>
diff --git a/sys/amd64/include/clock.h b/sys/x86/include/clock.h
copy from sys/amd64/include/clock.h
copy to sys/x86/include/clock.h

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 11, 10:14 PM (1 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40630352
Default Alt Text
D33205.id99565.diff (2 KB)

Event Timeline