Module Name: src
Committed By: andvar
Date: Tue Jul 5 19:21:26 UTC 2022
Modified Files:
src/sys/arch/dreamcast/dev/maple: maple.c
src/sys/compat/ultrix: ultrix_fs.c
src/sys/dev/ata: atareg.h
Log Message:
s/retrys/retries/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.59 -r1.60 src/sys/compat/ultrix/ultrix_fs.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ata/atareg.h
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/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.56 src/sys/arch/dreamcast/dev/maple/maple.c:1.57
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.56 Mon Mar 28 12:38:58 2022
+++ src/sys/arch/dreamcast/dev/maple/maple.c Tue Jul 5 19:21:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.56 2022/03/28 12:38:58 riastradh Exp $ */
+/* $NetBSD: maple.c,v 1.57 2022/07/05 19:21:26 andvar Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.56 2022/03/28 12:38:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.57 2022/07/05 19:21:26 andvar Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -339,7 +339,7 @@ maple_run_polling(device_t dev)
for (port = 0; port < MAPLE_PORTS; port++)
for (subunit = 0; subunit < MAPLE_SUBUNITS; subunit++)
sc->sc_unit[port][subunit].u_dma_stat = MAPLE_DMA_IDLE;
- SIMPLEQ_INIT(&sc->sc_retryq); /* XXX discard current retrys */
+ SIMPLEQ_INIT(&sc->sc_retryq); /* XXX discard current retries */
/*
* do polling (periodic status check only)
Index: src/sys/compat/ultrix/ultrix_fs.c
diff -u src/sys/compat/ultrix/ultrix_fs.c:1.59 src/sys/compat/ultrix/ultrix_fs.c:1.60
--- src/sys/compat/ultrix/ultrix_fs.c:1.59 Tue Sep 29 02:49:56 2020
+++ src/sys/compat/ultrix/ultrix_fs.c Tue Jul 5 19:21:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.59 2020/09/29 02:49:56 msaitoh Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.60 2022/07/05 19:21:26 andvar Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.59 2020/09/29 02:49:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.60 2022/07/05 19:21:26 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,7 +145,7 @@ struct ultrix_getmnt_args {
#define ULTRIX_NM_WSIZE 0x0004 /* set write size */
#define ULTRIX_NM_RSIZE 0x0008 /* set read size */
#define ULTRIX_NM_TIMEO 0x0010 /* set initial timeout */
-#define ULTRIX_NM_RETRANS 0x0020 /* set number of request retrys */
+#define ULTRIX_NM_RETRANS 0x0020 /* set number of request retries */
#define ULTRIX_NM_HOSTNAME 0x0040 /* set hostname for error printf */
#define ULTRIX_NM_PGTHRESH 0x0080 /* set page threshold for exec */
#define ULTRIX_NM_INT 0x0100 /* allow hard mount keyboard interrupts */
Index: src/sys/dev/ata/atareg.h
diff -u src/sys/dev/ata/atareg.h:1.45 src/sys/dev/ata/atareg.h:1.46
--- src/sys/dev/ata/atareg.h:1.45 Fri May 15 21:56:14 2020
+++ src/sys/dev/ata/atareg.h Tue Jul 5 19:21:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.45 2020/05/15 21:56:14 jdolecek Exp $ */
+/* $NetBSD: atareg.h,v 1.46 2022/07/05 19:21:26 andvar Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -101,7 +101,7 @@
#define WDCC_WRITE 0x30 /* disk write code */
#define WDCC__LONG 0x02 /* modifier -- access ecc bytes */
-#define WDCC__NORETRY 0x01 /* modifier -- no retrys */
+#define WDCC__NORETRY 0x01 /* modifier -- no retries */
#define WDCC_READ_LOG_DMA_EXT 0x47 /* DMA variant of READ_LOG_EXT */