Module Name: src
Committed By: msaitoh
Date: Tue Jun 4 10:15:22 UTC 2019
Modified Files:
src/sys/dev/ic: aic7xxx.c
src/sys/dev/microcode/aic7xxx: aic79xx.seq aic7xxx.seq
src/sys/dev/usb: umcs.h
src/sys/netinet: dccp_tcplike.c dccp_tcplike.h dccp_tfrc.c dccp_tfrc.h
Log Message:
Fix typo (s/recevie/receive/).
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/aic7xxx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/microcode/aic7xxx/aic79xx.seq
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/microcode/aic7xxx/aic7xxx.seq
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/umcs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/dccp_tcplike.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/dccp_tcplike.h \
src/sys/netinet/dccp_tfrc.h
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/dccp_tfrc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.135 src/sys/dev/ic/aic7xxx.c:1.136
--- src/sys/dev/ic/aic7xxx.c:1.135 Mon Feb 4 10:09:31 2019
+++ src/sys/dev/ic/aic7xxx.c Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh 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.135 2019/02/04 10:09:31 mrg Exp $
+ * $Id: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -1107,7 +1107,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc
printf("\tCRC Value Mismatch\n");
if ((sstat2 & CRCENDERR) != 0)
printf("\tNo terminal CRC packet "
- "recevied\n");
+ "received\n");
if ((sstat2 & CRCREQERR) != 0)
printf("\tIllegal CRC packet "
"request\n");
Index: src/sys/dev/microcode/aic7xxx/aic79xx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.11 src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.12
--- src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.11 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/microcode/aic7xxx/aic79xx.seq Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.seq,v 1.11 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: aic79xx.seq,v 1.12 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Adaptec U320 device driver firmware for Linux and FreeBSD.
@@ -1012,7 +1012,7 @@ mesgin_complete:
test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
/*
- * If we recevied good status but never successfully sent the
+ * If we received good status but never successfully sent the
* cdb, abort the command.
*/
test SCB_SCSI_STATUS,0xff jnz complete_accepted;
Index: src/sys/dev/microcode/aic7xxx/aic7xxx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.19 src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.20
--- src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.19 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/microcode/aic7xxx/aic7xxx.seq Tue Jun 4 10:15:22 2019
@@ -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.19 2014/10/18 08:33:28 snj Exp $"
+VERSION = "$NetBSD: aic7xxx.seq,v 1.20 2019/06/04 10:15:22 msaitoh Exp $"
PATCH_ARG_LIST = "struct ahc_softc *ahc"
PREFIX = "ahc_"
@@ -1640,7 +1640,7 @@ mesgin_complete:
test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
/*
- * If we recevied good status but never successfully sent the
+ * If we received good status but never successfully sent the
* cdb, abort the command.
*/
test SCB_SCSI_STATUS,0xff jnz complete_accepted;
Index: src/sys/dev/usb/umcs.h
diff -u src/sys/dev/usb/umcs.h:1.1 src/sys/dev/usb/umcs.h:1.2
--- src/sys/dev/usb/umcs.h:1.1 Sun Mar 16 09:34:45 2014
+++ src/sys/dev/usb/umcs.h Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.h,v 1.1 2014/03/16 09:34:45 martin Exp $ */
+/* $NetBSD: umcs.h,v 1.2 2019/06/04 10:15:22 msaitoh Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 252123 2013-06-23 20:19:51Z thomas $ */
/*-
@@ -170,7 +170,7 @@
#define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the
* Bulk-In FIFO, default = 0 */
#define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART,
- * which were recevied with
+ * which were received with
* errors, default = 0 */
#define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */
#define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */
@@ -564,9 +564,9 @@
#define MCS7840_UART_ISR_NOPENDING 0x01 /* No interrupt pending */
#define MCS7840_UART_ISR_INTMASK 0x3f /* Mask to select interrupt
* source */
-#define MCS7840_UART_ISR_RXERR 0x06 /* Recevir error */
-#define MCS7840_UART_ISR_RXHASDATA 0x04 /* Recevier has data */
-#define MCS7840_UART_ISR_RXTIMEOUT 0x0c /* Recevier timeout */
+#define MCS7840_UART_ISR_RXERR 0x06 /* Receive error */
+#define MCS7840_UART_ISR_RXHASDATA 0x04 /* Receiver has data */
+#define MCS7840_UART_ISR_RXTIMEOUT 0x0c /* Receiver timeout */
#define MCS7840_UART_ISR_TXEMPTY 0x02 /* Transmitter empty */
#define MCS7840_UART_ISR_MSCHANGE 0x00 /* Modem status change */
Index: src/sys/netinet/dccp_tcplike.c
diff -u src/sys/netinet/dccp_tcplike.c:1.3 src/sys/netinet/dccp_tcplike.c:1.4
--- src/sys/netinet/dccp_tcplike.c:1.3 Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/dccp_tcplike.c Tue Jun 4 10:15:22 2019
@@ -1,5 +1,5 @@
/* $KAME: dccp_tcplike.c,v 1.19 2005/07/27 06:27:25 nishida Exp $ */
-/* $NetBSD: dccp_tcplike.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $ */
+/* $NetBSD: dccp_tcplike.c,v 1.4 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Copyright (c) 2003 Magnus Erixzon
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.4 2019/06/04 10:15:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dccp.h"
@@ -888,7 +888,7 @@ void tcplike_recv_term(void *ccb)
}
/* Free the receiver side
- * args: ccb - ccb of recevier
+ * args: ccb - ccb of receiver
*/
void
tcplike_recv_free(void *ccb)
Index: src/sys/netinet/dccp_tcplike.h
diff -u src/sys/netinet/dccp_tcplike.h:1.2 src/sys/netinet/dccp_tcplike.h:1.3
--- src/sys/netinet/dccp_tcplike.h:1.2 Thu Jul 7 06:55:43 2016
+++ src/sys/netinet/dccp_tcplike.h Tue Jun 4 10:15:22 2019
@@ -1,5 +1,5 @@
/* $KAME: dccp_tcplike.h,v 1.10 2005/07/22 09:31:14 nishida Exp $ */
-/* $NetBSD: dccp_tcplike.h,v 1.2 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: dccp_tcplike.h,v 1.3 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Copyright (c) 2003 Magnus Erixzon
@@ -150,7 +150,7 @@ void *tcplike_recv_init(struct dccpcb *)
/*
* Free the receiver side
- * args: ccb - ccb of recevier
+ * args: ccb - ccb of receiver
*/
void tcplike_recv_free(void *);
Index: src/sys/netinet/dccp_tfrc.h
diff -u src/sys/netinet/dccp_tfrc.h:1.2 src/sys/netinet/dccp_tfrc.h:1.3
--- src/sys/netinet/dccp_tfrc.h:1.2 Thu Jul 7 06:55:43 2016
+++ src/sys/netinet/dccp_tfrc.h Tue Jun 4 10:15:22 2019
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.h,v 1.10 2005/10/26 11:36:49 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.h,v 1.2 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: dccp_tfrc.h,v 1.3 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -231,7 +231,7 @@ struct tfrc_recv_ccb {
void *tfrc_recv_init(struct dccpcb *);
/* Free the receiver side
- * args: ccb - ccb of recevier
+ * args: ccb - ccb of receiver
*/
void tfrc_recv_free(void *);
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.4 src/sys/netinet/dccp_tfrc.c:1.5
--- src/sys/netinet/dccp_tfrc.c:1.4 Thu Jul 7 06:55:43 2016
+++ src/sys/netinet/dccp_tfrc.c Tue Jun 4 10:15:22 2019
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.c,v 1.4 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: dccp_tfrc.c,v 1.5 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.4 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.5 2019/06/04 10:15:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dccp.h"
@@ -1637,7 +1637,7 @@ tfrc_recv_init(struct dccpcb * pcb)
return ccb;
}
/* Free the receiver side
- * args: ccb - ccb of recevier
+ * args: ccb - ccb of receiver
* Tested u:OK
*/
void
