Module Name: src
Committed By: andvar
Date: Mon May 23 21:46:12 UTC 2022
Modified Files:
src/sys/arch/arm/marvell: mvsoc_space.c
src/sys/arch/arm/s3c2xx0: s3c24x0_lcd.h s3c24x0reg.h s3c2800reg.h
src/sys/arch/hpcmips/conf: files.hpcmips
src/sys/arch/hppa/gsc: gsckbc.c
src/sys/arch/mips/cavium/dev: octeon_gmxreg.h
src/sys/net: if_pppoe.c
src/tests/lib/libc/gen/posix_spawn: t_spawnattr.c
src/usr.sbin/sysinst: mbr.c
Log Message:
s/controll/control/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/marvell/mvsoc_space.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/s3c2xx0/s3c24x0reg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/s3c2800reg.h
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/hpcmips/conf/files.hpcmips
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/gsc/gsckbc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/dev/octeon_gmxreg.h
cvs rdiff -u -r1.180 -r1.181 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/mbr.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/arch/arm/marvell/mvsoc_space.c
diff -u src/sys/arch/arm/marvell/mvsoc_space.c:1.11 src/sys/arch/arm/marvell/mvsoc_space.c:1.12
--- src/sys/arch/arm/marvell/mvsoc_space.c:1.11 Mon Aug 30 00:04:30 2021
+++ src/sys/arch/arm/marvell/mvsoc_space.c Mon May 23 21:46:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_space.c,v 1.11 2021/08/30 00:04:30 rin Exp $ */
+/* $NetBSD: mvsoc_space.c,v 1.12 2022/05/23 21:46:11 andvar Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.11 2021/08/30 00:04:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.12 2022/05/23 21:46:11 andvar Exp $");
#include "opt_mvsoc.h"
#include "mvpex.h"
@@ -420,7 +420,7 @@ mvsoc_bs_map(void *space, bus_addr_t add
* XXX: We are not configuring any decode windows for Armada XP
* at the moment. We rely on those that have been set by u-boot.
* Hence we don't want to mess around with decode windows,
- * till we get full controll over them.
+ * till we get full control over them.
*/
int tag = (int)space;
Index: src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.6 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.7
--- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h:1.6 Mon Jan 30 03:28:33 2012
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h Mon May 23 21:46:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.h,v 1.6 2012/01/30 03:28:33 nisimura Exp $ */
+/* $NetBSD: s3c24x0_lcd.h,v 1.7 2022/05/23 21:46:11 andvar Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -83,7 +83,7 @@ struct s3c24x0_lcd_panel_info {
short panel_height;
int pixel_clock; /* in Hz */
- /* Initial values to go to LCD controll registers */
+ /* Initial values to go to LCD control registers */
uint32_t lcdcon1;
uint32_t lcdcon2;
uint32_t lcdcon3;
Index: src/sys/arch/arm/s3c2xx0/s3c24x0reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.10 src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.11
--- src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.10 Mon Jan 30 03:28:33 2012
+++ src/sys/arch/arm/s3c2xx0/s3c24x0reg.h Mon May 23 21:46:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0reg.h,v 1.10 2012/01/30 03:28:33 nisimura Exp $ */
+/* $NetBSD: s3c24x0reg.h,v 1.11 2022/05/23 21:46:11 andvar Exp $ */
/*
* Copyright (c) 2003 Genetec corporation All rights reserved.
@@ -160,7 +160,7 @@
#define PLLCON_SDIV_MASK (0x03<<PLLCON_SDIV_SHIFT)
#define CLKMAN_CLKCON 0x0c
-#define CLKMAN_CLKSLOW 0x10 /* slow clock controll */
+#define CLKMAN_CLKSLOW 0x10 /* slow clock control */
#define CLKSLOW_UCLK (1<<7) /* 1=UPLL off */
#define CLKSLOW_MPLL (1<<5) /* 1=PLL off */
#define CLKSLOW_SLOW (1<<4) /* 1: Enable SLOW mode */
Index: src/sys/arch/arm/s3c2xx0/s3c2800reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.7 src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.8
--- src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.7 Sun Feb 21 06:08:53 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2800reg.h Mon May 23 21:46:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800reg.h,v 1.7 2010/02/21 06:08:53 bsh Exp $ */
+/* $NetBSD: s3c2800reg.h,v 1.8 2022/05/23 21:46:11 andvar Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -124,7 +124,7 @@
#define CLKCON_TIMER (1<<2) /* PCLK to TIMER */
#define CLKCON_IDLE (1<<1) /* Enter IDLE Mode */
-#define CLKMAN_CLKSLOW 0x08 /* slow clock controll */
+#define CLKMAN_CLKSLOW 0x08 /* slow clock control */
#define CLKSLOW_SLOW (1<<4) /* 1: Enable SLOW mode */
#define CLKSLOW_VAL_MASK 0x0f /* divider value for slow clock */
Index: src/sys/arch/hpcmips/conf/files.hpcmips
diff -u src/sys/arch/hpcmips/conf/files.hpcmips:1.109 src/sys/arch/hpcmips/conf/files.hpcmips:1.110
--- src/sys/arch/hpcmips/conf/files.hpcmips:1.109 Wed Aug 21 04:17:40 2019
+++ src/sys/arch/hpcmips/conf/files.hpcmips Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.109 2019/08/21 04:17:40 msaitoh Exp $
+# $NetBSD: files.hpcmips,v 1.110 2022/05/23 21:46:12 andvar Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -436,7 +436,7 @@ device vrdmaau
attach vrdmaau at vripif
file arch/hpcmips/vr/vrdmaau.c vrdmaau
-# DMA Controll Unit
+# DMA Control Unit
device vrdcu
attach vrdcu at vripif
file arch/hpcmips/vr/vrdcu.c vrdcu
Index: src/sys/arch/hppa/gsc/gsckbc.c
diff -u src/sys/arch/hppa/gsc/gsckbc.c:1.1 src/sys/arch/hppa/gsc/gsckbc.c:1.2
--- src/sys/arch/hppa/gsc/gsckbc.c:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/gsc/gsckbc.c Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gsckbc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: gsckbc.c,v 1.2 2022/05/23 21:46:12 andvar Exp $ */
/*
* Copyright (c) 2004 Jochen Kunz.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.2 2022/05/23 21:46:12 andvar Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1
#define REG_RESET 0x0 /* W: reset port */
#define REG_RCVDATA 0x4 /* R: received data (4 byte FIFO) */
#define REG_XMITDATA 0x4 /* W: data to transmit */
-#define REG_CONTROL 0x8 /* Controll Bits */
+#define REG_CONTROL 0x8 /* Control Bits */
#define REG_STATUS 0xc /* Status Bits */
#define REG_SZ 0xc /* Size of register set */
#define REG_OFFSET 0x100 /* Address Offset of the two ports */
Index: src/sys/arch/mips/cavium/dev/octeon_gmxreg.h
diff -u src/sys/arch/mips/cavium/dev/octeon_gmxreg.h:1.6 src/sys/arch/mips/cavium/dev/octeon_gmxreg.h:1.7
--- src/sys/arch/mips/cavium/dev/octeon_gmxreg.h:1.6 Sun Apr 17 21:24:53 2022
+++ src/sys/arch/mips/cavium/dev/octeon_gmxreg.h Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmxreg.h,v 1.6 2022/04/17 21:24:53 andvar Exp $ */
+/* $NetBSD: octeon_gmxreg.h,v 1.7 2022/05/23 21:46:12 andvar Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -644,7 +644,7 @@
/* -------------------------------------------------------------------------- */
-/* Low-level SGMII link controll */
+/* Low-level SGMII link control */
#define PCS_BASE(g, i) (UINT64_C(0x00011800b0001000) + 0x8000000 * (g) + 0x400 * (i))
#define PCS_SIZE 0x98
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.180 src/sys/net/if_pppoe.c:1.181
--- src/sys/net/if_pppoe.c:1.180 Tue May 10 09:05:03 2022
+++ src/sys/net/if_pppoe.c Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.180 2022/05/10 09:05:03 knakahara Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.181 2022/05/23 21:46:12 andvar Exp $ */
/*
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.180 2022/05/10 09:05:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.181 2022/05/23 21:46:12 andvar Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -232,7 +232,7 @@ static void pppoe_timeout_co_halt(void *
static void pppoe_timeout_wk(struct work *, void *);
static void pppoe_timeout(struct pppoe_softc *);
-/* sending actual protocol controll packets */
+/* sending actual protocol control packets */
static int pppoe_send_padi(struct pppoe_softc *);
static int pppoe_send_padr(struct pppoe_softc *);
#ifdef PPPOE_SERVER
Index: src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c
diff -u src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c:1.5 src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c:1.6
--- src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c:1.5 Sun Nov 7 15:46:20 2021
+++ src/tests/lib/libc/gen/posix_spawn/t_spawnattr.c Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_spawnattr.c,v 1.5 2021/11/07 15:46:20 christos Exp $ */
+/* $NetBSD: t_spawnattr.c,v 1.6 2022/05/23 21:46:12 andvar Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_spawnattr.c,v 1.5 2021/11/07 15:46:20 christos Exp $");
+__RCSID("$NetBSD: t_spawnattr.c,v 1.6 2022/05/23 21:46:12 andvar Exp $");
#include <sys/param.h>
#include <atf-c.h>
@@ -109,7 +109,7 @@ ATF_TC_BODY(t_spawnattr, tc)
char helper[FILENAME_MAX];
/*
- * create a pipe to controll the child
+ * create a pipe to control the child
*/
err = pipe(pfd);
ATF_REQUIRE_MSG(err == 0, "could not create pipe, errno %d", errno);
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.42 src/usr.sbin/sysinst/mbr.c:1.43
--- src/usr.sbin/sysinst/mbr.c:1.42 Wed Mar 23 13:06:06 2022
+++ src/usr.sbin/sysinst/mbr.c Mon May 23 21:46:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.42 2022/03/23 13:06:06 andvar Exp $ */
+/* $NetBSD: mbr.c,v 1.43 2022/05/23 21:46:12 andvar Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -500,7 +500,7 @@ validate_and_set_names(mbr_info_t *mbri,
for (i = 0; i < MBR_PART_COUNT; i++) {
/*
- * Make sure the name does not contain controll chars
+ * Make sure the name does not contain control chars
* (not using iscntrl due to minimalistic locale support
* in miniroot environments) and is properly 0-terminated.
*/
