Module Name: src
Committed By: andvar
Date: Thu Mar 24 08:08:05 UTC 2022
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_reg.h
src/sys/arch/arm/sociox: sni_i2c.c
src/sys/dev/ic: igpio.c
src/sys/dev/pci: virtiovar.h
Log Message:
s/interupt/interrupt/ in comments.
also add missing RCS ID in bcm53xx_reg.h and fix one more typo in there.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm53xx_reg.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/sociox/sni_i2c.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/igpio.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/virtiovar.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/broadcom/bcm53xx_reg.h
diff -u src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.18 src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.19
--- src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.18 Sat May 18 08:49:23 2019
+++ src/sys/arch/arm/broadcom/bcm53xx_reg.h Thu Mar 24 08:08:04 2022
@@ -1,3 +1,5 @@
+/* $NetBSD: bcm53xx_reg.h,v 1.19 2022/03/24 08:08:04 andvar Exp $ */
+
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -731,7 +733,7 @@ struct gmac_txdb {
};
#define TXDB_FLAG_SF __BIT(31) // Start oF Frame
#define TXDB_FLAG_EF __BIT(30) // End oF Frame
-#define TXDB_FLAG_IC __BIT(29) // Interrupt on Completetion
+#define TXDB_FLAG_IC __BIT(29) // Interrupt on Completion
#define TXDB_FLAG_ET __BIT(28) // End Of Table
struct gmac_rxdb {
@@ -742,7 +744,7 @@ struct gmac_rxdb {
};
#define RXDB_FLAG_SF __BIT(31) // Start oF Frame (ignored)
#define RXDB_FLAG_EF __BIT(30) // End oF Frame (ignored)
-#define RXDB_FLAG_IC __BIT(29) // Interupt on Completetion
+#define RXDB_FLAG_IC __BIT(29) // Interrupt on Completion
#define RXDB_FLAG_ET __BIT(28) // End Of Table
#define RXSTS_FRAMELEN __BITS(15,0) // # of bytes (including padding)
Index: src/sys/arch/arm/sociox/sni_i2c.c
diff -u src/sys/arch/arm/sociox/sni_i2c.c:1.14 src/sys/arch/arm/sociox/sni_i2c.c:1.15
--- src/sys/arch/arm/sociox/sni_i2c.c:1.14 Wed Dec 22 02:32:53 2021
+++ src/sys/arch/arm/sociox/sni_i2c.c Thu Mar 24 08:08:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sni_i2c.c,v 1.14 2021/12/22 02:32:53 nisimura Exp $ */
+/* $NetBSD: sni_i2c.c,v 1.15 2022/03/24 08:08:05 andvar Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sni_i2c.c,v 1.14 2021/12/22 02:32:53 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sni_i2c.c,v 1.15 2022/03/24 08:08:05 andvar Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: sni_i2c.c,v
#define BCR_MSS (1U<<4) /* 1: xmit, 0: recv */
#define BCR_ACK (1U<<3) /* make acknowledge at last byte */
#define BCR_GCAA (1U<<2) /* ??? general call access ack */
-#define BCR_IEN (1U<<1) /* enable interupt */
+#define BCR_IEN (1U<<1) /* enable interrupt */
#define BCR_INT (1U<<0) /* interrupt report; W0C */
#define CCR 0x08
#define CCR_FM (1U<<6) /* speed; 1: fast, 0: standard */
Index: src/sys/dev/ic/igpio.c
diff -u src/sys/dev/ic/igpio.c:1.1 src/sys/dev/ic/igpio.c:1.2
--- src/sys/dev/ic/igpio.c:1.1 Thu Mar 24 02:24:25 2022
+++ src/sys/dev/ic/igpio.c Thu Mar 24 08:08:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: igpio.c,v 1.1 2022/03/24 02:24:25 manu Exp $ */
+/* $NetBSD: igpio.c,v 1.2 2022/03/24 08:08:05 andvar Exp $ */
/*
* Copyright (c) 2021,2022 Emmanuel Dreyfus
@@ -768,7 +768,7 @@ igpio_intr(void *priv)
enabled = bus_space_read_4(sc->sc_bst, bsh, ie_reg);
/*
- * find pins for which interupt is pending
+ * find pins for which interrupt is pending
* and enabled
*/
pending = raised & enabled;
Index: src/sys/dev/pci/virtiovar.h
diff -u src/sys/dev/pci/virtiovar.h:1.23 src/sys/dev/pci/virtiovar.h:1.24
--- src/sys/dev/pci/virtiovar.h:1.23 Thu Oct 28 01:36:43 2021
+++ src/sys/dev/pci/virtiovar.h Thu Mar 24 08:08:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: virtiovar.h,v 1.23 2021/10/28 01:36:43 yamaguchi Exp $ */
+/* $NetBSD: virtiovar.h,v 1.24 2022/03/24 08:08:05 andvar Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -180,7 +180,7 @@ struct virtio_softc;
#endif
-/* interupt types, stored in virtio_softc->sc_flags */
+/* interrupt types, stored in virtio_softc->sc_flags */
#define VIRTIO_F_INTR_MPSAFE (1 << 0)
#define VIRTIO_F_INTR_SOFTINT (1 << 1)
#define VIRTIO_F_INTR_MSIX (1 << 2)
