Module Name: src
Committed By: tsutsui
Date: Sun Jan 15 05:08:33 UTC 2023
Modified Files:
src/sys/arch/luna68k/dev: lcd.c lunaws.c omkbdmap.c omrasops.c
psgpam_enc.c siotty.c xp.c
src/sys/arch/luna68k/include: bus.h cpu.h lcd.h param.h vmparam.h
src/sys/arch/luna68k/luna68k: disksubr.c mainbus.c pmap_bootstrap.c
trap.c
Log Message:
TAB/space/indent cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/dev/lcd.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/dev/omkbdmap.c \
src/sys/arch/luna68k/dev/psgpam_enc.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/dev/xp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/include/bus.h
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/include/lcd.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/luna68k/include/param.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/luna68k/include/vmparam.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/luna68k/luna68k/disksubr.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/luna68k/mainbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/luna68k/luna68k/trap.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/luna68k/dev/lcd.c
diff -u src/sys/arch/luna68k/dev/lcd.c:1.12 src/sys/arch/luna68k/dev/lcd.c:1.13
--- src/sys/arch/luna68k/dev/lcd.c:1.12 Tue Dec 29 17:17:14 2020
+++ src/sys/arch/luna68k/dev/lcd.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lcd.c,v 1.12 2020/12/29 17:17:14 tsutsui Exp $ */
+/* $NetBSD: lcd.c,v 1.13 2023/01/15 05:08:33 tsutsui Exp $ */
/* $OpenBSD: lcd.c,v 1.7 2015/02/10 22:42:35 miod Exp $ */
/*-
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.12 2020/12/29 17:17:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.13 2023/01/15 05:08:33 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -297,7 +297,7 @@ lcdbusywait(void)
s = splhigh();
p1->portC = POWER | READ_BUSY | DISABLE;
splx(s);
-}
+}
static void
lcdput(int cc)
Index: src/sys/arch/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.41 src/sys/arch/luna68k/dev/lunaws.c:1.42
--- src/sys/arch/luna68k/dev/lunaws.c:1.41 Sat Jun 25 01:54:37 2022
+++ src/sys/arch/luna68k/dev/lunaws.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.41 2022/06/25 01:54:37 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.42 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.41 2022/06/25 01:54:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.42 2023/01/15 05:08:33 tsutsui Exp $");
#include "opt_wsdisplay_compat.h"
#include "wsmouse.h"
@@ -525,7 +525,7 @@ omkbd_get_buzcmd(struct ws_softc *sc, st
buzcmd |= OMKBD_BUZZER_150HZ;
else
buzcmd |= OMKBD_BUZZER_100HZ;
-
+
/* no volume control for buzzer on the LUNA keyboards */
return buzcmd;
Index: src/sys/arch/luna68k/dev/omkbdmap.c
diff -u src/sys/arch/luna68k/dev/omkbdmap.c:1.2 src/sys/arch/luna68k/dev/omkbdmap.c:1.3
--- src/sys/arch/luna68k/dev/omkbdmap.c:1.2 Sat Oct 4 14:42:41 2014
+++ src/sys/arch/luna68k/dev/omkbdmap.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: omkbdmap.c,v 1.2 2014/10/04 14:42:41 tsutsui Exp $ */
+/* $NetBSD: omkbdmap.c,v 1.3 2023/01/15 05:08:33 tsutsui Exp $ */
/* $OpenBSD: omkbdmap.c,v 1.2 2013/11/16 18:31:44 miod Exp $ */
/* Partially from:
@@ -97,9 +97,9 @@ const uint8_t omkbd_raw[0x80] = {
0x0c, /* 0x2c: equal */
0x0d, /* 0x2d: asciitilde */
0x7d, /* 0x2e: bar */
- 0x00, /* 0x2f */
- 0x00, /* 0x30: f13 */
- 0x00, /* 0x31: f14 */
+ 0x00, /* 0x2f */
+ 0x00, /* 0x30: f13 */
+ 0x00, /* 0x31: f14 */
0x10, /* 0x32 */
0x11, /* 0x33 */
0x12, /* 0x34 */
@@ -207,7 +207,7 @@ static const keysym_t omkbd_keydesc_jp[]
KC(0x1d), KS_KP_Left,
KC(0x1e), KS_KP_Right,
KC(0x1f), KS_KP_Down,
- /* 0x20, KS_f11, */
+ /* 0x20, KS_f11, */
/* 0x21, KS_f12, */
KC(0x22), KS_1, KS_exclam,
KC(0x23), KS_2, KS_quotedbl,
Index: src/sys/arch/luna68k/dev/psgpam_enc.c
diff -u src/sys/arch/luna68k/dev/psgpam_enc.c:1.2 src/sys/arch/luna68k/dev/psgpam_enc.c:1.3
--- src/sys/arch/luna68k/dev/psgpam_enc.c:1.2 Sat Oct 1 13:41:12 2022
+++ src/sys/arch/luna68k/dev/psgpam_enc.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: psgpam_enc.c,v 1.2 2022/10/01 13:41:12 tsutsui Exp $ */
+/* $NetBSD: psgpam_enc.c,v 1.3 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 2018 Yosuke Sugahara. All rights reserved.
@@ -106,7 +106,7 @@ dynamic_offset(struct psgpam_codecvar *c
*d++ = ((t & 0x000f)); \
} while (0)
-#define ENCODER_DEFINE(enc, TT, table, writer) \
+#define ENCODER_DEFINE(enc, TT, table, writer) \
void \
psgpam_aint_to_##enc(audio_filter_arg_t *arg) \
{ \
Index: src/sys/arch/luna68k/dev/omrasops.c
diff -u src/sys/arch/luna68k/dev/omrasops.c:1.25 src/sys/arch/luna68k/dev/omrasops.c:1.26
--- src/sys/arch/luna68k/dev/omrasops.c:1.25 Mon Oct 3 17:42:35 2022
+++ src/sys/arch/luna68k/dev/omrasops.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: omrasops.c,v 1.25 2022/10/03 17:42:35 tsutsui Exp $ */
+/* $NetBSD: omrasops.c,v 1.26 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.25 2022/10/03 17:42:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.26 2023/01/15 05:08:33 tsutsui Exp $");
/*
* Designed speficically for 'm68k bitorder';
@@ -150,7 +150,7 @@ static rowattr_t rowattr[OMRASOPS_MAX_RO
/* luna68k version GETBITS() that gets w bits from bit x at psrc memory */
#define FASTGETBITS(psrc, x, w, dst) \
asm("bfextu %3{%1:%2},%0" \
- : "=d" (dst) \
+ : "=d" (dst) \
: "di" (x), "di" (w), "o" (*(uint32_t *)(psrc)))
/* luna68k version PUTBITS() that puts w bits from bit x at pdst memory */
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.52 src/sys/arch/luna68k/dev/siotty.c:1.53
--- src/sys/arch/luna68k/dev/siotty.c:1.52 Tue Nov 22 16:17:29 2022
+++ src/sys/arch/luna68k/dev/siotty.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.52 2022/11/22 16:17:29 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.53 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.52 2022/11/22 16:17:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.53 2023/01/15 05:08:33 tsutsui Exp $");
#include "opt_ddb.h"
#include "siotty.h"
@@ -700,10 +700,10 @@ struct consdev siottycons = {
static void
siottycninit(struct consdev *cn)
{
-/*
- * Channel A is immediately initialized with 9600N1 right after cold
- * boot/reset/poweron. ROM monitor emits one line message on CH.A.
- */
+ /*
+ * Channel A is immediately initialized with 9600N1 right after cold
+ * boot/reset/poweron. ROM monitor emits one line message on CH.A.
+ */
struct sioreg *sio, *sio_base, *sio_a, *sio_b;
sio_base = (struct sioreg *)OBIO_SIO;
@@ -711,8 +711,7 @@ siottycninit(struct consdev *cn)
sio_b = &sio_base[1];
sio = sio_a;
- siottycons.cn_dev =
- makedev(cdevsw_lookup_major(&siotty_cdevsw), 0);
+ siottycons.cn_dev = makedev(cdevsw_lookup_major(&siotty_cdevsw), 0);
cn_init_magic(&siotty_cnm_state);
cn_set_magic("\047\001");
Index: src/sys/arch/luna68k/dev/xp.c
diff -u src/sys/arch/luna68k/dev/xp.c:1.7 src/sys/arch/luna68k/dev/xp.c:1.8
--- src/sys/arch/luna68k/dev/xp.c:1.7 Fri Jun 10 21:42:23 2022
+++ src/sys/arch/luna68k/dev/xp.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xp.c,v 1.7 2022/06/10 21:42:23 tsutsui Exp $ */
+/* $NetBSD: xp.c,v 1.8 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 2016 Izumi Tsutsui. All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xp.c,v 1.7 2022/06/10 21:42:23 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xp.c,v 1.8 2023/01/15 05:08:33 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,7 +139,7 @@ xp_open(dev_t dev, int flags, int devtyp
struct xp_softc *sc;
int unit;
u_int a;
-
+
DPRINTF(XP_DEBUG_ALL, ("%s\n", __func__));
unit = minor(dev);
Index: src/sys/arch/luna68k/include/bus.h
diff -u src/sys/arch/luna68k/include/bus.h:1.16 src/sys/arch/luna68k/include/bus.h:1.17
--- src/sys/arch/luna68k/include/bus.h:1.16 Sat Jan 23 19:38:08 2021
+++ src/sys/arch/luna68k/include/bus.h Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.16 2021/01/23 19:38:08 christos Exp $ */
+/* $NetBSD: bus.h,v 1.17 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -561,5 +561,5 @@ __MACHINE_copy_region_N(4)
* There is no bus_dma(9)'fied bus drivers on this port.
*/
#define __HAVE_NO_BUS_DMA
-
+
#endif /* _MACHINE_BUS_H_ */
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.37 src/sys/arch/luna68k/include/cpu.h:1.38
--- src/sys/arch/luna68k/include/cpu.h:1.37 Sat Nov 23 19:40:35 2019
+++ src/sys/arch/luna68k/include/cpu.h Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.37 2019/11/23 19:40:35 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.38 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -81,7 +81,7 @@ struct clockframe {
* or after the current trap/syscall if in system mode.
*/
#define cpu_need_resched(ci,l,flags) do { \
- __USE(flags); \
+ __USE(flags); \
aston(); \
} while (/*CONSTCOND*/0)
Index: src/sys/arch/luna68k/include/lcd.h
diff -u src/sys/arch/luna68k/include/lcd.h:1.1 src/sys/arch/luna68k/include/lcd.h:1.2
--- src/sys/arch/luna68k/include/lcd.h:1.1 Thu Mar 9 14:05:58 2017
+++ src/sys/arch/luna68k/include/lcd.h Sun Jan 15 05:08:33 2023
@@ -1,7 +1,7 @@
-/* $NetBSD: lcd.h,v 1.1 2017/03/09 14:05:58 tsutsui Exp $ */
+/* $NetBSD: lcd.h,v 1.2 2023/01/15 05:08:33 tsutsui Exp $ */
/* $OpenBSD: lcd.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
-/*
+/*
* Copyright (c) 2007 Kenji AOYAMA <[email protected]>
* All rights reserved.
*
@@ -47,15 +47,15 @@
/* argument value for each ioctl */
-/* LCDMODE; when a character data is written, then ... */
-#define LCDMODE_C_LEFT 0x04 /* cursor moves left */
+/* LCDMODE; when a character data is written, then ... */
+#define LCDMODE_C_LEFT 0x04 /* cursor moves left */
#define LCDMODE_C_RIGHT 0x06 /* cursor moves right */
#define LCDMODE_D_LEFT 0x05 /* display area shifts to left */
#define LCDMODE_D_RIGHT 0x07 /* display area shifts to right */
/* LCDDISP; you can use these values or'ed */
#define LCD_DISPLAY 0x04 /* LCD display on */
-#define LCD_CURSOR 0x02 /* Cursor on */
+#define LCD_CURSOR 0x02 /* Cursor on */
#define LCD_BLINK 0x01 /* Blink on */
/* LCDMOVE; just move the cursor or shift the display area */
Index: src/sys/arch/luna68k/include/param.h
diff -u src/sys/arch/luna68k/include/param.h:1.14 src/sys/arch/luna68k/include/param.h:1.15
--- src/sys/arch/luna68k/include/param.h:1.14 Sat Dec 28 12:34:35 2019
+++ src/sys/arch/luna68k/include/param.h Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.14 2019/12/28 12:34:35 isaki Exp $ */
+/* $NetBSD: param.h,v 1.15 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,7 +41,7 @@
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
-#define _MACHINE luna68k
+#define _MACHINE luna68k
#define MACHINE "luna68k"
#define PGSHIFT 12 /* LOG2(NBPG) */
Index: src/sys/arch/luna68k/include/vmparam.h
diff -u src/sys/arch/luna68k/include/vmparam.h:1.23 src/sys/arch/luna68k/include/vmparam.h:1.24
--- src/sys/arch/luna68k/include/vmparam.h:1.23 Sat Feb 1 19:41:49 2020
+++ src/sys/arch/luna68k/include/vmparam.h Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.23 2020/02/01 19:41:49 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.24 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -78,8 +78,8 @@
#define USRIOSIZE (1 * NPTEPG) /* 4mb */
#endif
-/*
- * Mach derived constants
+/*
+ * Mach derived constants
*/
/* user/kernel map constants */
Index: src/sys/arch/luna68k/luna68k/disksubr.c
diff -u src/sys/arch/luna68k/luna68k/disksubr.c:1.33 src/sys/arch/luna68k/luna68k/disksubr.c:1.34
--- src/sys/arch/luna68k/luna68k/disksubr.c:1.33 Sat Apr 16 18:15:21 2022
+++ src/sys/arch/luna68k/luna68k/disksubr.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.33 2022/04/16 18:15:21 andvar Exp $ */
+/* $NetBSD: disksubr.c,v 1.34 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
*
* Credits:
* This file was based mostly on the i386/disksubr.c file:
- * @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
+ * @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* The functions: disklabel_sun_to_bsd, disklabel_bsd_to_sun
* were originally taken from arch/sparc/scsi/sun_disklabel.c
* (which was written by Theo de Raadt) and then substantially
@@ -95,7 +95,7 @@
*
* Credits:
* This file was based mostly on the i386/disksubr.c file:
- * @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
+ * @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* The functions: disklabel_sun_to_bsd, disklabel_bsd_to_sun
* were originally taken from arch/sparc/scsi/sun_disklabel.c
* (which was written by Theo de Raadt) and then substantially
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.33 2022/04/16 18:15:21 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.34 2023/01/15 05:08:33 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,7 +220,7 @@ readdisklabel(dev_t dev, void (*strat)(s
dlp = (struct disklabel *)(clp->cd_block + LABELOFFSET);
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC) {
if (dkcksum(dlp) == 0) {
- *lp = *dlp; /* struct assignment */
+ *lp = *dlp; /* struct assignment */
return (NULL);
}
printf("NetBSD disk label corrupted");
@@ -249,7 +249,7 @@ writedisklabel(dev_t dev, void (*strat)(
/* implant NetBSD disklabel at LABELOFFSET. */
dlp = (struct disklabel *)(clp->cd_block + LABELOFFSET);
- *dlp = *lp; /* struct assignment */
+ *dlp = *lp; /* struct assignment */
error = disklabel_bsd_to_om(lp, clp->cd_block);
if (error)
Index: src/sys/arch/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.18 src/sys/arch/luna68k/luna68k/mainbus.c:1.19
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.18 Fri Jun 10 21:42:24 2022
+++ src/sys/arch/luna68k/luna68k/mainbus.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.18 2022/06/10 21:42:24 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.19 2023/01/15 05:08:33 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2022/06/10 21:42:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19 2023/01/15 05:08:33 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,20 +43,20 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
static const struct mainbus_attach_args luna_devs[] = {
{ "clock", 0x45000000, -1 }, /* Mostek TimeKeeper */
{ "lcd", 0x4d000000, -1 }, /* Sharp LM16X212 LCD module */
- { "le", 0xf1000000, 3 }, /* Am7990 */
+ { "le", 0xf1000000, 3 }, /* Am7990 */
{ "sio", 0x51000000, 6 }, /* uPD7201A */
- { "xpbus", 0x71000000, -1 }, /* HD647180XP */
- { "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */
+ { "xpbus", 0x71000000, -1 }, /* HD647180XP */
+ { "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */
{ "spc", 0xe1000000, 2 }, /* MB89352 */
};
static const struct mainbus_attach_args luna2_devs[] = {
{ "clock", 0x45000000, -1 }, /* Dallas TimeKeeper */
{ "lcd", 0x4d000000, -1 }, /* Sharp LM16X212 LCD module */
- { "le", 0xf1000000, 3 }, /* Am7990 */
+ { "le", 0xf1000000, 3 }, /* Am7990 */
{ "sio", 0x51000000, 6 }, /* uPD7201A */
{ "xp", 0x71000000, 1 }, /* HD647180XP */
- { "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */
+ { "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */
{ "spc", 0xe1000000, 2 }, /* internal MB89352 */
{ "spc", 0xe1000040, 2 }, /* external MB89352 */
};
Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.37 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.38
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.37 Thu Dec 22 16:05:15 2016
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.37 2016/12/22 16:05:15 cherry Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.38 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.37 2016/12/22 16:05:15 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.38 2023/01/15 05:08:33 tsutsui Exp $");
#include "opt_m68k_arch.h"
@@ -292,7 +292,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
/*
* Initialize the one corresponding to SYSMAP_VA
* to point to Sysptmap.
- */
+ */
ste = (st_entry_t *)kstpa;
ste = &ste[SYSMAP_VA >> SEGSHIFT];
pte = (pt_entry_t *)kptmpa;
Index: src/sys/arch/luna68k/luna68k/trap.c
diff -u src/sys/arch/luna68k/luna68k/trap.c:1.73 src/sys/arch/luna68k/luna68k/trap.c:1.74
--- src/sys/arch/luna68k/luna68k/trap.c:1.73 Sat Sep 25 19:16:31 2021
+++ src/sys/arch/luna68k/luna68k/trap.c Sun Jan 15 05:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $ */
+/* $NetBSD: trap.c,v 1.74 2023/01/15 05:08:33 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.73 2021/09/25 19:16:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.74 2023/01/15 05:08:33 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -476,8 +476,8 @@ trap(struct frame *fp, int type, unsigne
#endif
/*
* It is only a kernel address space fault iff:
- * 1. (type & T_USER) == 0 and
- * 2. pcb_onfault not set or
+ * 1. (type & T_USER) == 0 and
+ * 2. pcb_onfault not set or
* 3. pcb_onfault set but supervisor space data fault
* The last can occur during an exec() copyin where the
* argument space is lazy-allocated.
