Module Name: src
Committed By: andvar
Date: Fri Jul 5 19:28:36 UTC 2024
Modified Files:
src/games/robots: init_field.c
src/sys/arch/arm/s3c2xx0: s3c24x0_lcd.c
src/sys/arch/atari/dev: grfabs_fal.c
src/sys/arch/evbppc/mpc85xx: cadmusreg.h
src/sys/arch/hpcmips/dev: mq200debug.c
src/sys/arch/hpcmips/vr: vrpiu.c
src/sys/arch/luna68k/stand/boot: bmd.c
src/sys/arch/shark/shark: i8042.c
src/sys/dev/hpc: hpcbatteryvar.h
Log Message:
fix various typos in comments and log messages, mainly s/hight/high/
s/hight/height/ and removing double m in time(ing).
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/robots/init_field.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/atari/dev/grfabs_fal.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/mpc85xx/cadmusreg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/dev/mq200debug.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hpcmips/vr/vrpiu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/stand/boot/bmd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/shark/i8042.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hpc/hpcbatteryvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/robots/init_field.c
diff -u src/games/robots/init_field.c:1.12 src/games/robots/init_field.c:1.13
--- src/games/robots/init_field.c:1.12 Mon Jul 20 06:39:06 2009
+++ src/games/robots/init_field.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: init_field.c,v 1.12 2009/07/20 06:39:06 dholland Exp $ */
+/* $NetBSD: init_field.c,v 1.13 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)init_field.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: init_field.c,v 1.12 2009/07/20 06:39:06 dholland Exp $");
+__RCSID("$NetBSD: init_field.c,v 1.13 2024/07/05 19:28:36 andvar Exp $");
#endif
#endif /* not lint */
@@ -46,7 +46,7 @@ static int tely = 0;
/*
* init_field:
- * Lay down the initial pattern whih is constant across all levels,
+ * Lay down the initial pattern which is constant across all levels,
* and initialize all the global variables.
*/
void
Index: src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.15 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.16
--- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.15 Fri Nov 20 18:34:45 2020
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.15 2020/11/20 18:34:45 thorpej Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.16 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.15 2020/11/20 18:34:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.16 2024/07/05 19:28:36 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -402,7 +402,7 @@ s3c24x0_lcd_new_screen(struct s3c24x0_lc
#define rgb(r,g,b) _rgb((r)>>1,g,(b)>>1)
#define L 0x30 /* low intensity */
-#define H 0x3f /* hight intensity */
+#define H 0x3f /* high intensity */
static const uint16_t basic_color_map[] = {
rgb( 0, 0, 0), /* black */
Index: src/sys/arch/atari/dev/grfabs_fal.c
diff -u src/sys/arch/atari/dev/grfabs_fal.c:1.29 src/sys/arch/atari/dev/grfabs_fal.c:1.30
--- src/sys/arch/atari/dev/grfabs_fal.c:1.29 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/dev/grfabs_fal.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_fal.c,v 1.29 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: grfabs_fal.c,v 1.30 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 1995 Thomas Gerner.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.29 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.30 2024/07/05 19:28:36 andvar Exp $");
#ifdef FALCON_VIDEO
/*
@@ -280,7 +280,7 @@ falcon_detect(dmode_t *dm)
dm->depth = 1; /* 2 color */
/*
- * Now calculate the screen hight
+ * Now calculate the screen height
*/
dm->size.height = vregs->vd_v_dis_end - vregs->vd_v_dis_beg;
Index: src/sys/arch/evbppc/mpc85xx/cadmusreg.h
diff -u src/sys/arch/evbppc/mpc85xx/cadmusreg.h:1.2 src/sys/arch/evbppc/mpc85xx/cadmusreg.h:1.3
--- src/sys/arch/evbppc/mpc85xx/cadmusreg.h:1.2 Tue Jan 18 01:10:25 2011
+++ src/sys/arch/evbppc/mpc85xx/cadmusreg.h Fri Jul 5 19:28:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cadmusreg.h,v 1.2 2011/01/18 01:10:25 matt Exp $ */
+/* $NetBSD: cadmusreg.h,v 1.3 2024/07/05 19:28:35 andvar Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -51,7 +51,7 @@
#define CM_CSR_EPHY_GET(n) __SHIFTOUT((n), CM_CSR_EPHY)
#define CM_CSR_LED __BIT(0)
#define CM_RST 0x02 /* Reset control register */
-#define CM_RST_XRSTEN __BIT(7) /* Enable the NVRAM watchdog timr to function as a general reset input */
+#define CM_RST_XRSTEN __BIT(7) /* Enable the NVRAM watchdog timer to function as a general reset input */
#define CM_RST_PHYRST __BIT(6) /* Reset the Ethernet PHY */
#define CM_RST_ATM1RST __BIT(5) /* Reset the FCC1/ATM1 PHYS */
#define CM_RST_ATM2RST __BIT(4) /* Reset the FCC2/ATM2 PHY */
Index: src/sys/arch/hpcmips/dev/mq200debug.c
diff -u src/sys/arch/hpcmips/dev/mq200debug.c:1.6 src/sys/arch/hpcmips/dev/mq200debug.c:1.7
--- src/sys/arch/hpcmips/dev/mq200debug.c:1.6 Wed Mar 26 17:53:36 2014
+++ src/sys/arch/hpcmips/dev/mq200debug.c Fri Jul 5 19:28:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mq200debug.c,v 1.6 2014/03/26 17:53:36 christos Exp $ */
+/* $NetBSD: mq200debug.c,v 1.7 2024/07/05 19:28:35 andvar Exp $ */
/*-
* Copyright (c) 2001 TAKEMURA Shin
@@ -31,7 +31,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mq200debug.c,v 1.6 2014/03/26 17:53:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mq200debug.c,v 1.7 2024/07/05 19:28:35 andvar Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -424,7 +424,7 @@ mq200_dump_gc(struct mq200_softc *sc, in
* GC09R Window Vertical Control
*/
reg = mq200_read(sc, MQ200_GCWVCR(gc));
- printf("GC09R=0x%08x: Window Vertical start=%03d hight=%03d\n",
+ printf("GC09R=0x%08x: Window Vertical start=%03d height=%03d\n",
reg,
(reg&MQ200_GCWVC_START_MASK)>> MQ200_GCWVC_START_SHIFT,
(reg&MQ200_GCWVC_HEIGHT_MASK)>> MQ200_GCWVC_HEIGHT_SHIFT);
@@ -447,7 +447,7 @@ mq200_dump_gc(struct mq200_softc *sc, in
* GC0BR Alternate Window Vertical Control
*/
reg = mq200_read(sc, MQ200_GCAWVCR(gc));
- printf("GC0BR=0x%08x: Altwin Vertical start=%03d hight=%03d\n",
+ printf("GC0BR=0x%08x: Altwin Vertical start=%03d height=%03d\n",
reg,
(reg&MQ200_GCAWVC_START_MASK)>> MQ200_GCAWVC_START_SHIFT,
(reg&MQ200_GCAWVC_HEIGHT_MASK)>> MQ200_GCAWVC_HEIGHT_SHIFT);
Index: src/sys/arch/hpcmips/vr/vrpiu.c
diff -u src/sys/arch/hpcmips/vr/vrpiu.c:1.44 src/sys/arch/hpcmips/vr/vrpiu.c:1.45
--- src/sys/arch/hpcmips/vr/vrpiu.c:1.44 Sat Aug 7 16:18:54 2021
+++ src/sys/arch/hpcmips/vr/vrpiu.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vrpiu.c,v 1.44 2021/08/07 16:18:54 thorpej Exp $ */
+/* $NetBSD: vrpiu.c,v 1.45 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrpiu.c,v 1.44 2021/08/07 16:18:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrpiu.c,v 1.45 2024/07/05 19:28:36 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -821,7 +821,7 @@ vrpiu_calc_powerstate(struct vrpiu_softc
sc->sc_battery.nextpoll = hz*vrpiu_ad_poll_interval;
vrpiu_send_battery_event(sc);
/*
- * restart next A/D polling if change polling timming.
+ * restart next A/D polling if change polling timing.
*/
if (sc->sc_battery.nextpoll != hz*vrpiu_ad_poll_interval)
callout_reset(&sc->sc_adpoll, sc->sc_battery.nextpoll,
Index: src/sys/arch/luna68k/stand/boot/bmd.c
diff -u src/sys/arch/luna68k/stand/boot/bmd.c:1.9 src/sys/arch/luna68k/stand/boot/bmd.c:1.10
--- src/sys/arch/luna68k/stand/boot/bmd.c:1.9 Fri Oct 13 16:30:01 2023
+++ src/sys/arch/luna68k/stand/boot/bmd.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bmd.c,v 1.9 2023/10/13 16:30:01 tsutsui Exp $ */
+/* $NetBSD: bmd.c,v 1.10 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -102,18 +102,18 @@ union bmd_rfcnt {
#define BMAP_OFFSET 8
#define PB_WIDTH 2048 /* Plane Width (Bit) */
-#define PB_HEIGHT 1024 /* Plane Hight (Bit) */
+#define PB_HEIGHT 1024 /* Plane Height (Bit) */
#define PL_WIDTH 64 /* Plane Width (long) */
#define PS_WIDTH 128 /* Plane Width (long) */
#define P_WIDTH 256 /* Plane Width (Byte) */
#define SB_WIDTH 1280 /* Screen Width (Bit) */
-#define SB_HEIGHT 1024 /* Screen Hight (Bit) */
+#define SB_HEIGHT 1024 /* Screen Height (Bit) */
#define SL_WIDTH 40 /* Screen Width (Long) */
#define S_WIDTH 160 /* Screen Width (Byte) */
#define FB_WIDTH 12 /* Font Width (Bit) */
-#define FB_HEIGHT 20 /* Font Hight (Bit) */
+#define FB_HEIGHT 20 /* Font Height (Bit) */
#define NEXT_LINE(addr) (addr + (PL_WIDTH * FB_HEIGHT))
Index: src/sys/arch/shark/shark/i8042.c
diff -u src/sys/arch/shark/shark/i8042.c:1.8 src/sys/arch/shark/shark/i8042.c:1.9
--- src/sys/arch/shark/shark/i8042.c:1.8 Thu Sep 16 22:19:10 2021
+++ src/sys/arch/shark/shark/i8042.c Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i8042.c,v 1.8 2021/09/16 22:19:10 andvar Exp $ */
+/* $NetBSD: i8042.c,v 1.9 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright 1997
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.8 2021/09/16 22:19:10 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.9 2024/07/05 19:28:36 andvar Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -378,7 +378,7 @@ i8042_cmd(bus_space_tag_t iot,
} /* End If able to get response from device */
else
{
- /* Timmed out waiting for a response .... maybe we
+ /* Timed out waiting for a response .... maybe we
** weren't meant to get one ??
*/
KERN_DEBUG(i8042debug, KERN_DEBUG_WARNING,
Index: src/sys/dev/hpc/hpcbatteryvar.h
diff -u src/sys/dev/hpc/hpcbatteryvar.h:1.4 src/sys/dev/hpc/hpcbatteryvar.h:1.5
--- src/sys/dev/hpc/hpcbatteryvar.h:1.4 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/hpc/hpcbatteryvar.h Fri Jul 5 19:28:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcbatteryvar.h,v 1.4 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: hpcbatteryvar.h,v 1.5 2024/07/05 19:28:36 andvar Exp $ */
/*
* Copyright (c) 2000-2001 SATO Kazumi
@@ -104,7 +104,7 @@ struct hpcbattery_spec {
int backup_port; /* index of backup battery port, -1 then ignore */
int b_full; /* backup battery full */
int b_low; /* backup battery low */
- int b_critical; /* backup battery hight */
+ int b_critical; /* backup battery high */
int b_flag; /* main battery value positive, negative flag. 1 or -1 */
int nocharge_port; /* nocharge/(charge or dc) z50, -1 then ignore*/
int n_low; /* if n_flag*value < n_flag*n_low, now nocharging... */
