[src/trunk]: src/sys/arch Fix fallout from libsa change; stand.h includes <sy...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9061f7fc1bbd
branches:  trunk
changeset: 365867:9061f7fc1bbd
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Apr 29 21:39:50 2022 +0000

description:
Fix fallout from libsa change; stand.h includes <sys/param.h> now.

SCANWAIT and PWAIT are renamed to SCANDELAY and SCANWAIT, respectively,
in order not to redefine PWAIT.

XXX
Too many copies for tgets.c...

diffstat:

 sys/arch/cobalt/stand/boot/tgets.c |  10 +++++-----
 sys/arch/mmeye/stand/boot/tgets.c  |  10 +++++-----
 sys/arch/prep/stand/boot/tgets.c   |  10 +++++-----
 sys/arch/rs6000/stand/boot/tgets.c |  10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diffs (104 lines):

diff -r ffb75e04552c -r 9061f7fc1bbd sys/arch/cobalt/stand/boot/tgets.c
--- a/sys/arch/cobalt/stand/boot/tgets.c        Fri Apr 29 21:03:08 2022 +0000
+++ b/sys/arch/cobalt/stand/boot/tgets.c        Fri Apr 29 21:39:50 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tgets.c,v 1.4 2007/10/17 19:54:09 garbled Exp $        */
+/*     $NetBSD: tgets.c,v 1.5 2022/04/29 21:39:50 rin Exp $    */
 
 /*-
  * Copyright (c) 1993
@@ -45,12 +45,12 @@
 #ifdef USE_SCAN
        int i;
 
-#define        SCANWAIT        10000
-#define        PWAIT           500
-       for (i = 0; i < PWAIT; i++) {
+#define        SCANDELAY       10000
+#define        SCANWAIT        500
+       for (i = 0; i < SCANWAIT; i++) {
                if ((c = cnscan()) != -1)
                        goto next;
-               delay(SCANWAIT / 32); /* XXX */
+               delay(SCANDELAY / 32); /* XXX */
        }
        return -1;
 next:
diff -r ffb75e04552c -r 9061f7fc1bbd sys/arch/mmeye/stand/boot/tgets.c
--- a/sys/arch/mmeye/stand/boot/tgets.c Fri Apr 29 21:03:08 2022 +0000
+++ b/sys/arch/mmeye/stand/boot/tgets.c Fri Apr 29 21:39:50 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tgets.c,v 1.1 2011/03/03 05:59:37 kiyohara Exp $       */
+/*     $NetBSD: tgets.c,v 1.2 2022/04/29 21:39:50 rin Exp $    */
 
 /*-
  * Copyright (c) 1993
@@ -45,12 +45,12 @@
 #ifdef USE_SCAN
        int i;
 
-#define        SCANWAIT        10000
-#define        PWAIT           500
-       for (i = 0; i < PWAIT; i++) {
+#define        SCANDELAY       10000
+#define        SCANWAIT        500
+       for (i = 0; i < SCANWAIT; i++) {
                if ((c = cnscan()) != -1)
                        goto next;
-               delay(SCANWAIT);
+               delay(SCANDELAY);
        }
        return -1;
 next:
diff -r ffb75e04552c -r 9061f7fc1bbd sys/arch/prep/stand/boot/tgets.c
--- a/sys/arch/prep/stand/boot/tgets.c  Fri Apr 29 21:03:08 2022 +0000
+++ b/sys/arch/prep/stand/boot/tgets.c  Fri Apr 29 21:39:50 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tgets.c,v 1.4 2006/04/10 18:40:06 garbled Exp $        */
+/*     $NetBSD: tgets.c,v 1.5 2022/04/29 21:39:50 rin Exp $    */
 
 /*-
  * Copyright (c) 1993
@@ -43,12 +43,12 @@
 #ifdef USE_SCAN
        int i;
 
-#define        SCANWAIT        10000
-#define        PWAIT           500
-       for (i = 0; i < PWAIT; i++) {
+#define        SCANDELAY       10000
+#define        SCANWAIT        500
+       for (i = 0; i < SCANWAIT; i++) {
                if ((c = cnscan()) != -1)
                        goto next;
-               delay(SCANWAIT);
+               delay(SCANDELAY);
        }
        return (-1);
 next:
diff -r ffb75e04552c -r 9061f7fc1bbd sys/arch/rs6000/stand/boot/tgets.c
--- a/sys/arch/rs6000/stand/boot/tgets.c        Fri Apr 29 21:03:08 2022 +0000
+++ b/sys/arch/rs6000/stand/boot/tgets.c        Fri Apr 29 21:39:50 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tgets.c,v 1.1 2007/12/17 19:09:55 garbled Exp $        */
+/*     $NetBSD: tgets.c,v 1.2 2022/04/29 21:39:51 rin Exp $    */
 
 /*-
  * Copyright (c) 1993
@@ -43,12 +43,12 @@
 #ifdef USE_SCAN
        int i;
 
-#define        SCANWAIT        10000
-#define        PWAIT           500
-       for (i = 0; i < PWAIT; i++) {
+#define        SCANDELAY       10000
+#define        SCANWAIT        500
+       for (i = 0; i < SCANWAIT; i++) {
                if ((c = cnscan()) != -1)
                        goto next;
-               delay(SCANWAIT);
+               delay(SCANDELAY);
        }
        return (-1);
 next: