Module Name: src
Committed By: andvar
Date: Mon Jun 27 22:41:29 UTC 2022
Modified Files:
src/games/phantasia: main.c
src/sys/arch/arm/imx: if_enetreg.h
src/sys/arch/sparc64/sparc64: locore.s
src/sys/dev/ic: aic7xxx.c
src/sys/dev/microcode/aic7xxx: aic79xx.seq aic7xxx.seq
Log Message:
fix various typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/phantasia/main.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/if_enetreg.h
cvs rdiff -u -r1.429 -r1.430 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/ic/aic7xxx.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/microcode/aic7xxx/aic79xx.seq
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/microcode/aic7xxx/aic7xxx.seq
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/phantasia/main.c
diff -u src/games/phantasia/main.c:1.24 src/games/phantasia/main.c:1.25
--- src/games/phantasia/main.c:1.24 Sun Feb 3 03:19:25 2019
+++ src/games/phantasia/main.c Mon Jun 27 22:41:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.24 2019/02/03 03:19:25 mrg Exp $ */
+/* $NetBSD: main.c,v 1.25 2022/06/27 22:41:28 andvar Exp $ */
/*
* Phantasia 3.3.2 -- Interterminal fantasy game
@@ -964,7 +964,7 @@ genchar(int type)
static void
playinit(void)
{
- /* catch/ingnore signals */
+ /* catch/ignore signals */
#ifdef BSD41
sigignore(SIGQUIT);
Index: src/sys/arch/arm/imx/if_enetreg.h
diff -u src/sys/arch/arm/imx/if_enetreg.h:1.4 src/sys/arch/arm/imx/if_enetreg.h:1.5
--- src/sys/arch/arm/imx/if_enetreg.h:1.4 Tue Nov 12 05:09:29 2019
+++ src/sys/arch/arm/imx/if_enetreg.h Mon Jun 27 22:41:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enetreg.h,v 1.4 2019/11/12 05:09:29 hkenken Exp $ */
+/* $NetBSD: if_enetreg.h,v 1.5 2022/06/27 22:41:28 andvar Exp $ */
/*-
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -282,7 +282,7 @@ struct enet_txdesc {
#define TXFLAGS2_EE __BIT(12) /* Excess colls Err */
#define TXFLAGS2_FE __BIT(11) /* Frame Error */
#define TXFLAGS2_LCE __BIT(10) /* Late collision Err */
-#define TXFLAGS2_OE __BIT(9) /* Overfow Error */
+#define TXFLAGS2_OE __BIT(9) /* Overflow Error */
#define TXFLAGS2_TSE __BIT(8) /* Timestamp Error */
uint32_t tx__reserved1;
uint32_t tx_flags3;
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.429 src/sys/arch/sparc64/sparc64/locore.s:1.430
--- src/sys/arch/sparc64/sparc64/locore.s:1.429 Sun May 22 11:27:34 2022
+++ src/sys/arch/sparc64/sparc64/locore.s Mon Jun 27 22:41:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.429 2022/05/22 11:27:34 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.430 2022/06/27 22:41:28 andvar Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -1207,7 +1207,7 @@ _C_LABEL(trapbase_sun4v):
#if 0
/*
- * If the cleanwin trap handler detects an overfow we come here.
+ * If the cleanwin trap handler detects an overflow we come here.
* We need to fix up the window registers, switch to the interrupt
* stack, and then trap to the debugger.
*/
@@ -2013,7 +2013,7 @@ winfixfill:
and %g4, CWP, %g5 ! %g4 = %cwp of trap
wrpr %g7, 0, %tt
bz,a,pt %icc, datafault ! We were in user mode -- normal fault
- wrpr %g5, %cwp ! Restore cwp from before fill trap -- regs should now be consisent
+ wrpr %g5, %cwp ! Restore cwp from before fill trap -- regs should now be consistent
/*
* We're in a pickle here. We were trying to return to user mode
@@ -2037,7 +2037,7 @@ winfixfill:
stw %g7, [%g4]
#endif
#if 0 /* Need to switch over to new stuff to fix WDR bug */
- wrpr %g5, %cwp ! Restore cwp from before fill trap -- regs should now be consisent
+ wrpr %g5, %cwp ! Restore cwp from before fill trap -- regs should now be consistent
wrpr %g2, %g0, %tl ! Restore trap level -- we need to reuse it
set return_from_trap, %g4 ! XXX - need to set %g1 to tstate
set CTX_PRIMARY, %g7
@@ -4193,7 +4193,7 @@ syscall_setup:
/* see `lwp_trampoline' for the reason for this label */
return_from_syscall:
- wrpr %g0, PSTATE_KERN, %pstate ! Disable intterrupts
+ wrpr %g0, PSTATE_KERN, %pstate ! Disable interrupts
wrpr %g0, 0, %tl ! Return to tl==0
b return_from_trap
nop
@@ -4424,9 +4424,9 @@ sun4v_dev_mondo:
mov 0x3d8, %g1 ! Dev Mondo Queue Tail
ldxa [%g1] ASI_QUEUE, %g4 ! fetch index value
cmp %g2, %g4 ! head = queue?
- bne,pt %xcc, 2f ! unsually not the case
+ bne,pt %xcc, 2f ! unusually not the case
nop
- retry ! unlikely, ingnore interrupt
+ retry ! unlikely, ignore interrupt
2:
set CPUINFO_VA, %g3 ! fetch cpuinfo pa
ldx [%g3 + CI_PADDR], %g3 ! fetch intstack pa
@@ -5211,7 +5211,7 @@ rft_user:
/*
* The restore instruction further down may cause the trap level
- * to exceede the maximum trap level on sun4v, so a manual fill
+ * to exceed the maximum trap level on sun4v, so a manual fill
* may be necessary.
*/
@@ -7755,7 +7755,7 @@ ENTRY(savetstate)
nop
/*
- * Debug stuff. Resore trap registers from buffer.
+ * Debug stuff. Restore trap registers from buffer.
*
* %o0 = %tl
* %o1 = *ts
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.146 src/sys/dev/ic/aic7xxx.c:1.147
--- src/sys/dev/ic/aic7xxx.c:1.146 Mon May 23 19:52:35 2022
+++ src/sys/dev/ic/aic7xxx.c Mon Jun 27 22:41:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.146 2022/05/23 19:52:35 andvar Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.147 2022/06/27 22:41:29 andvar Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.146 2022/05/23 19:52:35 andvar Exp $
+ * $Id: aic7xxx.c,v 1.147 2022/06/27 22:41:29 andvar Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.146 2022/05/23 19:52:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.147 2022/06/27 22:41:29 andvar Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -3556,7 +3556,7 @@ ahc_handle_msg_reject(struct ahc_softc *
}
/*
- * Process an ingnore wide residue message.
+ * Process an ignore wide residue message.
*/
static void
ahc_handle_ign_wide_residue(struct ahc_softc *ahc,
@@ -5942,7 +5942,7 @@ ahc_reset_channel(struct ahc_softc *ahc,
* we have run out of ATIO resources to drain that
* queue, we may not get them all out here. Further,
* the blocked transactions for the reset channel
- * should just be killed off, irrespecitve of whether
+ * should just be killed off, irrespective of whether
* we are blocked on ATIO resources. Write a routine
* to compact the tqinfifo appropriately.
*/
Index: src/sys/dev/microcode/aic7xxx/aic79xx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.16 src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.17
--- src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.16 Tue Jan 25 22:01:34 2022
+++ src/sys/dev/microcode/aic7xxx/aic79xx.seq Mon Jun 27 22:41:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.seq,v 1.16 2022/01/25 22:01:34 andvar Exp $ */
+/* $NetBSD: aic79xx.seq,v 1.17 2022/06/27 22:41:29 andvar Exp $ */
/*
* Adaptec U320 device driver firmware for Linux and FreeBSD.
@@ -1020,7 +1020,7 @@ mesgin_complete:
complete_accepted:
/*
- * See if we attempted to deliver a message but the target ingnored us.
+ * See if we attempted to deliver a message but the target ignored us.
*/
test SCB_CONTROL, MK_MESSAGE jz complete_nomsg;
SET_SEQINTCODE(MKMSG_FAILED)
Index: src/sys/dev/microcode/aic7xxx/aic7xxx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.22 src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.23
--- src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.22 Tue Jan 25 22:01:34 2022
+++ src/sys/dev/microcode/aic7xxx/aic7xxx.seq Mon Jun 27 22:41:29 2022
@@ -40,7 +40,7 @@
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.seq,v 1.123 2003/01/20 20:44:55 gibbs Exp $
*/
-VERSION = "$NetBSD: aic7xxx.seq,v 1.22 2022/01/25 22:01:34 andvar Exp $"
+VERSION = "$NetBSD: aic7xxx.seq,v 1.23 2022/06/27 22:41:29 andvar Exp $"
PATCH_ARG_LIST = "struct ahc_softc *ahc"
PREFIX = "ahc_"
@@ -1648,7 +1648,7 @@ mesgin_complete:
complete_accepted:
/*
- * See if we attempted to deliver a message but the target ingnored us.
+ * See if we attempted to deliver a message but the target ignored us.
*/
test SCB_CONTROL, MK_MESSAGE jz . + 2;
mvi MKMSG_FAILED call set_seqint;
