Module Name: src
Committed By: rin
Date: Fri Apr 29 21:39:51 UTC 2022
Modified Files:
src/sys/arch/cobalt/stand/boot: tgets.c
src/sys/arch/mmeye/stand/boot: tgets.c
src/sys/arch/prep/stand/boot: tgets.c
src/sys/arch/rs6000/stand/boot: tgets.c
Log Message:
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...
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cobalt/stand/boot/tgets.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/stand/boot/tgets.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/prep/stand/boot/tgets.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/stand/boot/tgets.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cobalt/stand/boot/tgets.c
diff -u src/sys/arch/cobalt/stand/boot/tgets.c:1.4 src/sys/arch/cobalt/stand/boot/tgets.c:1.5
--- src/sys/arch/cobalt/stand/boot/tgets.c:1.4 Wed Oct 17 19:54:09 2007
+++ src/sys/arch/cobalt/stand/boot/tgets.c Fri Apr 29 21:39:50 2022
@@ -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 @@ tgets(char *buf)
#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:
Index: src/sys/arch/mmeye/stand/boot/tgets.c
diff -u src/sys/arch/mmeye/stand/boot/tgets.c:1.1 src/sys/arch/mmeye/stand/boot/tgets.c:1.2
--- src/sys/arch/mmeye/stand/boot/tgets.c:1.1 Thu Mar 3 05:59:37 2011
+++ src/sys/arch/mmeye/stand/boot/tgets.c Fri Apr 29 21:39:50 2022
@@ -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 @@ tgets(char *buf)
#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:
Index: src/sys/arch/prep/stand/boot/tgets.c
diff -u src/sys/arch/prep/stand/boot/tgets.c:1.4 src/sys/arch/prep/stand/boot/tgets.c:1.5
--- src/sys/arch/prep/stand/boot/tgets.c:1.4 Mon Apr 10 18:40:06 2006
+++ src/sys/arch/prep/stand/boot/tgets.c Fri Apr 29 21:39:50 2022
@@ -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 @@ tgets(char *buf)
#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:
Index: src/sys/arch/rs6000/stand/boot/tgets.c
diff -u src/sys/arch/rs6000/stand/boot/tgets.c:1.1 src/sys/arch/rs6000/stand/boot/tgets.c:1.2
--- src/sys/arch/rs6000/stand/boot/tgets.c:1.1 Mon Dec 17 19:09:55 2007
+++ src/sys/arch/rs6000/stand/boot/tgets.c Fri Apr 29 21:39:51 2022
@@ -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 @@ tgets(char *buf)
#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:
