Module Name: src
Committed By: andvar
Date: Fri Aug 13 20:47:55 UTC 2021
Modified Files:
src/common/lib/libc/arch/sparc64/string: memset.S
src/sbin/ifconfig: ieee80211.c
src/sys/arch/mips/ralink: ralink_reg.h
src/sys/arch/powerpc/include: reg.h
src/sys/ddb: db_command.c
src/sys/dev/ic: aic79xx_inline.h dc21040reg.h
src/sys/dev/usb: xhci.c
src/sys/netinet: tcp_vtw.c
Log Message:
fix typos in words "pointer" and s/fram /frame/
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sparc64/string/memset.S
cvs rdiff -u -r1.30 -r1.31 src/sbin/ifconfig/ieee80211.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/ralink/ralink_reg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/reg.h
cvs rdiff -u -r1.176 -r1.177 src/sys/ddb/db_command.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/aic79xx_inline.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/dc21040reg.h
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netinet/tcp_vtw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/sparc64/string/memset.S
diff -u src/common/lib/libc/arch/sparc64/string/memset.S:1.2 src/common/lib/libc/arch/sparc64/string/memset.S:1.3
--- src/common/lib/libc/arch/sparc64/string/memset.S:1.2 Sun Mar 17 02:12:41 2013
+++ src/common/lib/libc/arch/sparc64/string/memset.S Fri Aug 13 20:47:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.2 2013/03/17 02:12:41 christos Exp $ */
+/* $NetBSD: memset.S,v 1.3 2021/08/13 20:47:54 andvar Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -25,7 +25,7 @@
*/
#include "strmacros.h"
#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: memset.S,v 1.2 2013/03/17 02:12:41 christos Exp $")
+RCSID("$NetBSD: memset.S,v 1.3 2021/08/13 20:47:54 andvar Exp $")
#endif /* LIBC_SCCS and not lint */
@@ -120,7 +120,7 @@ Lmemset_cleanup:
stb %o1, [%o0] ! *addr = 0;
Lmemset_done:
retl
- mov %o4, %o0 ! Restore ponter for memset (ugh)
+ mov %o4, %o0 ! Restore pointer for memset (ugh)
#ifdef USE_BLOCK_STORE_LOAD
Lmemset_block:
Index: src/sbin/ifconfig/ieee80211.c
diff -u src/sbin/ifconfig/ieee80211.c:1.30 src/sbin/ifconfig/ieee80211.c:1.31
--- src/sbin/ifconfig/ieee80211.c:1.30 Fri Aug 16 10:33:17 2019
+++ src/sbin/ifconfig/ieee80211.c Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.c,v 1.30 2019/08/16 10:33:17 msaitoh Exp $ */
+/* $NetBSD: ieee80211.c,v 1.31 2021/08/13 20:47:55 andvar Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ieee80211.c,v 1.30 2019/08/16 10:33:17 msaitoh Exp $");
+__RCSID("$NetBSD: ieee80211.c,v 1.31 2021/08/13 20:47:55 andvar Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -531,7 +531,7 @@ ieee80211_statistics(prop_dictionary_t e
STAT_PRINT(is_rx_badsubtype, "rx frame w/ unknown subtyp");
STAT_PRINT(is_rx_nobuf, "rx failed for lack of buf");
STAT_PRINT(is_rx_decryptcrc, "rx decrypt failed on crc");
- STAT_PRINT(is_rx_ahdemo_mgt, "rx discard ahdemo mgt fram");
+ STAT_PRINT(is_rx_ahdemo_mgt, "rx discard ahdemo mgt frame");
STAT_PRINT(is_rx_bad_auth, "rx bad auth request");
STAT_PRINT(is_rx_unauth, "rx on unauthorized port");
STAT_PRINT(is_rx_badkeyid, "rx w/ incorrect keyid");
Index: src/sys/arch/mips/ralink/ralink_reg.h
diff -u src/sys/arch/mips/ralink/ralink_reg.h:1.9 src/sys/arch/mips/ralink/ralink_reg.h:1.10
--- src/sys/arch/mips/ralink/ralink_reg.h:1.9 Wed Oct 5 15:54:58 2016
+++ src/sys/arch/mips/ralink/ralink_reg.h Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_reg.h,v 1.9 2016/10/05 15:54:58 ryo Exp $ */
+/* $NetBSD: ralink_reg.h,v 1.10 2021/08/13 20:47:55 andvar Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -725,7 +725,7 @@ enum ralink_irq {
#define RA_FE_TX_BASE_PTR_0 0x800 /* TX Ring #0 Base Pointer */
#define RA_FE_TX_MAX_CNT_0 0x804 /* TX Ring #0 Maximum Count */
#define RA_FE_TX_CTX_IDX_0 0x808 /* TX Ring #0 CPU pointer */
-#define RA_FE_TX_DTX_IDX_0 0x80c /* TX Ring #0 DMA poitner */
+#define RA_FE_TX_DTX_IDX_0 0x80c /* TX Ring #0 DMA pointer */
#define RA_FE_PDMA_TX0_PTR RA_FE_TX_BASE_PTR_0
#define RA_FE_PDMA_TX0_COUNT RA_FE_TX_MAX_CNT_0
#define RA_FE_PDMA_TX0_CPU_IDX RA_FE_TX_CTX_IDX_0
@@ -733,19 +733,19 @@ enum ralink_irq {
#define RA_FE_TX_BASE_PTR_1 0x810 /* TX Ring #1 Base Pointer */
#define RA_FE_TX_MAX_CNT_1 0x814 /* TX Ring #1 Maximum Count */
#define RA_FE_TX_CTX_IDX_1 0x818 /* TX Ring #1 CPU pointer */
-#define RA_FE_TX_DTX_IDX_1 0x81c /* TX Ring #1 DMA poitner */
+#define RA_FE_TX_DTX_IDX_1 0x81c /* TX Ring #1 DMA pointer */
#define RA_FE_TX_BASE_PTR_2 0x820 /* TX Ring #2 Base Pointer */
#define RA_FE_TX_MAX_CNT_2 0x824 /* TX Ring #2 Maximum Count */
#define RA_FE_TX_CTX_IDX_2 0x828 /* TX Ring #2 CPU pointer */
-#define RA_FE_TX_DTX_IDX_2 0x82c /* TX Ring #2 DMA poitner */
+#define RA_FE_TX_DTX_IDX_2 0x82c /* TX Ring #2 DMA pointer */
#define RA_FE_TX_BASE_PTR_3 0x830 /* TX Ring #3 Base Pointer */
#define RA_FE_TX_MAX_CNT_3 0x834 /* TX Ring #3 Maximum Count */
#define RA_FE_TX_CTX_IDX_3 0x838 /* TX Ring #3 CPU pointer */
-#define RA_FE_TX_DTX_IDX_3 0x83c /* TX Ring #3 DMA poitner */
+#define RA_FE_TX_DTX_IDX_3 0x83c /* TX Ring #3 DMA pointer */
#define RA_FE_RX_BASE_PTR_0 0x900 /* RX Ring #0 Base Pointer */
#define RA_FE_RX_MAX_CNT_0 0x904 /* RX Ring #0 Maximum Count */
#define RA_FE_RX_CRX_IDX_0 0x908 /* RX Ring #0 CPU pointer */
-#define RA_FE_RX_DRX_IDX_0 0x90c /* RX Ring #0 DMA poitner */
+#define RA_FE_RX_DRX_IDX_0 0x90c /* RX Ring #0 DMA pointer */
#define RA_FE_PDMA_RX0_PTR RA_FE_RX_BASE_PTR_0
#define RA_FE_PDMA_RX0_COUNT RA_FE_RX_MAX_CNT_0
#define RA_FE_PDMA_RX0_CPU_IDX RA_FE_RX_CRX_IDX_0
@@ -753,7 +753,7 @@ enum ralink_irq {
#define RA_FE_RX_BASE_PTR_1 0x910 /* RX Ring #1 Base Pointer */
#define RA_FE_RX_MAX_CNT_1 0x914 /* RX Ring #1 Maximum Count */
#define RA_FE_RX_CRX_IDX_1 0x918 /* RX Ring #1 CPU pointer */
-#define RA_FE_RX_DRX_IDX_1 0x91c /* RX Ring #1 DMA poitner */
+#define RA_FE_RX_DRX_IDX_1 0x91c /* RX Ring #1 DMA pointer */
#define RA_FE_PDMA_INFO 0xa00 /* PDMA Information */
#define RA_FE_PDMA_GLOBAL_CFG 0xa04 /* PDMA Global Configuration */
#define RA_FE_DELAY_INT_CFG 0xa0c /* Delay Interrupt Configuration */
Index: src/sys/arch/powerpc/include/reg.h
diff -u src/sys/arch/powerpc/include/reg.h:1.13 src/sys/arch/powerpc/include/reg.h:1.14
--- src/sys/arch/powerpc/include/reg.h:1.13 Thu Aug 12 20:53:18 2021
+++ src/sys/arch/powerpc/include/reg.h Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: reg.h,v 1.13 2021/08/12 20:53:18 andvar Exp $ */
+/* $NetBSD: reg.h,v 1.14 2021/08/13 20:47:55 andvar Exp $ */
#ifndef _POWERPC_REG_H_
#define _POWERPC_REG_H_
@@ -8,7 +8,7 @@
*
* Register Usage
* r0 Volatile register which may be modified during function linkage
- * r1 Stack fram pointer, always valid
+ * r1 Stack frame pointer, always valid
* r2 System-reserved register
* r3-r4 Volatile registers used for parameter passing and return values
* r5-r10 Volatile registers used for parameter passing
@@ -29,12 +29,12 @@
*
* Register Usage
* r0 Volatile register which may be modified during function linkage
- * r1 Stack fram pointer, always valid
+ * r1 Stack frame pointer, always valid
* r2 TOC pointer
* r3 Volatile register used for parameter passing and return value
* r4-r10 Volatile registers used for parameter passing
* r11 Volatile register used in calls by pointer and as an
- * environment pointr for languages which require one
+ * environment pointer for languages which require one
* r12 Volatile register used for exception handling and glink code
* r13 Reserved for use as system thread ID
*
Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.176 src/sys/ddb/db_command.c:1.177
--- src/sys/ddb/db_command.c:1.176 Tue Feb 23 07:13:53 2021
+++ src/sys/ddb/db_command.c Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.176 2021/02/23 07:13:53 mrg Exp $ */
+/* $NetBSD: db_command.c,v 1.177 2021/08/13 20:47:55 andvar Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.176 2021/02/23 07:13:53 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.177 2021/08/13 20:47:55 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -479,7 +479,7 @@ db_init_commands(void)
* Add command table to the specified list
* Arg:
* int type specifies type of command table DDB_SHOW_CMD|DDB_BASE_CMD|DDB_MAC_CMD
- * *cmd_tbl poiter to static allocated db_command table
+ * *cmd_tbl pointer to static allocated db_command table
*
* Command table must be NULL terminated array of struct db_command
*/
Index: src/sys/dev/ic/aic79xx_inline.h
diff -u src/sys/dev/ic/aic79xx_inline.h:1.23 src/sys/dev/ic/aic79xx_inline.h:1.24
--- src/sys/dev/ic/aic79xx_inline.h:1.23 Sat Feb 8 08:23:01 2020
+++ src/sys/dev/ic/aic79xx_inline.h Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_inline.h,v 1.23 2020/02/08 08:23:01 msaitoh Exp $ */
+/* $NetBSD: aic79xx_inline.h,v 1.24 2021/08/13 20:47:55 andvar Exp $ */
/*
* Inline routines shareable across OS platforms.
@@ -284,7 +284,7 @@ static __inline void
ahd_setup_data_scb(struct ahd_softc *ahd, struct scb *scb)
{
/*
- * Copy the first SG into the "current" data ponter area.
+ * Copy the first SG into the "current" data pointer area.
*/
if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0) {
struct ahd_dma64_seg *sg;
Index: src/sys/dev/ic/dc21040reg.h
diff -u src/sys/dev/ic/dc21040reg.h:1.19 src/sys/dev/ic/dc21040reg.h:1.20
--- src/sys/dev/ic/dc21040reg.h:1.19 Sun Dec 11 12:21:26 2005
+++ src/sys/dev/ic/dc21040reg.h Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dc21040reg.h,v 1.19 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: dc21040reg.h,v 1.20 2021/08/13 20:47:55 andvar Exp $ */
/*-
* Copyright (c) 1994, 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -152,7 +152,7 @@ typedef struct {
#define TULIP_STS_ABNRMLINTR 0x00008000L /* (RW) Abnormal Interrupt */
#define TULIP_STS_SYSERROR 0x00002000L /* (RW) System Error */
#define TULIP_STS_LINKFAIL 0x00001000L /* (RW) Link Failure (21040) */
-#define TULIP_STS_FULDPLXSHRT 0x00000800L /* (RW) Full Duplex Short Fram Rcvd (21040) */
+#define TULIP_STS_FULDPLXSHRT 0x00000800L /* (RW) Full Duplex Short Frame Rcvd (21040) */
#define TULIP_STS_GPTIMEOUT 0x00000800L /* (RW) General Purpose Timeout (21140) */
#define TULIP_STS_AUI 0x00000400L /* (RW) AUI/TP Switch (21040) */
#define TULIP_STS_RXTIMEOUT 0x00000200L /* (RW) Receive Watchdog Timeout */
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.146 src/sys/dev/usb/xhci.c:1.147
--- src/sys/dev/usb/xhci.c:1.146 Sat Jun 12 13:58:05 2021
+++ src/sys/dev/usb/xhci.c Fri Aug 13 20:47:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.146 2021/06/12 13:58:05 riastradh Exp $ */
+/* $NetBSD: xhci.c,v 1.147 2021/08/13 20:47:55 andvar Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.146 2021/06/12 13:58:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.147 2021/08/13 20:47:55 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1958,7 +1958,7 @@ xhci_stop_endpoint(struct usbd_pipe *pip
* Set TR Dequeue Pointer.
* xHCI 1.1 4.6.10 6.4.3.9
* Purge all of the TRBs on ring and reinitialize ring.
- * Set TR dequeue Pointr to 0 and Cycle State to 1.
+ * Set TR dequeue Pointer to 0 and Cycle State to 1.
* EPSTATE of endpoint must be ERROR or STOPPED, otherwise CONTEXT_STATE
* error will be generated.
*/
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.20 src/sys/netinet/tcp_vtw.c:1.21
--- src/sys/netinet/tcp_vtw.c:1.20 Tue Oct 1 18:00:09 2019
+++ src/sys/netinet/tcp_vtw.c Fri Aug 13 20:47:55 2021
@@ -121,7 +121,7 @@
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.20 2019/10/01 18:00:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.21 2021/08/13 20:47:55 andvar Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
@@ -1447,7 +1447,7 @@ vtw_alloc(vtw_ctl_t *ctl)
return 0;
}
- /* Advance allocation poiter.
+ /* Advance allocation pointer.
*/
ctl->alloc.v = vtw_next(ctl, vtw);
