Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch check whether tv_usec >= 1000000



details:   https://anonhg.NetBSD.org/src/rev/d60c368786b8
branches:  trunk
changeset: 480743:d60c368786b8
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jan 19 02:52:16 2000 +0000

description:
check whether tv_usec >= 1000000

diffstat:

 sys/arch/alpha/alpha/machdep.c       |  8 ++++----
 sys/arch/amiga/amiga/machdep.c       |  6 +++---
 sys/arch/arm32/isa/clock.c           |  6 +++---
 sys/arch/atari/atari/machdep.c       |  6 +++---
 sys/arch/bebox/bebox/clock.c         |  4 ++--
 sys/arch/hpcmips/hpcmips/machdep.c   |  6 +++---
 sys/arch/luna68k/luna68k/machdep.c   |  8 ++++----
 sys/arch/mac68k/mac68k/machdep.c     |  6 +++---
 sys/arch/macppc/macppc/clock.c       |  4 ++--
 sys/arch/mvme68k/mvme68k/clock.c     |  6 +++---
 sys/arch/news68k/news68k/clock.c     |  6 +++---
 sys/arch/newsmips/newsmips/machdep.c |  6 +++---
 sys/arch/next68k/next68k/clock.c     |  6 +++---
 sys/arch/ofppc/ofppc/clock.c         |  4 ++--
 sys/arch/pica/pica/machdep.c         |  6 +++---
 sys/arch/pmax/pmax/machdep.c         |  6 +++---
 sys/arch/sun3/sun3/clock.c           |  6 +++---
 sys/arch/sun3/sun3x/clock.c          |  6 +++---
 sys/arch/vax/vax/clock.c             |  6 +++---
 sys/arch/x68k/x68k/clock.c           |  6 +++---
 20 files changed, 59 insertions(+), 59 deletions(-)

diffs (truncated from 508 to 300 lines):

diff -r 4360291798f9 -r d60c368786b8 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.189 1999/12/16 20:17:22 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.190 2000/01/19 02:52:16 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.189 1999/12/16 20:17:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.190 2000/01/19 02:52:16 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2007,14 +2007,14 @@
        *tvp = time;
 #ifdef notdef
        tvp->tv_usec += clkread();
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
 #endif
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c    Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/amiga/amiga/machdep.c    Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.143 1999/12/04 21:20:01 ragge Exp $      */
+/*     $NetBSD: machdep.c,v 1.144 2000/01/19 02:52:22 msaitoh Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -841,13 +841,13 @@
 
        *tvp = time;
        tvp->tv_usec += clkread();
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/arm32/isa/clock.c
--- a/sys/arch/arm32/isa/clock.c        Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/arm32/isa/clock.c        Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.3 1999/03/19 04:58:45 cgd Exp $    */
+/*     $NetBSD: clock.c,v 1.4 2000/01/19 02:52:17 msaitoh Exp $        */
 
 /*
  * Copyright 1997
@@ -644,7 +644,7 @@
        }
        
        tvp->tv_sec = time.tv_sec;
-       if (tm > 1000000) {
+       if (tm >= 1000000) {
          tvp->tv_sec += 1;
          tm -= 1000000;
        }
@@ -656,7 +656,7 @@
        if (tvp->tv_sec == oldtv.tv_sec &&
            tvp->tv_usec <= oldtv.tv_usec) {
                tvp->tv_usec = oldtv.tv_usec + 1;
-               if (tvp->tv_usec > 1000000) {
+               if (tvp->tv_usec >= 1000000) {
                        tvp->tv_usec -= 1000000;
                        ++tvp->tv_sec;
                }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/atari/atari/machdep.c    Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.89 1999/12/04 21:20:13 ragge Exp $       */
