Module Name: src
Committed By: tsutsui
Date: Fri Feb 3 23:13:01 UTC 2023
Modified Files:
src/sys/arch/next68k/dev: intio.c nextcons.c nextdisplay.c
nextdisplayvar.h nextkbd.c
src/sys/arch/next68k/include: bus_space.h
src/sys/arch/next68k/next68k: autoconf.c clock.c disksubr.c locore.s
rtc.c trap.c vectors.s
Log Message:
Misc KNF and cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/next68k/dev/intio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/dev/nextcons.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/next68k/dev/nextdisplayvar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/next68k/dev/nextkbd.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/next68k/include/bus_space.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/next68k/autoconf.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/next68k/next68k/clock.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/next68k/next68k/disksubr.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/next68k/next68k/rtc.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/next68k/next68k/vectors.s
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/next68k/dev/intio.c
diff -u src/sys/arch/next68k/dev/intio.c:1.16 src/sys/arch/next68k/dev/intio.c:1.17
--- src/sys/arch/next68k/dev/intio.c:1.16 Sat Aug 7 16:19:01 2021
+++ src/sys/arch/next68k/dev/intio.c Fri Feb 3 23:13:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.16 2021/08/07 16:19:01 thorpej Exp $ */
+/* $NetBSD: intio.c,v 1.17 2023/02/03 23:13:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.16 2021/08/07 16:19:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.17 2023/02/03 23:13:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,12 +53,6 @@ int intiosearch(device_t, cfdata_t, cons
CFATTACH_DECL_NEW(intio, 0,
intiomatch, intioattach, NULL, NULL);
-#if 0
-struct cfdriver intio_cd = {
- NULL, "intio", DV_DULL
-};
-#endif
-
static bool intio_attached;
int
@@ -66,9 +60,9 @@ intiomatch(device_t parent, cfdata_t mat
{
/* Allow only one instance. */
if (intio_attached)
- return (0);
+ return 0;
- return (1);
+ return 1;
}
void
@@ -92,24 +86,24 @@ intioprint(void *aux, const char *pnp)
if (ia->ia_addr)
aprint_normal(" addr %p", ia->ia_addr);
- return (UNCONF);
+ return UNCONF;
}
int
intiosearch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
- struct mainbus_attach_args *mba = (struct mainbus_attach_args *) aux;
+ struct mainbus_attach_args *mba = aux;
struct intio_attach_args ia;
do {
ia.ia_addr = NULL;
ia.ia_bst = NEXT68K_INTIO_BUS_SPACE;
ia.ia_dmat = mba->mba_dmat;
-
+
if (!config_probe(parent, cf, &ia))
break;
config_attach(parent, cf, &ia, intioprint, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
- return (0);
+ return 0;
}
Index: src/sys/arch/next68k/dev/nextcons.c
diff -u src/sys/arch/next68k/dev/nextcons.c:1.11 src/sys/arch/next68k/dev/nextcons.c:1.12
--- src/sys/arch/next68k/dev/nextcons.c:1.11 Sat Apr 24 19:58:13 2010
+++ src/sys/arch/next68k/dev/nextcons.c Fri Feb 3 23:13:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nextcons.c,v 1.11 2010/04/24 19:58:13 dbj Exp $ */
+/* $NetBSD: nextcons.c,v 1.12 2023/02/03 23:13:00 tsutsui Exp $ */
/*
* Copyright (c) 1999 Darrin B. Jewell
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.11 2010/04/24 19:58:13 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.12 2023/02/03 23:13:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,11 +63,11 @@ void
nextcnprobe(struct consdev *cp)
{
- if ((rom_machine_type == NeXT_WARP9)
- || (rom_machine_type == NeXT_X15)
- || (rom_machine_type == NeXT_WARP9C)
- || (rom_machine_type == NeXT_TURBO_MONO)
- || (rom_machine_type == NeXT_TURBO_COLOR))
+ if (rom_machine_type == NeXT_WARP9 ||
+ rom_machine_type == NeXT_X15 ||
+ rom_machine_type == NeXT_WARP9C ||
+ rom_machine_type == NeXT_TURBO_MONO ||
+ rom_machine_type == NeXT_TURBO_COLOR)
cp->cn_pri = CN_INTERNAL;
else
cp->cn_pri = CN_DEAD;
@@ -78,6 +78,7 @@ nextcnprobe(struct consdev *cp)
void
nextcninit(struct consdev *cp)
{
+
nextkbd_cnattach(NEXT68K_INTIO_BUS_SPACE);
nextdisplay_cnattach();
}
@@ -85,17 +86,20 @@ nextcninit(struct consdev *cp)
int
nextcngetc (dev_t dev)
{
+
return wskbd_cngetc(dev);
}
void
nextcnputc(dev_t dev, int c)
{
- wsdisplay_cnputc(dev,c);
+
+ wsdisplay_cnputc(dev,c);
}
void
nextcnpollc(dev_t dev, int on)
{
+
wskbd_cnpollc(dev,on);
}
Index: src/sys/arch/next68k/dev/nextdisplay.c
diff -u src/sys/arch/next68k/dev/nextdisplay.c:1.25 src/sys/arch/next68k/dev/nextdisplay.c:1.26
--- src/sys/arch/next68k/dev/nextdisplay.c:1.25 Sat Aug 7 16:19:01 2021
+++ src/sys/arch/next68k/dev/nextdisplay.c Fri Feb 3 23:13:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplay.c,v 1.25 2021/08/07 16:19:01 thorpej Exp $ */
+/* $NetBSD: nextdisplay.c,v 1.26 2023/02/03 23:13:00 tsutsui Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.25 2021/08/07 16:19:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.26 2023/02/03 23:13:00 tsutsui Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -136,8 +136,8 @@ static struct nextdisplay_config nextdis
static int
nextdisplay_is_console(vaddr_t addr)
{
- return (nextdisplay_console_dc.isconsole
- && (addr == nextdisplay_consaddr));
+ return nextdisplay_console_dc.isconsole &&
+ addr == nextdisplay_consaddr;
}
int
@@ -148,9 +148,9 @@ nextdisplay_match(device_t parent, cfdat
rom_machine_type == NeXT_WARP9C ||
rom_machine_type == NeXT_TURBO_MONO ||
rom_machine_type == NeXT_TURBO_COLOR)
- return (1);
- else
- return (0);
+ return 1;
+ else
+ return 0;
}
void
@@ -174,7 +174,7 @@ nextdisplay_init(struct nextdisplay_conf
dc->dc_wid = 1120;
dc->dc_ht = 832;
- dc->dc_depth = color ? 16 : 2;
+ dc->dc_depth = color ? 16 : 2;
dc->dc_rowbytes = (turbo ? 1120 : 1152) * dc->dc_depth / 8;
dc->dc_videobase = dc->dc_vaddr;
@@ -198,15 +198,15 @@ nextdisplay_init(struct nextdisplay_conf
/* clear the screen */
for (i = 0; i < dc->dc_ht * dc->dc_rowbytes; i += sizeof(u_int32_t))
- *(u_int32_t *)(dc->dc_videobase + i) =
- (color ? 0x0 : 0xffffffff);
+ *(uint32_t *)(dc->dc_videobase + i) =
+ color ? 0x0 : 0xffffffff;
rap = &dc->dc_raster;
rap->width = dc->dc_wid;
rap->height = dc->dc_ht;
rap->depth = color ? 16 : 2;
rap->linelongs = dc->dc_rowbytes / sizeof(u_int32_t);
- rap->pixels = (u_int32_t *)dc->dc_videobase;
+ rap->pixels = (uint32_t *)dc->dc_videobase;
/* initialize the raster console blitter */
rcp = &dc->dc_rcons;
@@ -217,11 +217,11 @@ nextdisplay_init(struct nextdisplay_conf
rcons_init(rcp, 34, 80);
if (color) {
- nextdisplay_color.nrows = dc->dc_rcons.rc_maxrow;
- nextdisplay_color.ncols = dc->dc_rcons.rc_maxcol;
+ nextdisplay_color.nrows = dc->dc_rcons.rc_maxrow;
+ nextdisplay_color.ncols = dc->dc_rcons.rc_maxcol;
} else {
- nextdisplay_mono.nrows = dc->dc_rcons.rc_maxrow;
- nextdisplay_mono.ncols = dc->dc_rcons.rc_maxcol;
+ nextdisplay_mono.nrows = dc->dc_rcons.rc_maxrow;
+ nextdisplay_mono.ncols = dc->dc_rcons.rc_maxcol;
}
}
@@ -246,7 +246,7 @@ nextdisplay_attach(device_t parent, devi
}
isconsole = nextdisplay_is_console(addr);
-
+
if (isconsole) {
sc->sc_dc = &nextdisplay_console_dc;
sc->nscreens = 1;
@@ -257,7 +257,7 @@ nextdisplay_attach(device_t parent, devi
}
printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht,
- sc->sc_dc->dc_depth);
+ sc->sc_dc->dc_depth);
if (iscolor) {
#if 0
@@ -267,13 +267,15 @@ nextdisplay_attach(device_t parent, devi
aprint_debug_dev(sc->sc_dev, "cmd=%02x\n", x);
#endif
*(volatile uint8_t *)IIOV(NEXT_P_C16_CMD_REG) = 0x05;
- isrlink_autovec(nextdisplay_intr, sc, NEXT_I_IPL(NEXT_I_C16_VIDEO), 1, NULL);
+ isrlink_autovec(nextdisplay_intr, sc,
+ NEXT_I_IPL(NEXT_I_C16_VIDEO), 1, NULL);
INTR_ENABLE(NEXT_I_C16_VIDEO);
}
/* initialize the raster */
waa.console = isconsole;
- waa.scrdata = iscolor ? &nextdisplay_screenlist_color : &nextdisplay_screenlist_mono;
+ waa.scrdata = iscolor ?
+ &nextdisplay_screenlist_color : &nextdisplay_screenlist_mono;
waa.accessops = &nextdisplay_accessops;
waa.accesscookie = sc;
#if 0
@@ -290,18 +292,18 @@ nextdisplay_intr(void *arg)
#endif
if (!INTR_OCCURRED(NEXT_I_C16_VIDEO))
- return (0);
+ return 0;
#if 0
x = *(volatile uint8_t *)IIOV(NEXT_P_C16_CMD_REG);
printf("I%02x", x);
#endif
*(volatile uint8_t *)IIOV(NEXT_P_C16_CMD_REG) = 0x05;
- return (1);
+ return 1;
}
int
nextdisplay_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
- struct lwp *l)
+ struct lwp *l)
{
struct nextdisplay_softc *sc = v;
struct nextdisplay_config *dc = sc->sc_dc;
@@ -352,21 +354,19 @@ nextdisplay_alloc_screen(void *v, const
/* only allow one screen */
if (sc->nscreens > 0)
- return (ENOMEM);
+ return ENOMEM;
*cookiep = &sc->sc_dc->dc_rcons; /* one and only for now */
*curxp = 0;
*curyp = 0;
- rcons_allocattr(&sc->sc_dc->dc_rcons, 0, 0,
- (strcmp(type->name, "color") == 0)
- ? 0
- : WSATTR_REVERSE, &defattr);
+ rcons_allocattr(&sc->sc_dc->dc_rcons, 0, 0,
+ (strcmp(type->name, "color") == 0) ? 0 : WSATTR_REVERSE, &defattr);
*defattrp = defattr;
sc->nscreens++;
#if 0
printf("nextdisplay: allocating screen\n");
#endif
- return (0);
+ return 0;
}
void
@@ -385,13 +385,14 @@ nextdisplay_show_screen(void *v, void *c
void (*cb)(void *, int, int), void *cbarg)
{
- return (0);
+ return 0;
}
static int
nextdisplay_load_font(void *v, void *cookie, struct wsdisplay_font *font)
{
- return (EPASSTHROUGH);
+
+ return EPASSTHROUGH;
}
int
@@ -411,12 +412,12 @@ nextdisplay_cnattach(void)
nextdisplay_init(&nextdisplay_console_dc, iscolor);
nextdisplay_consaddr = nextdisplay_console_dc.dc_vaddr;
- rcons_allocattr(&dc->dc_rcons, 0, 0,
- iscolor ? 0 : WSATTR_REVERSE, &defattr);
+ rcons_allocattr(&dc->dc_rcons, 0, 0,
+ iscolor ? 0 : WSATTR_REVERSE, &defattr);
wsdisplay_cnattach(iscolor ? &nextdisplay_color : &nextdisplay_mono,
- &dc->dc_rcons, 0, 0, defattr);
+ &dc->dc_rcons, 0, 0, defattr);
dc->isconsole = 1;
- return (0);
+ return 0;
}
Index: src/sys/arch/next68k/dev/nextdisplayvar.h
diff -u src/sys/arch/next68k/dev/nextdisplayvar.h:1.5 src/sys/arch/next68k/dev/nextdisplayvar.h:1.6
--- src/sys/arch/next68k/dev/nextdisplayvar.h:1.5 Sat Oct 27 17:18:05 2012
+++ src/sys/arch/next68k/dev/nextdisplayvar.h Fri Feb 3 23:13:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplayvar.h,v 1.5 2012/10/27 17:18:05 chs Exp $ */
+/* $NetBSD: nextdisplayvar.h,v 1.6 2023/02/03 23:13:00 tsutsui Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@@ -34,7 +34,7 @@
#include <machine/bus.h>
-extern int nextdisplay_cnattach(void);
+int nextdisplay_cnattach(void);
struct nextdisplay_config;
struct fbcmap;
@@ -48,17 +48,17 @@ struct nextdisplay_config {
paddr_t dc_paddr; /* memory space physical base address */
psize_t dc_size; /* size of slot memory */
- vaddr_t dc_videobase; /* base of flat frame buffer */
+ vaddr_t dc_videobase; /* base of flat frame buffer */
- int dc_wid; /* width of frame buffer */
- int dc_ht; /* height of frame buffer */
- int dc_depth; /* depth of frame buffer */
- int dc_rowbytes; /* bytes in fb scan line */
+ int dc_wid; /* width of frame buffer */
+ int dc_ht; /* height of frame buffer */
+ int dc_depth; /* depth of frame buffer */
+ int dc_rowbytes; /* bytes in fb scan line */
- struct raster dc_raster; /* raster description */
- struct rcons dc_rcons; /* raster blitter control info */
+ struct raster dc_raster; /* raster description */
+ struct rcons dc_rcons; /* raster blitter control info */
- int dc_blanked; /* currently has video disabled */
+ int dc_blanked; /* currently has video disabled */
int isconsole;
};
@@ -67,6 +67,6 @@ struct nextdisplay_softc {
device_t sc_dev;
struct nextdisplay_config *sc_dc;
-
+
int nscreens;
};
Index: src/sys/arch/next68k/dev/nextkbd.c
diff -u src/sys/arch/next68k/dev/nextkbd.c:1.18 src/sys/arch/next68k/dev/nextkbd.c:1.19
--- src/sys/arch/next68k/dev/nextkbd.c:1.18 Sat Aug 7 16:19:01 2021
+++ src/sys/arch/next68k/dev/nextkbd.c Fri Feb 3 23:13:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nextkbd.c,v 1.18 2021/08/07 16:19:01 thorpej Exp $ */
+/* $NetBSD: nextkbd.c,v 1.19 2023/02/03 23:13:00 tsutsui Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.18 2021/08/07 16:19:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.19 2023/02/03 23:13:00 tsutsui Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -68,13 +68,13 @@ struct nextkbd_internal {
bus_space_tag_t iot;
bus_space_handle_t ioh;
struct nextkbd_softc *t_sc; /* back pointer */
- u_int32_t mods;
+ uint32_t mods;
};
struct mon_regs {
- u_int32_t mon_csr;
- u_int32_t mon_1;
- u_int32_t mon_data;
+ uint32_t mon_csr;
+ uint32_t mon_1;
+ uint32_t mon_data;
};
static int attached = 0;
@@ -121,6 +121,7 @@ int nextkbdhard(void *);
static int
nextkbd_is_console(bus_space_tag_t bst)
{
+
return (nextkbd_consdata.isconsole && (bst == nextkbd_consdata.iot));
}
@@ -130,18 +131,18 @@ nextkbd_match(device_t parent, cfdata_t
struct intio_attach_args *ia = (struct intio_attach_args *)aux;
if (attached)
- return(0);
+ return 0;
ia->ia_addr = (void *)NEXT_P_MON;
- return(1);
+ return 1;
}
void
nextkbd_attach(device_t parent, device_t self, void *aux)
{
struct nextkbd_softc *sc = device_private(self);
- struct intio_attach_args *ia = (struct intio_attach_args *)aux;
+ struct intio_attach_args *ia = aux;
int isconsole;
struct wskbddev_attach_args a;
@@ -152,22 +153,21 @@ nextkbd_attach(device_t parent, device_t
if (isconsole) {
sc->id = &nextkbd_consdata;
} else {
- sc->id = kmem_zalloc(sizeof(struct nextkbd_internal),
- KM_SLEEP);
+ sc->id = kmem_zalloc(sizeof(struct nextkbd_internal), KM_SLEEP);
sc->id->iot = ia->ia_bst;
if (bus_space_map(sc->id->iot, NEXT_P_MON,
- sizeof(struct mon_regs),
- 0, &sc->id->ioh)) {
+ sizeof(struct mon_regs), 0, &sc->id->ioh)) {
printf("%s: can't map mon status control register\n",
- device_xname(self));
+ device_xname(self));
return;
}
}
sc->id->t_sc = sc; /* set back pointer */
- isrlink_autovec(nextkbdhard, sc, NEXT_I_IPL(NEXT_I_KYBD_MOUSE), 0, NULL);
+ isrlink_autovec(nextkbdhard, sc, NEXT_I_IPL(NEXT_I_KYBD_MOUSE),
+ 0, NULL);
INTR_ENABLE(NEXT_I_KYBD_MOUSE);
@@ -188,6 +188,7 @@ nextkbd_attach(device_t parent, device_t
int
nextkbd_enable(void *v, int on)
{
+
/* XXX not sure if this should do anything */
/* printf("nextkbd_enable %d\n", on); */
return 0;
@@ -209,39 +210,39 @@ nextkbd_set_leds(void *v, int leds)
s = spltty();
bus_space_write_1(sc->id->iot, sc->id->ioh, 3, 0xc5);
- /* @@@ need to add:
- if bit 7 of @ioh+0 set:
- repeat 2
- wait until bit 6 of @ioh+2 clears
- */
+ /*
+ * @@@ need to add:
+ * if bit 7 of @ioh+0 set:
+ * repeat 2
+ * wait until bit 6 of @ioh+2 clears
+ */
bus_space_write_4(sc->id->iot, sc->id->ioh, 4, hw_leds);
- /* @@@ need to add:
- wait until bit 4 of @ioh+0 (@ioh+2 if bit 7 was set above)
- clears
- */
+ /*
+ * @@@ need to add:
+ * wait until bit 4 of @ioh+0 (@ioh+2 if bit 7 was set above)
+ * clears
+ */
splx(s);
-
- return;
}
int
nextkbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
struct nextkbd_softc *sc = v;
-
+
switch (cmd) {
case WSKBDIO_GTYPE:
/* XXX */
*(int *)data = WSKBD_TYPE_NEXT;
- return (0);
+ return 0;
case WSKBDIO_SETLEDS:
nextkbd_set_leds (sc, *(int *)data);
- return (0);
+ return 0;
case WSKBDIO_GETLEDS:
*(int *)data = sc->sc_leds & NEXT_WSKBD_LEDS;
- return (0);
+ return 0;
case WSKBDIO_COMPLEXBELL:
- return (0);
+ return 0;
}
return EPASSTHROUGH;
}
@@ -252,28 +253,29 @@ nextkbdhard(void *arg)
struct nextkbd_softc *sc = arg;
int type, key, val;
- if (!INTR_OCCURRED(NEXT_I_KYBD_MOUSE)) return 0;
+ if (!INTR_OCCURRED(NEXT_I_KYBD_MOUSE))
+ return 0;
-#define CSR_INT 0x00800000
-#define CSR_DATA 0x00400000
+#define CSR_INT 0x00800000
+#define CSR_DATA 0x00400000
-#define KD_KEYMASK 0x007f
-#define KD_DIRECTION 0x0080 /* pressed or released */
-#define KD_CNTL 0x0100
-#define KD_LSHIFT 0x0200
-#define KD_RSHIFT 0x0400
-#define KD_LCOMM 0x0800
-#define KD_RCOMM 0x1000
-#define KD_LALT 0x2000
-#define KD_RALT 0x4000
-#define KD_VALID 0x8000 /* only set for scancode keys ? */
-#define KD_MODS 0x4f00
+#define KD_KEYMASK 0x007f
+#define KD_DIRECTION 0x0080 /* pressed or released */
+#define KD_CNTL 0x0100
+#define KD_LSHIFT 0x0200
+#define KD_RSHIFT 0x0400
+#define KD_LCOMM 0x0800
+#define KD_RCOMM 0x1000
+#define KD_LALT 0x2000
+#define KD_RALT 0x4000
+#define KD_VALID 0x8000 /* only set for scancode keys ? */
+#define KD_MODS 0x4f00
val = nextkbd_read_data(sc->id);
if ((val != -1) && nextkbd_decode(sc->id, val, &type, &key)) {
wskbd_input(sc->sc_wskbddev, type, key);
}
- return(1);
+ return 1;
}
int
@@ -281,9 +283,8 @@ nextkbd_cnattach(bus_space_tag_t bst)
{
bus_space_handle_t bsh;
- if (bus_space_map(bst, NEXT_P_MON, sizeof(struct mon_regs),
- 0, &bsh))
- return (ENXIO);
+ if (bus_space_map(bst, NEXT_P_MON, sizeof(struct mon_regs), 0, &bsh))
+ return ENXIO;
memset(&nextkbd_consdata, 0, sizeof(nextkbd_consdata));
@@ -291,10 +292,10 @@ nextkbd_cnattach(bus_space_tag_t bst)
nextkbd_consdata.ioh = bsh;
nextkbd_consdata.isconsole = 1;
- wskbd_cnattach(&nextkbd_consops, &nextkbd_consdata,
- &nextkbd_keymapdata);
+ wskbd_cnattach(&nextkbd_consops, &nextkbd_consdata,
+ &nextkbd_keymapdata);
- return (0);
+ return 0;
}
void
@@ -306,7 +307,7 @@ nextkbd_cngetc(void *v, u_int *type, int
for (;;) {
if (INTR_OCCURRED(NEXT_I_KYBD_MOUSE)) {
val = nextkbd_read_data(t);
- if ((val != -1) && nextkbd_decode(t, val, type, data))
+ if (val != -1 && nextkbd_decode(t, val, type, data))
return;
}
}
@@ -331,80 +332,85 @@ nextkbd_read_data(struct nextkbd_interna
{
unsigned char device;
struct mon_regs stat = { 0 };
-
+
bus_space_read_region_4(id->iot, id->ioh, 0, &stat, 3);
- if ((stat.mon_csr & CSR_INT) && (stat.mon_csr & CSR_DATA)) {
+ if ((stat.mon_csr & CSR_INT) != 0 &&
+ (stat.mon_csr & CSR_DATA) != 0) {
stat.mon_csr &= ~CSR_INT;
id->num_ints++;
bus_space_write_4(id->iot, id->ioh, 0, stat.mon_csr);
device = stat.mon_data >> 28;
- if (device != 1) return (-1); /* XXX: mouse */
- return (stat.mon_data & 0xffff);
+ if (device != 1)
+ return -1; /* XXX: mouse */
+ return stat.mon_data & 0xffff;
}
- return (-1);
+ return -1;
}
static int
nextkbd_decode(struct nextkbd_internal *id, int datain, u_int *type,
int *dataout)
{
- /* printf("datain %08x mods %08x\n", datain, id->mods); */
- if ((datain ^ id->mods) & KD_LSHIFT) {
+#if 0
+ printf("datain %08x mods %08x\n", datain, id->mods);
+#endif
+
+ if (((datain ^ id->mods) & KD_LSHIFT) != 0) {
id->mods ^= KD_LSHIFT;
*dataout = 90;
if (datain & KD_LSHIFT)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_RSHIFT) {
+ } else if (((datain ^ id->mods) & KD_RSHIFT) != 0) {
id->mods ^= KD_RSHIFT;
*dataout = 91;
- if (datain & KD_RSHIFT)
+ if ((datain & KD_RSHIFT) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_LALT) {
+ } else if (((datain ^ id->mods) & KD_LALT) != 0) {
id->mods ^= KD_LALT;
*dataout = 92;
- if (datain & KD_LALT)
+ if ((datain & KD_LALT) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_RALT) {
+ } else if (((datain ^ id->mods) & KD_RALT) != 0) {
id->mods ^= KD_RALT;
*dataout = 93;
- if (datain & KD_RALT)
+ if ((datain & KD_RALT) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_CNTL) {
+ } else if (((datain ^ id->mods) & KD_CNTL) != 0) {
id->mods ^= KD_CNTL;
*dataout = 94;
- if (datain & KD_CNTL)
+ if ((datain & KD_CNTL) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_LCOMM) {
+ } else if (((datain ^ id->mods) & KD_LCOMM) != 0) {
id->mods ^= KD_LCOMM;
*dataout = 95;
- if (datain & KD_LCOMM)
+ if ((datain & KD_LCOMM) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if ((datain ^ id->mods) & KD_RCOMM) {
+ } else if (((datain ^ id->mods) & KD_RCOMM) != 0) {
id->mods ^= KD_RCOMM;
*dataout = 96;
- if (datain & KD_RCOMM)
+ if ((datain & KD_RCOMM) != 0)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
- } else if (datain & KD_KEYMASK) {
- if (datain & KD_DIRECTION)
+ } else if ((datain & KD_KEYMASK) != 0) {
+ if ((datain & KD_DIRECTION) != 0)
*type = WSCONS_EVENT_KEY_UP;
else
*type = WSCONS_EVENT_KEY_DOWN;
-
+
*dataout = (datain & KD_KEYMASK);
} else {
*dataout = 0;
Index: src/sys/arch/next68k/include/bus_space.h
diff -u src/sys/arch/next68k/include/bus_space.h:1.20 src/sys/arch/next68k/include/bus_space.h:1.21
--- src/sys/arch/next68k/include/bus_space.h:1.20 Fri Jan 27 15:25:47 2023
+++ src/sys/arch/next68k/include/bus_space.h Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.20 2023/01/27 15:25:47 tsutsui Exp $ */
+/* $NetBSD: bus_space.h,v 1.21 2023/02/03 23:13:01 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ typedef u_long bus_space_handle_t;
((*(hp)=(bus_space_handle_t)((t)+((a)-COLORBASE))),0) : (-1))))
#define bus_space_unmap(t, h, s)
-
+
#define bus_space_subregion(t, h, o, s, hp) \
(*(hp)=(h)+(o))
Index: src/sys/arch/next68k/next68k/autoconf.c
diff -u src/sys/arch/next68k/next68k/autoconf.c:1.27 src/sys/arch/next68k/next68k/autoconf.c:1.28
--- src/sys/arch/next68k/next68k/autoconf.c:1.27 Sat Oct 27 17:18:07 2012
+++ src/sys/arch/next68k/next68k/autoconf.c Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.27 2012/10/27 17:18:07 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.28 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: Utah $Hdr: autoconf.c 1.36 92/12/20$
- *
+ *
* @(#)autoconf.c 8.2 (Berkeley) 1/12/94
*/
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.27 2012/10/27 17:18:07 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2023/02/03 23:13:01 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,12 +135,12 @@ void
cpu_rootconf(void)
{
int count, lun, part;
-
+
count = lun = part = 0;
devidentparse (rom_boot_info, &count, &lun, &part);
booted_device = getdevunit (rom_boot_dev, count);
-
+
printf("boot device: %s\n",
(booted_device) ? device_xname(booted_device) : "<unknown>");
@@ -156,7 +156,8 @@ getdevunit(const char *name, int unit)
int i;
for (i = 0; i < ndevice_equivs; i++)
- if (device_equiv->alias && strcmp (name, device_equiv->alias) == 0)
+ if (device_equiv->alias &&
+ strcmp(name, device_equiv->alias) == 0)
name = device_equiv->real;
return device_find_by_driver_unit(name, unit);
@@ -177,35 +178,34 @@ devidentparse(const char *spec, int *cou
if (*spec == '(') {
/* tokenize device ident */
args[0] = ++spec;
- for (i = 1; *spec && *spec != ')' && i<3; spec++) {
+ for (i = 1; *spec && *spec != ')' && i < 3; spec++) {
if (*spec == ',')
args[i++] = ++spec;
}
if (*spec != ')')
goto baddev;
-
+
switch(i) {
case 3:
- *count = atoi(args[0]);
- *lun = atoi(args[1]);
- *part = atoi(args[2]);
+ *count = atoi(args[0]);
+ *lun = atoi(args[1]);
+ *part = atoi(args[2]);
break;
case 2:
- *lun = atoi(args[0]);
- *part = atoi(args[1]);
+ *lun = atoi(args[0]);
+ *part = atoi(args[1]);
break;
case 1:
- *part = atoi(args[0]);
+ *part = atoi(args[0]);
break;
case 0:
break;
}
- }
- else
+ } else
goto baddev;
-
+
return 0;
-
+
baddev:
return ENXIO;
}
@@ -214,8 +214,8 @@ static int
atoi(const char *s)
{
int val = 0;
-
- while(isdigit(*s))
+
+ while (isdigit(*s))
val = val * 10 + (*s++ - '0');
return val;
}
Index: src/sys/arch/next68k/next68k/clock.c
diff -u src/sys/arch/next68k/next68k/clock.c:1.13 src/sys/arch/next68k/next68k/clock.c:1.14
--- src/sys/arch/next68k/next68k/clock.c:1.13 Fri Jan 27 15:21:52 2023
+++ src/sys/arch/next68k/next68k/clock.c Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.13 2023/01/27 15:21:52 tsutsui Exp $ */
+/* $NetBSD: clock.c,v 1.14 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.13 2023/01/27 15:21:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.14 2023/02/03 23:13:01 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,17 +57,17 @@ clock_intr(void *arg)
int whilecount = 0;
if (!INTR_OCCURRED(NEXT_I_TIMER)) {
- return(0);
+ return 0;
}
do {
static int in_hardclock = 0;
int s;
-
+
timer = (volatile struct timer_reg *)IIOV(NEXT_P_TIMER);
timer->csr |= TIMER_REG_UPDATE;
- if (! in_hardclock) {
+ if (!in_hardclock) {
in_hardclock = 1;
s = splclock ();
hardclock(arg);
@@ -77,7 +77,7 @@ clock_intr(void *arg)
if (whilecount++ > 10)
panic ("whilecount");
} while (INTR_OCCURRED(NEXT_I_TIMER));
- return(1);
+ return 1;
}
/*
@@ -114,7 +114,8 @@ setstatclockrate(int newhz)
/* XXX should we do something here? XXX */
}
-/* @@@ update this to use the usec timer
+/*
+ * @@@ update this to use the usec timer
* Darrin B Jewell <[email protected]> Sun Feb 8 05:01:02 1998
* XXX: Well, there is no more microtime. But if there is a hardware
* timer of any sort, it could be added. ENODOCS. gdamore.
Index: src/sys/arch/next68k/next68k/disksubr.c
diff -u src/sys/arch/next68k/next68k/disksubr.c:1.30 src/sys/arch/next68k/next68k/disksubr.c:1.31
--- src/sys/arch/next68k/next68k/disksubr.c:1.30 Wed Apr 3 22:10:51 2019
+++ src/sys/arch/next68k/next68k/disksubr.c Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.30 2019/04/03 22:10:51 christos Exp $ */
+/* $NetBSD: disksubr.c,v 1.31 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.30 2019/04/03 22:10:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.31 2023/02/03 23:13:01 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,12 +53,12 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v
#define b_cylinder b_resid
-static unsigned short nextstep_checksum(unsigned char *, unsigned char *);
+static uint16_t nextstep_checksum(unsigned char *, unsigned char *);
static const char *parse_nextstep_label(struct next68k_disklabel *,
- struct disklabel *, struct cpu_disklabel *);
+ struct disklabel *, struct cpu_disklabel *);
static int build_nextstep_label(struct next68k_disklabel *, struct disklabel *);
-static unsigned short
+static uint16_t
nextstep_checksum(unsigned char *buf, unsigned char *limit)
{
int sum = 0;
@@ -68,11 +68,12 @@ nextstep_checksum(unsigned char *buf, un
buf += 2;
}
sum += (sum >> 16);
- return (sum & 0xffff);
+ return sum & 0xffff;
}
static const char *
-parse_nextstep_label(struct next68k_disklabel *ondisk, struct disklabel *lp, struct cpu_disklabel *osdep)
+parse_nextstep_label(struct next68k_disklabel *ondisk, struct disklabel *lp,
+ struct cpu_disklabel *osdep)
{
int i, t, nbp;
unsigned short *checksum;
@@ -86,19 +87,19 @@ parse_nextstep_label(struct next68k_disk
(unsigned char *)checksum) != *checksum) {
return ("disk label corrupted");
}
-
+
osdep->od_version = ondisk->cd_version;
lp->d_magic = lp->d_magic2 = DISKMAGIC;
lp->d_type = DKTYPE_SCSI;
lp->d_subtype = 0;
- if (sizeof (lp->d_typename) > sizeof (ondisk->cd_name))
+ if (sizeof (lp->d_typename) > sizeof(ondisk->cd_name))
lp->d_typename[sizeof (ondisk->cd_name)] = '\0';
- memcpy (lp->d_typename, ondisk->cd_name,
- uimin (sizeof (lp->d_typename), sizeof (ondisk->cd_name)));
- if (sizeof (lp->d_packname) > sizeof (ondisk->cd_label))
+ memcpy(lp->d_typename, ondisk->cd_name,
+ uimin(sizeof (lp->d_typename), sizeof(ondisk->cd_name)));
+ if (sizeof(lp->d_packname) > sizeof(ondisk->cd_label))
lp->d_packname[sizeof (ondisk->cd_label)] = '\0';
- memcpy (lp->d_packname, ondisk->cd_label,
- uimin (sizeof (lp->d_packname), sizeof (ondisk->cd_label)));
+ memcpy(lp->d_packname, ondisk->cd_label,
+ uimin(sizeof(lp->d_packname), sizeof(ondisk->cd_label)));
if (lp->d_secsize == 0)
lp->d_secsize = ondisk->cd_secsize;
KASSERT(ondisk->cd_secsize >= lp->d_secsize);
@@ -116,21 +117,21 @@ parse_nextstep_label(struct next68k_disk
for (i = 0; i < NEXT68K_LABEL_MAXPARTITIONS - 1; i++) {
if (ondisk->cd_partitions[i].cp_size > 0) {
lp->d_partitions[nbp].p_size =
- ondisk->cd_partitions[i].cp_size *
- (ondisk->cd_secsize / lp->d_secsize);
+ ondisk->cd_partitions[i].cp_size *
+ (ondisk->cd_secsize / lp->d_secsize);
lp->d_partitions[nbp].p_offset =
- (ondisk->cd_front +
- ondisk->cd_partitions[i].cp_offset) *
- (ondisk->cd_secsize / lp->d_secsize);
+ (ondisk->cd_front +
+ ondisk->cd_partitions[i].cp_offset) *
+ (ondisk->cd_secsize / lp->d_secsize);
lp->d_partitions[nbp].p_fsize =
- ondisk->cd_partitions[i].cp_fsize;
+ ondisk->cd_partitions[i].cp_fsize;
#ifndef FSTYPENAMES
- lp->d_partitions[nbp].p_fstype =
- FS_BSDFFS;
+ lp->d_partitions[nbp].p_fstype = FS_BSDFFS;
#else
for (t = 0; t < FSMAXTYPES; t++) {
- if (!strncmp (ondisk->cd_partitions[i].cp_type,
- fstypenames[t], NEXT68K_LABEL_MAXFSTLEN))
+ if (strncmp(ondisk->cd_partitions[i].cp_type,
+ fstypenames[t], NEXT68K_LABEL_MAXFSTLEN)
+ == 0)
break;
}
if (t == FSMAXTYPES)
@@ -139,8 +140,8 @@ parse_nextstep_label(struct next68k_disk
#endif
if (ondisk->cd_partitions[i].cp_fsize)
lp->d_partitions[nbp].p_frag =
- ondisk->cd_partitions[i].cp_bsize /
- ondisk->cd_partitions[i].cp_fsize;
+ ondisk->cd_partitions[i].cp_bsize /
+ ondisk->cd_partitions[i].cp_fsize;
else
lp->d_partitions[nbp].p_frag = 0;
lp->d_partitions[nbp].p_cpg =
@@ -160,7 +161,7 @@ parse_nextstep_label(struct next68k_disk
lp->d_checksum = 0;
lp->d_checksum = dkcksum(lp);
- return (NULL);
+ return NULL;
}
static int
@@ -168,16 +169,16 @@ build_nextstep_label(struct next68k_disk
{
int i, t, nbp;
int front_porch = NEXT68K_LABEL_DEFAULTFRONTPORCH;
- unsigned short *checksum;
+ uint16_t *checksum;
- memset (ondisk, 0, sizeof (*ondisk));
+ memset(ondisk, 0, sizeof(*ondisk));
ondisk->cd_version = NEXT68K_LABEL_CD_V3;
/* ondisk->cd_label_blkno = 0; */
/* ondisk->cd_size = 0; */
/* ondisk->cd_tag = 0; */
- strncpy (ondisk->cd_type, "fixed_rw_scsi", sizeof (ondisk->cd_type));
+ strncpy(ondisk->cd_type, "fixed_rw_scsi", sizeof(ondisk->cd_type));
ondisk->cd_secsize = lp->d_secsize;
/* ondisk->cd_back = 0; */
/* ondisk->cd_ngroups = 0; */
@@ -190,18 +191,18 @@ build_nextstep_label(struct next68k_disk
/* ondisk->rwpartition */
KASSERT(ondisk->cd_secsize >= lp->d_secsize);
- if (memcmp (ondisk->cd_name, lp->d_typename,
- uimin (sizeof (lp->d_typename), sizeof (ondisk->cd_name))) &&
+ if (memcmp(ondisk->cd_name, lp->d_typename,
+ uimin(sizeof(lp->d_typename), sizeof(ondisk->cd_name))) &&
sizeof (ondisk->cd_name) > sizeof (lp->d_typename))
- ondisk->cd_name[sizeof (lp->d_typename)] = '\0';
- memcpy (ondisk->cd_name, lp->d_typename,
- uimin (sizeof (lp->d_typename), sizeof (ondisk->cd_name)));
+ ondisk->cd_name[sizeof(lp->d_typename)] = '\0';
+ memcpy(ondisk->cd_name, lp->d_typename,
+ uimin(sizeof(lp->d_typename), sizeof(ondisk->cd_name)));
if (memcmp (lp->d_packname, ondisk->cd_label,
- uimin (sizeof (lp->d_packname), sizeof (ondisk->cd_label))) &&
- sizeof (ondisk->cd_label) > sizeof (lp->d_packname))
- ondisk->cd_label[sizeof (lp->d_packname)] = '\0';
- memcpy (ondisk->cd_label, lp->d_packname,
- uimin (sizeof (lp->d_packname), sizeof (ondisk->cd_label)));
+ uimin(sizeof(lp->d_packname), sizeof(ondisk->cd_label))) &&
+ sizeof(ondisk->cd_label) > sizeof(lp->d_packname))
+ ondisk->cd_label[sizeof(lp->d_packname)] = '\0';
+ memcpy(ondisk->cd_label, lp->d_packname,
+ uimin(sizeof(lp->d_packname), sizeof(ondisk->cd_label)));
ondisk->cd_nsectors = lp->d_nsectors;
ondisk->cd_ntracks = lp->d_ntracks;
@@ -219,7 +220,7 @@ build_nextstep_label(struct next68k_disk
lp->d_partitions[nbp].p_offset < front_porch)
front_porch = lp->d_partitions[nbp].p_offset;
for (t = 0; t < NEXT68K_LABEL_MAXPARTITIONS; t++) {
- if (t != (nbp > RAW_PART ? nbp-1 : nbp) &&
+ if (t != (nbp > RAW_PART ? nbp - 1 : nbp) &&
(lp->d_partitions[nbp].p_size ==
ondisk->cd_partitions[t].cp_size *
(ondisk->cd_secsize / lp->d_secsize)) &&
@@ -230,15 +231,16 @@ build_nextstep_label(struct next68k_disk
((lp->d_partitions[nbp].p_fstype == FS_OTHER) ||
(!strncmp (ondisk->cd_partitions[t].cp_type,
fstypenames[lp->d_partitions[nbp].p_fstype],
- NEXT68K_LABEL_MAXFSTLEN))))
- {
+ NEXT68K_LABEL_MAXFSTLEN)))) {
struct next68k_partition tmp;
- memcpy (&tmp, &ondisk->cd_partitions[t],
+ memcpy(&tmp, &ondisk->cd_partitions[t],
+ sizeof(tmp));
+ memcpy(&ondisk->cd_partitions[t],
+ &ondisk->cd_partitions[nbp > RAW_PART ?
+ nbp - 1 : nbp],
sizeof (tmp));
- memcpy (&ondisk->cd_partitions[t],
- &ondisk->cd_partitions[nbp > RAW_PART ? nbp-1 : nbp],
- sizeof (tmp));
- memcpy (&ondisk->cd_partitions[nbp > RAW_PART ? nbp-1 : nbp],
+ memcpy(&ondisk->cd_partitions[nbp > RAW_PART ?
+ nbp - 1 : nbp],
&tmp, sizeof (tmp));
}
}
@@ -253,16 +255,16 @@ build_nextstep_label(struct next68k_disk
struct next68k_partition *p = &ondisk->cd_partitions[i];
if (nbp < lp->d_npartitions && lp->d_partitions[nbp].p_size) {
p->cp_size = lp->d_partitions[nbp].p_size /
- (ondisk->cd_secsize / lp->d_secsize);
+ (ondisk->cd_secsize / lp->d_secsize);
p->cp_offset = (lp->d_partitions[nbp].p_offset /
- (ondisk->cd_secsize / lp->d_secsize)) -
- front_porch;
+ (ondisk->cd_secsize / lp->d_secsize)) -
+ front_porch;
p->cp_bsize = lp->d_partitions[nbp].p_frag
- * lp->d_partitions[nbp].p_fsize;
+ * lp->d_partitions[nbp].p_fsize;
p->cp_fsize = lp->d_partitions[nbp].p_fsize;
if (lp->d_partitions[nbp].p_fstype != FS_OTHER) {
- memset (p->cp_type, 0, NEXT68K_LABEL_MAXFSTLEN);
- strncpy (p->cp_type,
+ memset(p->cp_type, 0, NEXT68K_LABEL_MAXFSTLEN);
+ strncpy(p->cp_type,
fstypenames[lp->d_partitions[nbp].p_fstype],
NEXT68K_LABEL_MAXFSTLEN);
}
@@ -272,7 +274,7 @@ build_nextstep_label(struct next68k_disk
p->cp_minfree = 5; /* set some default */
p->cp_cpg = lp->d_partitions[nbp].p_cpg;
} else {
- memset (p, 0, sizeof(*p));
+ memset(p, 0, sizeof(*p));
p->cp_size = -1;
p->cp_offset = -1;
p->cp_bsize = -1;
@@ -287,17 +289,16 @@ build_nextstep_label(struct next68k_disk
ondisk->cd_front = front_porch;
ondisk->cd_boot_blkno[0] = NEXT68K_LABEL_DEFAULTBOOT0_1 /
- (ondisk->cd_secsize / lp->d_secsize);
+ (ondisk->cd_secsize / lp->d_secsize);
ondisk->cd_boot_blkno[1] = NEXT68K_LABEL_DEFAULTBOOT0_2 /
- (ondisk->cd_secsize / lp->d_secsize);
+ (ondisk->cd_secsize / lp->d_secsize);
if (ondisk->cd_version == NEXT68K_LABEL_CD_V3) {
checksum = &ondisk->NEXT68K_LABEL_cd_v3_checksum;
} else {
checksum = &ondisk->NEXT68K_LABEL_cd_checksum;
}
- *checksum = nextstep_checksum ((unsigned char *)ondisk,
- (unsigned char *)checksum);
+ *checksum = nextstep_checksum((uint8_t *)ondisk, (uint8_t *)checksum);
return 0;
}
@@ -310,7 +311,8 @@ build_nextstep_label(struct next68k_disk
* string on failure.
*/
const char *
-readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
+ struct cpu_disklabel *osdep)
{
struct buf *bp;
struct disklabel *dlp;
@@ -338,7 +340,7 @@ readdisklabel(dev_t dev, void (*strat)(s
bp->b_flags |= B_READ;
bp->b_cylinder = NEXT68K_LABEL_SECTOR / lp->d_secpercyl;
(*strat)(bp);
-
+
if (osdep)
osdep->od_version = 0;
@@ -362,10 +364,10 @@ readdisklabel(dev_t dev, void (*strat)(s
brelse(bp, 0);
return msg;
}
- if (IS_DISKLABEL ((struct next68k_disklabel *)bp->b_data)) {
+ if (IS_DISKLABEL((struct next68k_disklabel *)bp->b_data)) {
/* got a NeXT disklabel */
- msg = parse_nextstep_label
- ((struct next68k_disklabel *)bp->b_data, lp, osdep);
+ msg = parse_nextstep_label(
+ (struct next68k_disklabel *)bp->b_data, lp, osdep);
brelse(bp, 0);
return msg;
}
@@ -377,7 +379,7 @@ readdisklabel(dev_t dev, void (*strat)(s
msg = "no disk label";
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)((char *)bp->b_data +
- DEV_BSIZE - sizeof(*dlp));
+ DEV_BSIZE - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC || dlp->d_magic2 == DISKMAGIC) {
if (dlp->d_npartitions > MAXPARTITIONS ||
@@ -393,14 +395,15 @@ readdisklabel(dev_t dev, void (*strat)(s
}
}
brelse(bp, 0);
- return (msg);
+ return msg;
}
/*
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
+ struct cpu_disklabel *osdep)
{
struct buf *bp;
#if 0
@@ -412,7 +415,7 @@ writedisklabel(dev_t dev, void (*strat)(
labelpart = DISKPART(dev);
if (lp->d_partitions[labelpart].p_offset != 0) {
if (lp->d_partitions[0].p_offset != 0)
- return (EXDEV); /* not quite right */
+ return EXDEV; /* not quite right */
labelpart = 0;
}
/*
@@ -426,8 +429,8 @@ writedisklabel(dev_t dev, void (*strat)(
bp->b_bcount = NEXT68K_LABEL_SIZE;
bp->b_flags |= B_WRITE;
bp->b_cylinder = NEXT68K_LABEL_SECTOR / lp->d_secpercyl;
- error = build_nextstep_label
- ((struct next68k_disklabel *)bp->b_data, lp);
+ error =
+ build_nextstep_label((struct next68k_disklabel *)bp->b_data, lp);
if (error)
goto done;
#if 0
@@ -437,7 +440,7 @@ writedisklabel(dev_t dev, void (*strat)(
#endif
(*strat)(bp);
error = biowait(bp);
-done:
+ done:
brelse(bp, 0);
- return (error);
+ return error;
}
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.68 src/sys/arch/next68k/next68k/locore.s:1.69
--- src/sys/arch/next68k/next68k/locore.s:1.68 Mon May 30 09:56:03 2022
+++ src/sys/arch/next68k/next68k/locore.s Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.69 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -113,7 +113,7 @@ GLOBAL(kernel_text)
/*
* Leave page zero empty so it can be unmapped
- */
+ */
.space PAGE_SIZE
/*
@@ -460,7 +460,7 @@ Lpushpc:
jbsr _C_LABEL(pmap_bootstrap_finalize)
/* set kernel stack, user SP */
movl _C_LABEL(lwp0uarea),%a1 | get lwp0 uarea
- lea %a1@(USPACE-4),%sp | set kernel stack to end of area
+ lea %a1@(USPACE-4),%sp | set kernel stack to end of area
movl #USRSTACK-4,%a2
movl %a2,%usp | init user SP
@@ -503,7 +503,7 @@ Lenab3:
/*
* Trap/interrupt vector routines
- */
+ */
#include <m68k/m68k/trap_subr.s>
/*
@@ -614,7 +614,7 @@ ENTRY_NOPROFILE(trap0)
movw #SPL1,%sr
tstb _C_LABEL(ssir)
jne Lsir1
-Ltrap1:
+Ltrap1:
movl %sp@(FR_SP),%a0 | grab and restore
movl %a0,%usp | user SP
moveml %sp@+,#0x7FFF | restore most registers
@@ -872,7 +872,7 @@ Lgotsir:
moveml #0xFFFF,%sp@- | save all registers
movl %usp,%a1 | including
movl %a1,%sp@(FR_SP) | the users SP
-Lsir1:
+Lsir1:
clrl %sp@- | VA == none
clrl %sp@- | code == none
movl #T_SSIR,%sp@- | type == software interrupt
@@ -899,7 +899,7 @@ Ldorte:
/*
* Primitives
- */
+ */
/*
* Use common m68k support routines.
@@ -1119,7 +1119,7 @@ Ldoboot1:
movel %a0,%d0 | "-h" halts instead of reboot.
trap #13
-hloop:
+hloop:
bra hloop | This shouldn't be reached.
/*
* Misc. global variables.
Index: src/sys/arch/next68k/next68k/rtc.c
diff -u src/sys/arch/next68k/next68k/rtc.c:1.18 src/sys/arch/next68k/next68k/rtc.c:1.19
--- src/sys/arch/next68k/next68k/rtc.c:1.18 Thu Nov 20 16:34:25 2014
+++ src/sys/arch/next68k/next68k/rtc.c Fri Feb 3 23:13:01 2023
@@ -1,7 +1,7 @@
-/* $NetBSD: rtc.c,v 1.18 2014/11/20 16:34:25 christos Exp $ */
+/* $NetBSD: rtc.c,v 1.19 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin Jewell
- * Copyright (c) 1997 Rolf Grossmann
+ * Copyright (c) 1997 Rolf Grossmann
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.18 2014/11/20 16:34:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.19 2023/02/03 23:13:01 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h> /* for panic */
@@ -57,7 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.18
/* #define RTC_DEBUG */
u_char new_clock;
-volatile u_int *scr2 = (u_int *)NEXT_P_SCR2; /* will get memory mapped in rtc_init */
+
+/* will get memory mapped in rtc_init */
+volatile u_int *scr2 = (u_int *)NEXT_P_SCR2;
static int gettime_old(todr_chip_handle_t, struct clock_ymdhms *);
static int settime_old(todr_chip_handle_t, struct clock_ymdhms *);
@@ -73,16 +75,15 @@ void
rtc_init(void)
{
static struct todr_chip_handle tch;
- u_char val;
-
+ uint8_t val;
+
scr2 = (u_int *)IIOV(NEXT_P_SCR2);
val = rtc_read(RTC_STATUS);
new_clock = (val & RTC_NEW_CLOCK) ? 1 : 0;
- printf("Looks like a %s clock chip.\n",
- (new_clock?
- "MCS1850 (new style)":
- "MC68HC68T1 (old style)"));
+ printf("Looks like a %s clock chip.\n", new_clock ?
+ "MCS1850 (new style)" :
+ "MC68HC68T1 (old style)");
#ifdef RTC_DEBUG
rtc_print();
@@ -141,20 +142,20 @@ rtc_print(void)
}
-u_char
-rtc_read(u_char reg)
+uint8_t
+rtc_read(uint8_t reg)
{
int i;
u_int tmp;
- u_char val;
+ uint8_t val;
*scr2 = (*scr2 & ~(SCR2_RTDATA | SCR2_RTCLK)) | SCR2_RTCE;
DELAY(1);
val = reg;
- for (i=0; i<8; i++) {
+ for (i = 0; i < 8; i++) {
tmp = *scr2 & ~(SCR2_RTDATA | SCR2_RTCLK);
- if (val & 0x80)
+ if ((val & 0x80) != 0)
tmp |= SCR2_RTDATA;
*scr2 = tmp;
@@ -168,9 +169,9 @@ rtc_read(u_char reg)
}
val = 0; /* should be anyway */
- for (i=0; i<8; i++) {
+ for (i = 0; i < 8; i++) {
val <<= 1;
-
+
tmp = *scr2 & ~(SCR2_RTDATA | SCR2_RTCLK);
*scr2 = tmp | SCR2_RTCLK;
@@ -178,31 +179,31 @@ rtc_read(u_char reg)
*scr2 = tmp;
DELAY(1);
- if (*scr2 & SCR2_RTDATA)
+ if ((*scr2 & SCR2_RTDATA) != 0)
val |= 1;
}
- *scr2 &= ~(SCR2_RTDATA|SCR2_RTCLK|SCR2_RTCE);
+ *scr2 &= ~(SCR2_RTDATA | SCR2_RTCLK | SCR2_RTCE);
DELAY(1);
return val;
}
void
-rtc_write(u_char reg, u_char v)
+rtc_write(uint8_t reg, uint8_t v)
{
int i;
u_int tmp;
- u_char val;
+ uint8_t val;
*scr2 = (*scr2 & ~(SCR2_RTDATA | SCR2_RTCLK)) | SCR2_RTCE;
DELAY(1);
- val = reg|RTC_WRITE;
+ val = reg | RTC_WRITE;
- for (i=0; i<8; i++) {
+ for (i = 0; i < 8; i++) {
tmp = *scr2 & ~(SCR2_RTDATA | SCR2_RTCLK);
- if (val & 0x80)
+ if ((val & 0x80) != 0)
tmp |= SCR2_RTDATA;
*scr2 = tmp;
@@ -217,9 +218,9 @@ rtc_write(u_char reg, u_char v)
DELAY(1);
- for (i=0; i<8; i++) {
+ for (i = 0; i < 8; i++) {
tmp = *scr2 & ~(SCR2_RTDATA | SCR2_RTCLK);
- if (v & 0x80)
+ if ((v & 0x80) != 0)
tmp |= SCR2_RTDATA;
*scr2 = tmp;
@@ -232,7 +233,7 @@ rtc_write(u_char reg, u_char v)
v <<= 1;
}
- *scr2 &= ~(SCR2_RTDATA|SCR2_RTCLK|SCR2_RTCE);
+ *scr2 &= ~(SCR2_RTDATA | SCR2_RTCLK | SCR2_RTCE);
DELAY(1);
}
@@ -249,18 +250,19 @@ poweroff(void)
t = rtc_read(reg); /* seconds */
/* wait for clock to tick */
- while(t == rtc_read(reg));
+ while(t == rtc_read(reg))
+ continue;
DELAY(850000); /* hardware bug workaround ? */
- if(new_clock) {
+ if (new_clock) {
reg = RTC_CONTROL;
} else {
reg = RTC_INTRCTL;
}
rtc_write(reg, rtc_read(reg)|(RTC_PDOWN));
-
+
printf("....................."); /* @@@ work around some sort of bug. */
panic("Failed to poweroff!");
@@ -270,36 +272,42 @@ poweroff(void)
int
gettime_old(todr_chip_handle_t tch, struct clock_ymdhms *dt)
{
- u_char h, y;
-
+ uint8_t h, y;
+
y = bcdtobin(rtc_read(RTC_YR));
if (y >= 69) {
- dt->dt_year = 1900+y;
+ dt->dt_year = 1900 + y;
} else {
- dt->dt_year = 2000+y;
+ dt->dt_year = 2000 + y;
}
- dt->dt_mon = bcdtobin(rtc_read(RTC_MON)&0x1f);
- dt->dt_day = bcdtobin(rtc_read(RTC_DATE)&0x3f);
- dt->dt_wday = bcdtobin(rtc_read(RTC_DAY)&0x7);
+ dt->dt_mon = bcdtobin(rtc_read(RTC_MON) & 0x1f);
+ dt->dt_day = bcdtobin(rtc_read(RTC_DATE) & 0x3f);
+ dt->dt_wday = bcdtobin(rtc_read(RTC_DAY) & 0x07);
h = rtc_read(RTC_HRS);
- if (h & 0x80) { /* time is am/pm format */
- dt->dt_hour = bcdtobin(h&0x1f);
- if (h & 0x20) { /* pm */
- if (dt->dt_hour < 12) dt->dt_hour += 12;
- } else { /* am */
- if (dt->dt_hour == 12) dt->dt_hour = 0;
+ if ((h & 0x80) != 0) {
+ /* time is am/pm format */
+ dt->dt_hour = bcdtobin(h & 0x1f);
+ if ((h & 0x20) != 0) {
+ /* pm */
+ if (dt->dt_hour < 12)
+ dt->dt_hour += 12;
+ } else {
+ /* am */
+ if (dt->dt_hour == 12)
+ dt->dt_hour = 0;
}
#ifdef notdef
- } else { /* time is 24 hour format */
+ } else {
+ /* time is 24 hour format */
struct clock_ymdhms val;
val.dt_hour = bcdtobin(h & 0x3f);
#endif
}
- dt->dt_min = bcdtobin(rtc_read(RTC_MIN)&0x7f);
- dt->dt_sec = bcdtobin(rtc_read(RTC_SEC)&0x7f);
+ dt->dt_min = bcdtobin(rtc_read(RTC_MIN) & 0x7f);
+ dt->dt_sec = bcdtobin(rtc_read(RTC_SEC) & 0x7f);
return 0;
}
@@ -307,53 +315,60 @@ gettime_old(todr_chip_handle_t tch, stru
int
settime_old(todr_chip_handle_t tcr, struct clock_ymdhms *dt)
{
- u_char h;
+ uint8_t h;
/* Stop the clock */
- rtc_write(RTC_CONTROL,rtc_read(RTC_CONTROL) & ~RTC_START);
+ rtc_write(RTC_CONTROL, rtc_read(RTC_CONTROL) & ~RTC_START);
#ifdef RTC_DEBUG
- printf("Setting RTC to 0x%08x. Regs before:\n",secs);
+ printf("Setting RTC to 0x%08x. Regs before:\n", secs);
rtc_print();
#endif
- rtc_write(RTC_SEC,bintobcd(dt->dt_sec));
- rtc_write(RTC_MIN,bintobcd(dt->dt_min));
+ rtc_write(RTC_SEC, bintobcd(dt->dt_sec));
+ rtc_write(RTC_MIN, bintobcd(dt->dt_min));
h = rtc_read(RTC_HRS);
- if (h & 0x80) { /* time is am/pm format */
+ if ((h & 0x80) != 0) {
+ /* time is am/pm format */
if (dt->dt_hour == 0) {
- rtc_write(RTC_HRS,bintobcd(12)|0x80);
- } else if (dt->dt_hour < 12) { /* am */
- rtc_write(RTC_HRS,bintobcd(dt->dt_hour)|0x80);
+ rtc_write(RTC_HRS, bintobcd(12) | 0x80);
+ } else if (dt->dt_hour < 12) {
+ /* am */
+ rtc_write(RTC_HRS, bintobcd(dt->dt_hour) | 0x80);
} else if (dt->dt_hour == 12) {
- rtc_write(RTC_HRS,bintobcd(12)|0x80|0x20);
- } else /* pm */
- rtc_write(RTC_HRS,bintobcd(dt->dt_hour-12)|0x80|0x20);
- } else { /* time is 24 hour format */
- rtc_write(RTC_HRS,bintobcd(dt->dt_hour));
- }
- rtc_write(RTC_DAY,bintobcd(dt->dt_wday));
- rtc_write(RTC_DATE,bintobcd(dt->dt_day));
- rtc_write(RTC_MON,bintobcd(dt->dt_mon));
- rtc_write(RTC_YR,bintobcd(dt->dt_year%100));
+ rtc_write(RTC_HRS, bintobcd(12) | 0x80 | 0x20);
+ } else {
+ /* pm */
+ rtc_write(RTC_HRS,
+ bintobcd(dt->dt_hour - 12) | 0x80 | 0x20);
+ }
+ } else {
+ /* time is 24 hour format */
+ rtc_write(RTC_HRS, bintobcd(dt->dt_hour));
+ }
+ rtc_write(RTC_DAY, bintobcd(dt->dt_wday));
+ rtc_write(RTC_DATE, bintobcd(dt->dt_day));
+ rtc_write(RTC_MON, bintobcd(dt->dt_mon));
+ rtc_write(RTC_YR, bintobcd(dt->dt_year % 100));
#ifdef RTC_DEBUG
- printf("Regs after:\n",secs);
+ printf("Regs after:\n", secs);
rtc_print();
#endif
/* restart the clock */
- rtc_write(RTC_CONTROL,rtc_read(RTC_CONTROL) | RTC_START);
+ rtc_write(RTC_CONTROL, rtc_read(RTC_CONTROL) | RTC_START);
return 0;
}
int
gettime_new(todr_chip_handle_t tch, struct timeval *tvp)
{
- tvp->tv_sec = rtc_read(RTC_CNTR0) << 24 |
- rtc_read(RTC_CNTR1) << 16 |
- rtc_read(RTC_CNTR2) << 8 |
- rtc_read(RTC_CNTR3);
+ tvp->tv_sec =
+ rtc_read(RTC_CNTR0) << 24 |
+ rtc_read(RTC_CNTR1) << 16 |
+ rtc_read(RTC_CNTR2) << 8 |
+ rtc_read(RTC_CNTR3);
return 0;
}
@@ -362,25 +377,25 @@ settime_new(todr_chip_handle_t tch, stru
{
/* Stop the clock */
- rtc_write(RTC_CONTROL,rtc_read(RTC_CONTROL) & ~RTC_START);
+ rtc_write(RTC_CONTROL, rtc_read(RTC_CONTROL) & ~RTC_START);
#ifdef RTC_DEBUG
- printf("Setting RTC to 0x%08x. Regs before:\n",tvp->tv_sec);
+ printf("Setting RTC to 0x%08x. Regs before:\n", tvp->tv_sec);
rtc_print();
#endif
rtc_write(RTC_CNTR0, (tvp->tv_sec >> 24) & 0xff);
rtc_write(RTC_CNTR1, (tvp->tv_sec >> 16) & 0xff);
- rtc_write(RTC_CNTR2, (tvp->tv_sec >> 8) & 0xff);
+ rtc_write(RTC_CNTR2, (tvp->tv_sec >> 8) & 0xff);
rtc_write(RTC_CNTR3, (tvp->tv_sec) & 0xff);
#ifdef RTC_DEBUG
- printf("Regs after:\n",secs);
+ printf("Regs after:\n", secs);
rtc_print();
#endif
/* restart the clock */
- rtc_write(RTC_CONTROL,rtc_read(RTC_CONTROL) | RTC_START);
+ rtc_write(RTC_CONTROL, rtc_read(RTC_CONTROL) | RTC_START);
return 0;
}
Index: src/sys/arch/next68k/next68k/trap.c
diff -u src/sys/arch/next68k/next68k/trap.c:1.92 src/sys/arch/next68k/next68k/trap.c:1.93
--- src/sys/arch/next68k/next68k/trap.c:1.92 Sat Sep 25 19:16:31 2021
+++ src/sys/arch/next68k/next68k/trap.c Fri Feb 3 23:13:01 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: trap.c,v 1.92 2021/09/25 19:16:31 tsutsui Exp $ */
+/* $NetBSD: trap.c,v 1.93 2023/02/03 23:13:01 tsutsui Exp $ */
/*
* This file was taken from mvme68k/mvme68k/trap.c
* should probably be re-synced when needed.
* Darrin B. Jewell <[email protected]> Tue Aug 3 10:53:12 UTC 1999
- * original cvs id: NetBSD: trap.c,v 1.32 1999/08/03 10:52:06 dbj Exp
+ * original cvs id: NetBSD: trap.c,v 1.32 1999/08/03 10:52:06 dbj Exp
*/
/*
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.92 2021/09/25 19:16:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.93 2023/02/03 23:13:01 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -561,7 +561,7 @@ trap(struct frame *fp, int type, unsigne
goto dopanic;
}
#endif
-
+
pcb->pcb_onfault = NULL;
rv = uvm_fault(map, va, ftype);
pcb->pcb_onfault = onfault;
Index: src/sys/arch/next68k/next68k/vectors.s
diff -u src/sys/arch/next68k/next68k/vectors.s:1.12 src/sys/arch/next68k/next68k/vectors.s:1.13
--- src/sys/arch/next68k/next68k/vectors.s:1.12 Sun Dec 5 04:54:21 2021
+++ src/sys/arch/next68k/next68k/vectors.s Fri Feb 3 23:13:01 2023
@@ -1,4 +1,4 @@
-| $NetBSD: vectors.s,v 1.12 2021/12/05 04:54:21 msaitoh Exp $
+| $NetBSD: vectors.s,v 1.13 2023/02/03 23:13:01 tsutsui Exp $
| This file was taken from mvme68k/mvme68k/vectors.s
| should probably be re-synced when needed.
@@ -37,7 +37,7 @@
|
.data
-
+
GLOBAL(vectab)
VECTOR(badtrap) /* 0: (unused reset SSP) */
VECTOR(badtrap) /* 1: NOT USED (reset PC) */
@@ -83,13 +83,13 @@ GLOBAL(vectab)
#ifdef COMPAT_13
VECTOR(trap1) /* 33: compat_13_sigreturn */
#else
- VECTOR(illinst)
+ VECTOR(illinst)
#endif
VECTOR(trap2) /* 34: trace */
#ifdef COMPAT_16
VECTOR(trap3) /* 35: compat_16_sigreturn */
#else
- VECTOR(illinst)
+ VECTOR(illinst)
#endif
VECTOR(illinst) /* 36: TRAP instruction vector */
VECTOR(illinst) /* 37: TRAP instruction vector */
