Module Name: src
Committed By: msaitoh
Date: Sat Nov 6 06:52:48 UTC 2021
Modified Files:
src/sys/dev/ic: mfi.c mfireg.h
src/sys/dev/pci/qat: qat.c
src/sys/dev/tc: tcdsreg.h
Log Message:
s/allign/align/
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/qat/qat.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/tc/tcdsreg.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/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.65 src/sys/dev/ic/mfi.c:1.66
--- src/sys/dev/ic/mfi.c:1.65 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/ic/mfi.c Sat Nov 6 06:52:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.65 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: mfi.c,v 1.66 2021/11/06 06:52:48 msaitoh Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.65 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.66 2021/11/06 06:52:48 msaitoh Exp $");
#include "bio.h"
@@ -1065,7 +1065,7 @@ mfi_attach(struct mfi_softc *sc, enum mf
if (sc->sc_ioptype == MFI_IOP_TBOLT) {
uint32_t tb_mem_size;
/* for Alignment */
- tb_mem_size = MEGASAS_THUNDERBOLT_MSG_ALLIGNMENT;
+ tb_mem_size = MEGASAS_THUNDERBOLT_MSG_ALIGNMENT;
tb_mem_size +=
MEGASAS_THUNDERBOLT_NEW_MSG_SIZE * (sc->sc_max_cmds + 1);
Index: src/sys/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.11 src/sys/dev/ic/mfireg.h:1.12
--- src/sys/dev/ic/mfireg.h:1.11 Sat Jul 24 21:31:37 2021
+++ src/sys/dev/ic/mfireg.h Sat Nov 6 06:52:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.11 2021/07/24 21:31:37 andvar Exp $ */
+/* $NetBSD: mfireg.h,v 1.12 2021/11/06 06:52:48 msaitoh Exp $ */
/* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -159,7 +159,7 @@
*/
#define MR_COMMAND_SIZE (MFI_FRAME_SIZE*20) /* 1280 bytes */
-#define MEGASAS_THUNDERBOLT_MSG_ALLIGNMENT 256
+#define MEGASAS_THUNDERBOLT_MSG_ALIGNMENT 256
/*
* We are defining only 128 byte message to reduce memory move over head
* and also it will reduce the SRB extension size by 128byte compared with
Index: src/sys/dev/pci/qat/qat.c
diff -u src/sys/dev/pci/qat/qat.c:1.6 src/sys/dev/pci/qat/qat.c:1.7
--- src/sys/dev/pci/qat/qat.c:1.6 Sun Jun 14 23:23:12 2020
+++ src/sys/dev/pci/qat/qat.c Sat Nov 6 06:52:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qat.c,v 1.6 2020/06/14 23:23:12 riastradh Exp $ */
+/* $NetBSD: qat.c,v 1.7 2021/11/06 06:52:48 msaitoh Exp $ */
/*
* Copyright (c) 2019 Internet Initiative Japan, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qat.c,v 1.6 2020/06/14 23:23:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qat.c,v 1.7 2021/11/06 06:52:48 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1051,7 +1051,7 @@ qat_etr_setup_ring(struct qat_softc *sc,
qr->qr_ring_size = qat_etr_verify_ring_size(msg_size, num_msgs);
/*
- * To make sure that ring is alligned to ring size allocate
+ * To make sure that ring is aligned to ring size allocate
* at least 4k and then tell the user it is smaller.
*/
ring_size_bytes = QAT_SIZE_TO_RING_SIZE_IN_BYTES(qr->qr_ring_size);
Index: src/sys/dev/tc/tcdsreg.h
diff -u src/sys/dev/tc/tcdsreg.h:1.7 src/sys/dev/tc/tcdsreg.h:1.8
--- src/sys/dev/tc/tcdsreg.h:1.7 Sun Dec 11 12:24:00 2005
+++ src/sys/dev/tc/tcdsreg.h Sat Nov 6 06:52:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdsreg.h,v 1.7 2005/12/11 12:24:00 christos Exp $ */
+/* $NetBSD: tcdsreg.h,v 1.8 2021/11/06 06:52:48 msaitoh Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -197,14 +197,14 @@ void tcds_scsi_reset(int);
#define KN15AA_REG_SCSI_IMER (KN15AA_SYS_SCSI + 0x80008)
-/* these are the bits that were unalligned at the beginning of the DMA */
+/* these are the bits that were unaligned at the beginning of the DMA */
#define KN15AA_REG_SCSI_DUDB0 (KN15AA_SYS_SCSI + 0x82010)
#define KN15AA_REG_SCSI_DUDB1 (KN15AA_SYS_SCSI + 0x82210)
# define SCSI_DUDB_MASK01 0x00000001 /* Mask bit for byte[01] */
# define SCSI_DUDB_MASK10 0x00000002 /* Mask bit for byte[10] */
# define SCSI_DUDB_MASK11 0x00000004 /* Mask bit for byte[11] */
-/* these are the bits that were unalligned at the end of the DMA */
+/* these are the bits that were unaligned at the end of the DMA */
#define KN15AA_REG_SCSI_DUDE0 (KN15AA_SYS_SCSI + 0x82018)
#define KN15AA_REG_SCSI_DUDE1 (KN15AA_SYS_SCSI + 0x82218)
# define SCSI_DUDE_MASK00 0x1000000 /* Mask bit for byte[00] */