+/*     $NetBSD: machdep.c,v 1.90 2000/01/19 02:52:22 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -683,13 +683,13 @@
 
        *tvp = time;
        tvp->tv_usec += clkread();
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/bebox/bebox/clock.c
--- a/sys/arch/bebox/bebox/clock.c      Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/bebox/bebox/clock.c      Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.6 1999/07/02 15:33:36 sakamoto Exp $       */
+/*     $NetBSD: clock.c,v 1.7 2000/01/19 02:52:18 msaitoh Exp $        */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -146,7 +146,7 @@
        asm volatile ("mtmsr %0" :: "r"(msr));
        ticks /= 1000;
        tvp->tv_usec += ticks;
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_usec -= 1000000;
                tvp->tv_sec++;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.14 2000/01/09 07:59:51 shin Exp $        */
+/*     $NetBSD: machdep.c,v 1.15 2000/01/19 02:52:18 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2000/01/09 07:59:51 shin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2000/01/19 02:52:18 msaitoh Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_vr41x1.h"
@@ -667,7 +667,7 @@
 
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/luna68k/luna68k/machdep.c
--- a/sys/arch/luna68k/luna68k/machdep.c        Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/luna68k/luna68k/machdep.c        Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2000/01/15 10:06:21 nisimura Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2000/01/19 02:52:18 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2000/01/15 10:06:21 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2000/01/19 02:52:18 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -928,14 +928,14 @@
        *tvp = time;
 #ifdef notdef
        tvp->tv_usec += clkread();
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
 #endif
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.240 1999/12/04 21:20:42 ragge Exp $      */
+/*     $NetBSD: machdep.c,v 1.241 2000/01/19 02:52:18 msaitoh Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -911,13 +911,13 @@
 
        *tvp = time;
        tvp->tv_usec += clkread();
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/macppc/macppc/clock.c
--- a/sys/arch/macppc/macppc/clock.c    Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/macppc/macppc/clock.c    Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.8 1999/03/24 05:51:04 mrg Exp $    */
+/*     $NetBSD: clock.c,v 1.9 2000/01/19 02:52:19 msaitoh Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -245,7 +245,7 @@
        asm volatile ("mtmsr %0" :: "r"(msr));
        ticks /= 1000;
        tvp->tv_usec += ticks;
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_usec -= 1000000;
                tvp->tv_sec++;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/mvme68k/mvme68k/clock.c
--- a/sys/arch/mvme68k/mvme68k/clock.c  Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/mvme68k/mvme68k/clock.c  Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clock.c,v 1.10 1998/08/22 10:55:34 scw Exp $  */
+/*      $NetBSD: clock.c,v 1.11 2000/01/19 02:52:19 msaitoh Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -192,13 +192,13 @@
 
        *tvp = time;
        tvp->tv_usec;
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/news68k/news68k/clock.c
--- a/sys/arch/news68k/news68k/clock.c  Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/news68k/news68k/clock.c  Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clock.c,v 1.2 2000/01/09 15:56:52 tsutsui Exp $       */
+/*      $NetBSD: clock.c,v 1.3 2000/01/19 02:52:19 msaitoh Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -162,13 +162,13 @@
 
        *tvp = time;
        tvp->tv_usec++;
-       while (tvp->tv_usec > 1000000) {
+       while (tvp->tv_usec >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
        if (tvp->tv_sec == lasttime.tv_sec &&
            tvp->tv_usec <= lasttime.tv_usec &&
-           (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {
+           (tvp->tv_usec = lasttime.tv_usec + 1) >= 1000000) {
                tvp->tv_sec++;
                tvp->tv_usec -= 1000000;
        }
diff -r 4360291798f9 -r d60c368786b8 sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c      Wed Jan 19 01:16:38 2000 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c      Wed Jan 19 02:52:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.35 1999/12/26 09:05:39 tsubai Exp $      */
+/*     $NetBSD: machdep.c,v 1.36 2000/01/19 02:52:19 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 1999/12/26 09:05:39 tsubai Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2000/01/19 02:52:19 msaitoh Exp $");



Home | Main Index | Thread Index | Old Index