Module Name: src
Committed By: msaitoh
Date: Sun Dec 5 08:16:10 UTC 2021
Modified Files:
src/sys/arch/amiga/dev: if_qn.c
src/sys/dev/ic: ncr53c9x.c
src/tests/dev/sysmon: t_swsensor.sh
Log Message:
s/timout/timeout/
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.12 -r1.13 src/tests/dev/sysmon/t_swsensor.sh
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/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.49 src/sys/arch/amiga/dev/if_qn.c:1.50
--- src/sys/arch/amiga/dev/if_qn.c:1.49 Wed Jan 29 05:23:16 2020
+++ src/sys/arch/amiga/dev/if_qn.c Sun Dec 5 08:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.49 2020/01/29 05:23:16 thorpej Exp $ */
+/* $NetBSD: if_qn.c,v 1.50 2021/12/05 08:16:10 msaitoh Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.49 2020/01/29 05:23:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.50 2021/12/05 08:16:10 msaitoh Exp $");
#include "qn.h"
#if NQN > 0
@@ -416,13 +416,13 @@ qnstart(struct ifnet *ifp)
/* Wait for the packet to really leave. */
while (!(*sc->nic_t_status & T_TMT_OK) && --timout) {
if ((timout % 10000) == 0)
- log(LOG_INFO, "qn: timout...\n");
+ log(LOG_INFO, "qn: timeout...\n");
}
if (timout == 0)
/* Maybe we should try to recover from this one? */
/* But now, let's just fall thru and hope the best... */
- log(LOG_INFO, "qn: transmit timout (fatal?)\n");
+ log(LOG_INFO, "qn: transmit timeout (fatal?)\n");
sc->transmit_pending = 1;
*sc->nic_t_mask = INT_TMT_OK | INT_SIXTEEN_COL;
Index: src/sys/dev/ic/ncr53c9x.c
diff -u src/sys/dev/ic/ncr53c9x.c:1.155 src/sys/dev/ic/ncr53c9x.c:1.156
--- src/sys/dev/ic/ncr53c9x.c:1.155 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/ic/ncr53c9x.c Sun Dec 5 08:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.155 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.156 2021/12/05 08:16:10 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.155 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.156 2021/12/05 08:16:10 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,7 @@ ncr53c9x_attach(struct ncr53c9x_softc *s
* The recommended timeout is 250ms. This register is loaded
* with a value calculated as follows, from the docs:
*
- * (timout period) x (CLK frequency)
+ * (timeout period) x (CLK frequency)
* reg = -------------------------------------
* 8192 x (Clock Conversion Factor)
*
Index: src/tests/dev/sysmon/t_swsensor.sh
diff -u src/tests/dev/sysmon/t_swsensor.sh:1.12 src/tests/dev/sysmon/t_swsensor.sh:1.13
--- src/tests/dev/sysmon/t_swsensor.sh:1.12 Sun Jun 13 14:45:36 2021
+++ src/tests/dev/sysmon/t_swsensor.sh Sun Dec 5 08:16:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_swsensor.sh,v 1.12 2021/06/13 14:45:36 riastradh Exp $
+# $NetBSD: t_swsensor.sh,v 1.13 2021/12/05 08:16:10 msaitoh Exp $
get_sensor_info() {
rump.envstat -x | \
@@ -134,7 +134,7 @@ common_body() {
# (use $(( ... )) since the timeout is displayed in hex!)
rump.envstat -c env0.conf
if [ $(( $( get_sensor_key refresh-timeout ) )) -ne 2 ] ; then
- atf_fail "1: Could not set refresh-timout to 2s"
+ atf_fail "1: Could not set refresh-timeout to 2s"
fi
# Step 2 - verify that we can read sensor's value
