Module Name: src
Committed By: msaitoh
Date: Fri Dec 27 08:22:50 UTC 2019
Modified Files:
src/sys/arch/arm/xscale: ixp425_if_npe.c
src/sys/arch/evbarm/dev: plcomreg.h
src/sys/arch/mmeye/dev: rtciic.c
src/sys/dev/pci: if_bnx.c
src/sys/dev/usb: if_urlreg.h
Log Message:
s/recive/receive/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/xscale/ixp425_if_npe.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/dev/plcomreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mmeye/dev/rtciic.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/if_urlreg.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/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.43 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.44
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.43 Sun Nov 10 21:16:24 2019
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Fri Dec 27 08:22:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.43 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.44 2019/12/27 08:22:49 msaitoh Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.43 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.44 2019/12/27 08:22:49 msaitoh Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -1112,7 +1112,7 @@ npeinit_macreg(struct npe_softc *sc)
/* Configure MAC to generate MDC clock */
WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_MDC_EN);
- /* Disable transmitter and reciver in the MAC */
+ /* Disable transmitter and receiver in the MAC */
WR4(sc, NPE_MAC_RX_CNTRL1,
RD4(sc, NPE_MAC_RX_CNTRL1) &~ NPE_RX_CNTRL1_RX_EN);
WR4(sc, NPE_MAC_TX_CNTRL1,
@@ -1188,7 +1188,7 @@ npeinit_locked(void *xsc)
ifp->if_flags &= ~IFF_OACTIVE;
ifp->if_timer = 0; /* just in case */
- /* Enable transmitter and reciver in the MAC */
+ /* Enable transmitter and receiver in the MAC */
WR4(sc, NPE_MAC_RX_CNTRL1,
RD4(sc, NPE_MAC_RX_CNTRL1) | NPE_RX_CNTRL1_RX_EN);
WR4(sc, NPE_MAC_TX_CNTRL1,
@@ -1367,7 +1367,7 @@ npestop(struct ifnet *ifp, int disable)
{
struct npe_softc *sc = ifp->if_softc;
- /* Disable transmitter and reciver in the MAC */
+ /* Disable transmitter and receiver in the MAC */
WR4(sc, NPE_MAC_RX_CNTRL1,
RD4(sc, NPE_MAC_RX_CNTRL1) &~ NPE_RX_CNTRL1_RX_EN);
WR4(sc, NPE_MAC_TX_CNTRL1,
Index: src/sys/arch/evbarm/dev/plcomreg.h
diff -u src/sys/arch/evbarm/dev/plcomreg.h:1.5 src/sys/arch/evbarm/dev/plcomreg.h:1.6
--- src/sys/arch/evbarm/dev/plcomreg.h:1.5 Wed Oct 24 21:23:45 2012
+++ src/sys/arch/evbarm/dev/plcomreg.h Fri Dec 27 08:22:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: plcomreg.h,v 1.5 2012/10/24 21:23:45 skrll Exp $ */
+/* $NetBSD: plcomreg.h,v 1.6 2019/12/27 08:22:50 msaitoh Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -91,7 +91,7 @@
/* flag register */
#define PL011_FR_RI 0x100 /* Ring Indicator */
#define PL01X_FR_TXFE 0x080 /* Transmit fifo empty */
-#define PL01X_FR_RXFF 0x040 /* Recive fifo full */
+#define PL01X_FR_RXFF 0x040 /* Receive fifo full */
#define PL01X_FR_TXFF 0x020 /* Transmit fifo full */
#define PL01X_FR_RXFE 0x010 /* Receive fifo empty */
#define PL01X_FR_BUSY 0x008 /* Uart Busy */
Index: src/sys/arch/mmeye/dev/rtciic.c
diff -u src/sys/arch/mmeye/dev/rtciic.c:1.2 src/sys/arch/mmeye/dev/rtciic.c:1.3
--- src/sys/arch/mmeye/dev/rtciic.c:1.2 Sun Dec 22 23:23:31 2019
+++ src/sys/arch/mmeye/dev/rtciic.c Fri Dec 27 08:22:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtciic.c,v 1.2 2019/12/22 23:23:31 thorpej Exp $ */
+/* $NetBSD: rtciic.c,v 1.3 2019/12/27 08:22:50 msaitoh Exp $ */
/*
* Copyright (c) 2011 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtciic.c,v 1.2 2019/12/22 23:23:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtciic.c,v 1.3 2019/12/27 08:22:50 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtciic.c,v 1
#define DPRINTF(x)
#endif
-#define RTCIIC_SDAR (1 << 3) /* recived serial data */
+#define RTCIIC_SDAR (1 << 3) /* received serial data */
#define RTCIIC_SDAW (1 << 2) /* sended serial data */
#define RTCIIC_SCL (1 << 1) /* serial clock */
#define RTCIIC_RW (1 << 0) /* data direction (0:write, 1:read) */
Index: src/sys/dev/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.88 src/sys/dev/pci/if_bnx.c:1.89
--- src/sys/dev/pci/if_bnx.c:1.88 Sun Nov 10 21:16:36 2019
+++ src/sys/dev/pci/if_bnx.c Fri Dec 27 08:22:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.88 2019/11/10 21:16:36 chs Exp $ */
+/* $NetBSD: if_bnx.c,v 1.89 2019/12/27 08:22:50 msaitoh Exp $ */
/* $OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.88 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.89 2019/12/27 08:22:50 msaitoh Exp $");
/*
* The following controllers are supported by this driver:
@@ -1327,7 +1327,7 @@ bnx_miibus_statchg(struct ifnet *ifp)
BNX_CLRBIT(sc, BNX_EMAC_TX_MODE, BNX_EMAC_TX_MODE_FLOW_EN);
}
- /* Only make changes if the recive mode has actually changed. */
+ /* Only make changes if the receive mode has actually changed. */
if (rx_mode != sc->rx_mode) {
DBPRINT(sc, BNX_VERBOSE, "Enabling new receive mode: 0x%08X\n",
rx_mode);
@@ -5638,7 +5638,7 @@ allmulti:
sort_mode |= BNX_RPM_SORT_USER0_MC_HSH_EN;
}
- /* Only make changes if the recive mode has actually changed. */
+ /* Only make changes if the receive mode has actually changed. */
if (rx_mode != sc->rx_mode) {
DBPRINT(sc, BNX_VERBOSE, "Enabling new receive mode: 0x%08X\n",
rx_mode);
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.14 src/sys/dev/usb/if_urlreg.h:1.15
--- src/sys/dev/usb/if_urlreg.h:1.14 Thu Aug 15 08:02:32 2019
+++ src/sys/dev/usb/if_urlreg.h Fri Dec 27 08:22:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.14 2019/08/15 08:02:32 mrg Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.15 2019/12/27 08:22:50 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <[email protected]>. All rights reserved.
@@ -120,7 +120,7 @@
#define URL_ANLP 0x146 /* Auto-negotiation link partner ability register */
-typedef uWord url_rxhdr_t; /* Recive Header */
+typedef uWord url_rxhdr_t; /* Receive Header */
#define URL_RXHDR_BYTEC_MASK (0x0fff) /* RX bytes count */
#define URL_RXHDR_VALID_MASK (0x1000) /* Valid packet */
#define URL_RXHDR_RUNTPKT_MASK (0x2000) /* Runt packet */
