summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-07-17 11:26:05 +0000
committerbde <bde@FreeBSD.org>1996-07-17 11:26:05 +0000
commitd2dedce6654e082593b05a4b9dda3d0f6132f1a1 (patch)
tree9bd6ec3a9ad03bc1c0165d2901e5c80437831dbe
parenteee2e98b23b69ac1def76c0bf8462e89216b70d8 (diff)
downloadFreeBSD-src-d2dedce6654e082593b05a4b9dda3d0f6132f1a1.zip
FreeBSD-src-d2dedce6654e082593b05a4b9dda3d0f6132f1a1.tar.gz
Fixed adjustment of `time' when timer0 is released. 27465 was 27645 in
a comment and in code that was only used when pcaudio was closed. The maximum error was 66 usec.
-rw-r--r--sys/amd64/amd64/tsc.c4
-rw-r--r--sys/amd64/isa/clock.c4
-rw-r--r--sys/i386/i386/microtime.s4
-rw-r--r--sys/i386/i386/tsc.c4
-rw-r--r--sys/i386/isa/clock.c4
-rw-r--r--sys/isa/atrtc.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 19e14aa..9237d38 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.61 1996/06/17 12:50:22 bde Exp $
+ * $Id: clock.c,v 1.62 1996/07/01 18:00:47 bde Exp $
*/
/*
@@ -194,7 +194,7 @@ clkintr(struct clockframe frame)
/*
* See microtime.s for this magic.
*/
- time.tv_usec += (27645 *
+ time.tv_usec += (27465 *
(timer0_prescaler_count - hardclock_max_count))
>> 15;
if (time.tv_usec >= 1000000)
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 19e14aa..9237d38 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.61 1996/06/17 12:50:22 bde Exp $
+ * $Id: clock.c,v 1.62 1996/07/01 18:00:47 bde Exp $
*/
/*
@@ -194,7 +194,7 @@ clkintr(struct clockframe frame)
/*
* See microtime.s for this magic.
*/
- time.tv_usec += (27645 *
+ time.tv_usec += (27465 *
(timer0_prescaler_count - hardclock_max_count))
>> 15;
if (time.tv_usec >= 1000000)
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index 7e7bafa..884cd9e 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: Steve McCanne's microtime code
- * $Id: microtime.s,v 1.13 1996/05/31 01:08:02 peter Exp $
+ * $Id: microtime.s,v 1.14 1996/06/17 12:43:04 bde Exp $
*/
#include <machine/asmacros.h>
@@ -153,7 +153,7 @@ overflow:
*/
#if 0
- imul $27645, %edx /* 25 cycles on a 486 */
+ imul $27465, %edx /* 25 cycles on a 486 */
#else
leal (%edx,%edx,2), %eax /* a = 3 2 cycles on a 486 */
leal (%edx,%eax,4), %eax /* a = 13 2 */
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 19e14aa..9237d38 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.61 1996/06/17 12:50:22 bde Exp $
+ * $Id: clock.c,v 1.62 1996/07/01 18:00:47 bde Exp $
*/
/*
@@ -194,7 +194,7 @@ clkintr(struct clockframe frame)
/*
* See microtime.s for this magic.
*/
- time.tv_usec += (27645 *
+ time.tv_usec += (27465 *
(timer0_prescaler_count - hardclock_max_count))
>> 15;
if (time.tv_usec >= 1000000)
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 19e14aa..9237d38 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.61 1996/06/17 12:50:22 bde Exp $
+ * $Id: clock.c,v 1.62 1996/07/01 18:00:47 bde Exp $
*/
/*
@@ -194,7 +194,7 @@ clkintr(struct clockframe frame)
/*
* See microtime.s for this magic.
*/
- time.tv_usec += (27645 *
+ time.tv_usec += (27465 *
(timer0_prescaler_count - hardclock_max_count))
>> 15;
if (time.tv_usec >= 1000000)
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 19e14aa..9237d38 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.61 1996/06/17 12:50:22 bde Exp $
+ * $Id: clock.c,v 1.62 1996/07/01 18:00:47 bde Exp $
*/
/*
@@ -194,7 +194,7 @@ clkintr(struct clockframe frame)
/*
* See microtime.s for this magic.
*/
- time.tv_usec += (27645 *
+ time.tv_usec += (27465 *
(timer0_prescaler_count - hardclock_max_count))
>> 15;
if (time.tv_usec >= 1000000)
OpenPOWER on IntegriCloud