Module Name: src
Committed By: tsutsui
Date: Fri Dec 20 23:52:00 UTC 2024
Modified Files:
src/sys/arch/sun3/dev: am9516.h bt_subr.c bw2.c cg2.c cg4.c dma.c
eeprom.c esp.c fb.c fd.c if_ie_obio.c if_ie_sebuf.c if_ie_vme.c
if_le.c kd.c memerr.c sebuf.c si.c si_obio.c si_sebuf.c si_vme.c
sireg.h xd.c xdreg.h xio.h xy.c xyreg.h zs.c zs_kgdb.c
Log Message:
Remove trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun3/dev/am9516.h \
src/sys/arch/sun3/dev/sireg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sun3/dev/bt_subr.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sun3/dev/bw2.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sun3/dev/cg2.c \
src/sys/arch/sun3/dev/si_sebuf.c src/sys/arch/sun3/dev/si_vme.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sun3/dev/cg4.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sun3/dev/dma.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sun3/dev/eeprom.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sun3/dev/esp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/dev/fb.c \
src/sys/arch/sun3/dev/if_ie_sebuf.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun3/dev/if_ie_obio.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun3/dev/if_ie_vme.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sun3/dev/if_le.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sun3/dev/kd.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/dev/memerr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sun3/dev/si.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sun3/dev/si_obio.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun3/dev/xdreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sun3/dev/xio.h
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sun3/dev/xyreg.h
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/sun3/dev/zs.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sun3/dev/zs_kgdb.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/sun3/dev/am9516.h
diff -u src/sys/arch/sun3/dev/am9516.h:1.2 src/sys/arch/sun3/dev/am9516.h:1.3
--- src/sys/arch/sun3/dev/am9516.h:1.2 Sat May 3 18:11:03 2003
+++ src/sys/arch/sun3/dev/am9516.h Fri Dec 20 23:51:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: am9516.h,v 1.2 2003/05/03 18:11:03 wiz Exp $ */
+/* $NetBSD: am9516.h,v 1.3 2024/12/20 23:51:59 tsutsui Exp $ */
/*
* This file is derived from the file dev/devSCSI3.c from
@@ -33,8 +33,8 @@
#define UDC_ADR_CMR_LOW 0x52 /* channel mode reg, low word */
#define UDC_ADR_COUNT 0x32 /* number of words to transfer */
-/*
- * For a DMA transfer, the appropriate udc registers are loaded from a
+/*
+ * For a DMA transfer, the appropriate udc registers are loaded from a
* table in memory pointed to by the chain address register.
*/
struct udc_table {
Index: src/sys/arch/sun3/dev/sireg.h
diff -u src/sys/arch/sun3/dev/sireg.h:1.2 src/sys/arch/sun3/dev/sireg.h:1.3
--- src/sys/arch/sun3/dev/sireg.h:1.2 Sat May 3 18:11:05 2003
+++ src/sys/arch/sun3/dev/sireg.h Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sireg.h,v 1.2 2003/05/03 18:11:05 wiz Exp $ */
+/* $NetBSD: sireg.h,v 1.3 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Register map for the Sun3 SCSI Interface (si)
@@ -12,12 +12,12 @@
/*
* Some of these registers apply to only one interface and some
- * apply to both. The registers which apply to the Sun3/50 onboard
+ * apply to both. The registers which apply to the Sun3/50 onboard
* version only are udc_rdata and udc_raddr. The registers which
* apply to the Sun3 vme version only are dma_addr, dma_count, bpr,
- * iv_am, and bcrh. Thus, the sbc registers, fifo_data, bcr, and csr
+ * iv_am, and bcrh. Thus, the sbc registers, fifo_data, bcr, and csr
* apply to both interfaces.
- * One other feature of the vme interface: a write to the DMA count
+ * One other feature of the vme interface: a write to the DMA count
* register also causes a write to the fifo byte count register and
* vis versa.
*/
Index: src/sys/arch/sun3/dev/bt_subr.c
diff -u src/sys/arch/sun3/dev/bt_subr.c:1.9 src/sys/arch/sun3/dev/bt_subr.c:1.10
--- src/sys/arch/sun3/dev/bt_subr.c:1.9 Sun Dec 11 12:19:20 2005
+++ src/sys/arch/sun3/dev/bt_subr.c Fri Dec 20 23:51:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_subr.c,v 1.9 2005/12/11 12:19:20 christos Exp $ */
+/* $NetBSD: bt_subr.c,v 1.10 2024/12/20 23:51:59 tsutsui Exp $ */
/*
* Copyright (c) 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.9 2005/12/11 12:19:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.10 2024/12/20 23:51:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v
/*
* Implement an FBIOGETCMAP-like ioctl.
*/
-int
+int
bt_getcmap(struct fbcmap *p, union bt_cmap *cm, int cmsize)
{
u_int i, start, count;
@@ -86,7 +86,7 @@ bt_getcmap(struct fbcmap *p, union bt_cm
/*
* Implement the software portion of an FBIOPUTCMAP-like ioctl.
*/
-int
+int
bt_putcmap(struct fbcmap *p, union bt_cmap *cm, int cmsize)
{
u_int i, start, count;
Index: src/sys/arch/sun3/dev/bw2.c
diff -u src/sys/arch/sun3/dev/bw2.c:1.37 src/sys/arch/sun3/dev/bw2.c:1.38
--- src/sys/arch/sun3/dev/bw2.c:1.37 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/bw2.c Fri Dec 20 23:51:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bw2.c,v 1.37 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: bw2.c,v 1.38 2024/12/20 23:51:59 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.37 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.38 2024/12/20 23:51:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ static struct fbdriver bw2fbdriver = {
bw2gvideo, bw2svideo,
fb_noioctl, fb_noioctl, };
-static int
+static int
bw2match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -188,7 +188,7 @@ bw2match(device_t parent, cfdata_t cf, v
/*
* Attach a display. We need to notice if it is the console, too.
*/
-static void
+static void
bw2attach(device_t parent, device_t self, void *args)
{
struct bw2_softc *sc = device_private(self);
@@ -295,7 +295,7 @@ bw2attach(device_t parent, device_t self
fb_attach(fb, 1);
}
-int
+int
bw2open(dev_t dev, int flags, int mode, struct lwp *l)
{
struct bw2_softc *sc;
@@ -307,7 +307,7 @@ bw2open(dev_t dev, int flags, int mode,
return 0;
}
-int
+int
bw2ioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
struct bw2_softc *sc = device_lookup_private(&bwtwo_cd, minor(dev));
@@ -319,7 +319,7 @@ bw2ioctl(dev_t dev, u_long cmd, void *da
* Return the address that would map the given device at the given
* offset, allowing for the given protection, or return -1 for error.
*/
-paddr_t
+paddr_t
bw2mmap(dev_t dev, off_t off, int prot)
{
struct bw2_softc *sc = device_lookup_private(&bwtwo_cd, minor(dev));
@@ -339,7 +339,7 @@ bw2mmap(dev_t dev, off_t off, int prot)
}
/* FBIOGVIDEO: */
-static int
+static int
bw2gvideo(struct fbdevice *fb, void *data)
{
struct bw2_softc *sc = fb->fb_private;
@@ -350,7 +350,7 @@ bw2gvideo(struct fbdevice *fb, void *dat
}
/* FBIOSVIDEO: */
-static int
+static int
bw2svideo(struct fbdevice *fb, void *data)
{
struct bw2_softc *sc = fb->fb_private;
Index: src/sys/arch/sun3/dev/cg2.c
diff -u src/sys/arch/sun3/dev/cg2.c:1.32 src/sys/arch/sun3/dev/cg2.c:1.33
--- src/sys/arch/sun3/dev/cg2.c:1.32 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/cg2.c Fri Dec 20 23:51:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cg2.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: cg2.c,v 1.33 2024/12/20 23:51:59 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.33 2024/12/20 23:51:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,7 +134,7 @@ static int cg2intr(void *);
/*
* Match a cg2.
*/
-static int
+static int
cg2match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -162,7 +162,7 @@ cg2match(device_t parent, cfdata_t cf, v
/*
* Attach a display. We need to notice if it is the console, too.
*/
-static void
+static void
cg2attach(device_t parent, device_t self, void *args)
{
struct cg2_softc *sc = device_private(self);
@@ -202,7 +202,7 @@ cg2attach(device_t parent, device_t self
fb_attach(fb, 2);
}
-int
+int
cg2open(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cg2_softc *sc;
@@ -214,7 +214,7 @@ cg2open(dev_t dev, int flags, int mode,
return 0;
}
-int
+int
cg2ioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
struct cg2_softc *sc = device_lookup_private(&cgtwo_cd, minor(dev));
@@ -226,7 +226,7 @@ cg2ioctl(dev_t dev, u_long cmd, void *da
* Return the address that would map the given device at the given
* offset, allowing for the given protection, or return -1 for error.
*/
-paddr_t
+paddr_t
cg2mmap(dev_t dev, off_t off, int prot)
{
struct cg2_softc *sc = device_lookup_private(&cgtwo_cd, minor(dev));
@@ -249,7 +249,7 @@ cg2mmap(dev_t dev, off_t off, int prot)
*/
/* FBIOGATTR: */
-static int
+static int
cg2gattr(struct fbdevice *fb, void *data)
{
struct fbgattr *fba = data;
@@ -266,7 +266,7 @@ cg2gattr(struct fbdevice *fb, void *data
}
/* FBIOGVIDEO: */
-static int
+static int
cg2gvideo(struct fbdevice *fb, void *data)
{
int *on = data;
@@ -277,7 +277,7 @@ cg2gvideo(struct fbdevice *fb, void *dat
}
/* FBIOSVIDEO: */
-static int
+static int
cg2svideo(struct fbdevice *fb, void *data)
{
int *on = data;
@@ -289,7 +289,7 @@ cg2svideo(struct fbdevice *fb, void *dat
}
/* FBIOGETCMAP: */
-static int
+static int
cg2getcmap(struct fbdevice *fb, void *data)
{
struct fbcmap *cmap = data;
@@ -330,7 +330,7 @@ cg2getcmap(struct fbdevice *fb, void *da
}
/* FBIOPUTCMAP: */
-static int
+static int
cg2putcmap(struct fbdevice *fb, void *data)
{
struct fbcmap *cmap = data;
@@ -372,7 +372,7 @@ cg2putcmap(struct fbdevice *fb, void *da
}
-static int
+static int
cg2intr(void *vsc)
{
struct cg2_softc *sc = vsc;
Index: src/sys/arch/sun3/dev/si_sebuf.c
diff -u src/sys/arch/sun3/dev/si_sebuf.c:1.32 src/sys/arch/sun3/dev/si_sebuf.c:1.33
--- src/sys/arch/sun3/dev/si_sebuf.c:1.32 Mon Jan 23 22:16:44 2023
+++ src/sys/arch/sun3/dev/si_sebuf.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: si_sebuf.c,v 1.32 2023/01/23 22:16:44 andvar Exp $ */
+/* $NetBSD: si_sebuf.c,v 1.33 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si_sebuf.c,v 1.32 2023/01/23 22:16:44 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si_sebuf.c,v 1.33 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ int se_dma_intr_timo = 500; /* ticks (se
int se_debug = 0;
-static int
+static int
se_match(device_t parent, cfdata_t cf, void *args)
{
struct sebuf_attach_args *aa = args;
@@ -160,7 +160,7 @@ se_match(device_t parent, cfdata_t cf, v
return 1;
}
-static void
+static void
se_attach(device_t parent, device_t self, void *args)
{
struct se_softc *sc = device_private(self);
@@ -218,7 +218,7 @@ se_attach(device_t parent, device_t self
*/
ncr_sc->sc_no_disconnect =
(sc->sc_options & SE_NO_DISCONNECT);
- ncr_sc->sc_parity_disable =
+ ncr_sc->sc_parity_disable =
(sc->sc_options & SE_NO_PARITY_CHK) >> 8;
if (sc->sc_options & SE_FORCE_POLLING)
ncr_sc->sc_flags |= NCR5380_FORCE_POLLING;
@@ -294,7 +294,7 @@ se_reset(struct ncr5380_softc *ncr_sc)
* Who would have guessed!
* What a NASTY trick!
*/
-void
+void
se_intr_on(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -317,7 +317,7 @@ se_intr_on(struct ncr5380_softc *ncr_sc)
* This is called when the bus is idle and we are
* about to start playing with the SBC chip.
*/
-void
+void
se_intr_off(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -337,7 +337,7 @@ se_intr_off(struct ncr5380_softc *ncr_sc
* when the FIFO is not empty or the FIFO count is non-zero!
* XXX: Need to copy data into the DMA buffer...
*/
-void
+void
se_dma_setup(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -383,7 +383,7 @@ se_dma_setup(struct ncr5380_softc *ncr_s
}
-void
+void
se_dma_start(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -432,7 +432,7 @@ se_dma_start(struct ncr5380_softc *ncr_s
}
-void
+void
se_dma_eop(struct ncr5380_softc *ncr_sc)
{
@@ -440,7 +440,7 @@ se_dma_eop(struct ncr5380_softc *ncr_sc)
}
-void
+void
se_dma_stop(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -557,7 +557,7 @@ se_intr(void *arg)
* for DMA transfer. On the Sun3/E, this means we have to
* allocate space in the DMA buffer for this transfer.
*/
-void
+void
se_dma_alloc(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
@@ -629,7 +629,7 @@ found:
}
-void
+void
se_dma_free(struct ncr5380_softc *ncr_sc)
{
struct sci_req *sr = ncr_sc->sc_current;
@@ -663,7 +663,7 @@ se_dma_free(struct ncr5380_softc *ncr_sc
* xx_dma_stop() will be called next.
* Same for either VME or OBIO.
*/
-void
+void
se_dma_poll(struct ncr5380_softc *ncr_sc)
{
struct se_softc *sc = (struct se_softc *)ncr_sc;
Index: src/sys/arch/sun3/dev/si_vme.c
diff -u src/sys/arch/sun3/dev/si_vme.c:1.32 src/sys/arch/sun3/dev/si_vme.c:1.33
--- src/sys/arch/sun3/dev/si_vme.c:1.32 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/si_vme.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: si_vme.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: si_vme.c,v 1.33 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
****************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si_vme.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si_vme.c,v 1.33 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ CFATTACH_DECL_NEW(si_vme, sizeof(struct
int si_vme_options = 0x0f;
-static int
+static int
si_vme_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -167,7 +167,7 @@ si_vme_match(device_t parent, cfdata_t c
return 1;
}
-static void
+static void
si_vme_attach(device_t parent, device_t self, void *args)
{
struct si_softc *sc = device_private(self);
@@ -268,7 +268,7 @@ si_vme_reset(struct ncr5380_softc *ncr_s
* Who would have guessed!
* What a NASTY trick!
*/
-void
+void
si_vme_intr_on(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -293,7 +293,7 @@ si_vme_intr_on(struct ncr5380_softc *ncr
* This is called when the bus is idle and we are
* about to start playing with the SBC chip.
*/
-void
+void
si_vme_intr_off(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -313,7 +313,7 @@ si_vme_intr_off(struct ncr5380_softc *nc
* On the VME version, setup the start address, but clear the
* count (to make sure it stays idle) and set that later.
*/
-void
+void
si_vme_dma_setup(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -376,7 +376,7 @@ si_vme_dma_setup(struct ncr5380_softc *n
}
-void
+void
si_vme_dma_start(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -430,7 +430,7 @@ si_vme_dma_start(struct ncr5380_softc *n
}
-void
+void
si_vme_dma_eop(struct ncr5380_softc *ncr_sc)
{
@@ -438,7 +438,7 @@ si_vme_dma_eop(struct ncr5380_softc *ncr
}
-void
+void
si_vme_dma_stop(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
Index: src/sys/arch/sun3/dev/cg4.c
diff -u src/sys/arch/sun3/dev/cg4.c:1.42 src/sys/arch/sun3/dev/cg4.c:1.43
--- src/sys/arch/sun3/dev/cg4.c:1.42 Sat Nov 21 00:27:52 2020
+++ src/sys/arch/sun3/dev/cg4.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cg4.c,v 1.42 2020/11/21 00:27:52 thorpej Exp $ */
+/* $NetBSD: cg4.c,v 1.43 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cg4.c,v 1.42 2020/11/21 00:27:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cg4.c,v 1.43 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ static struct fbdriver cg4_fbdriver = {
/*
* Match a cg4.
*/
-static int
+static int
cg4match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -242,7 +242,7 @@ cg4match(device_t parent, cfdata_t cf, v
/*
* Attach a display. We need to notice if it is the console, too.
*/
-static void
+static void
cg4attach(device_t parent, device_t self, void *args)
{
struct cg4_softc *sc = device_private(self);
@@ -337,7 +337,7 @@ cg4attach(device_t parent, device_t self
fb_attach(fb, 4);
}
-int
+int
cg4open(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cg4_softc *sc;
@@ -349,7 +349,7 @@ cg4open(dev_t dev, int flags, int mode,
return 0;
}
-int
+int
cg4ioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
struct cg4_softc *sc = device_lookup_private(&cgfour_cd, minor(dev));
@@ -368,7 +368,7 @@ cg4ioctl(dev_t dev, u_long cmd, void *da
*
* The hardware looks completely different.
*/
-paddr_t
+paddr_t
cg4mmap(dev_t dev, off_t off, int prot)
{
struct cg4_softc *sc = device_lookup_private(&cgfour_cd, minor(dev));
@@ -406,7 +406,7 @@ cg4mmap(dev_t dev, off_t off, int prot)
*/
/* FBIOGATTR: */
-static int
+static int
cg4gattr(struct fbdevice *fb, void *data)
{
struct fbgattr *fba = data;
@@ -423,7 +423,7 @@ cg4gattr(struct fbdevice *fb, void *data
}
/* FBIOGVIDEO: */
-static int
+static int
cg4gvideo(struct fbdevice *fb, void *data)
{
struct cg4_softc *sc = fb->fb_private;
@@ -434,7 +434,7 @@ cg4gvideo(struct fbdevice *fb, void *dat
}
/* FBIOSVIDEO: */
-static int
+static int
cg4svideo(struct fbdevice *fb, void *data)
{
struct cg4_softc *sc = fb->fb_private;
@@ -452,7 +452,7 @@ cg4svideo(struct fbdevice *fb, void *dat
* FBIOGETCMAP:
* Copy current colormap out to user space.
*/
-static int
+static int
cg4getcmap(struct fbdevice *fb, void *data)
{
struct cg4_softc *sc = fb->fb_private;
@@ -482,7 +482,7 @@ cg4getcmap(struct fbdevice *fb, void *da
* FBIOPUTCMAP:
* Copy new colormap from user space and load.
*/
-static int
+static int
cg4putcmap(struct fbdevice *fb, void *data)
{
struct cg4_softc *sc = fb->fb_private;
@@ -514,7 +514,7 @@ cg4putcmap(struct fbdevice *fb, void *da
****************************************************************/
#ifdef _SUN3_
-static void
+static void
cg4a_init(struct cg4_softc *sc)
{
volatile struct amd_regs *ar = sc->sc_va_cmap;
@@ -529,7 +529,7 @@ cg4a_init(struct cg4_softc *sc)
}
}
-static void
+static void
cg4a_ldcmap(struct cg4_softc *sc)
{
volatile struct amd_regs *ar = sc->sc_va_cmap;
@@ -564,7 +564,7 @@ cg4a_ldcmap(struct cg4_softc *sc)
* Routines for the "Type B" hardware
****************************************************************/
-static void
+static void
cg4b_init(struct cg4_softc *sc)
{
volatile struct bt_regs *bt = sc->sc_va_cmap;
@@ -613,7 +613,7 @@ cg4b_init(struct cg4_softc *sc)
}
}
-static void
+static void
cg4b_ldcmap(struct cg4_softc *sc)
{
volatile struct bt_regs *bt = sc->sc_va_cmap;
Index: src/sys/arch/sun3/dev/dma.c
diff -u src/sys/arch/sun3/dev/dma.c:1.24 src/sys/arch/sun3/dev/dma.c:1.25
--- src/sys/arch/sun3/dev/dma.c:1.24 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/dma.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.24 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: dma.c,v 1.25 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1994 Paul Kranenburg. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.24 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.25 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -63,7 +63,7 @@ static void dmaattach(device_t, device_t
CFATTACH_DECL_NEW(dma, sizeof(struct dma_softc),
dmamatch, dmaattach, NULL, NULL);
-static int
+static int
dmamatch(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -81,7 +81,7 @@ dmamatch(device_t parent, cfdata_t cf, v
return 1;
}
-static void
+static void
dmaattach(device_t parent, device_t self, void *aux)
{
struct dma_softc *sc = device_private(self);
@@ -200,7 +200,7 @@ espdmafind(int unit)
DMA_SCSR(sc, _csr); \
} while (/* CONSTCOND */0)
-void
+void
dma_reset(struct dma_softc *sc)
{
uint32_t csr;
@@ -241,7 +241,7 @@ dma_reset(struct dma_softc *sc)
/*
* setup a dma transfer
*/
-int
+int
dma_setup(struct dma_softc *sc, uint8_t **addr, size_t *len, int datain,
size_t *dmasize)
{
@@ -302,7 +302,7 @@ dma_setup(struct dma_softc *sc, uint8_t
*
* return 1 if it was a DMA continue.
*/
-int
+int
espdmaintr(struct dma_softc *sc)
{
struct ncr53c9x_softc *nsc = sc->sc_client;
Index: src/sys/arch/sun3/dev/eeprom.c
diff -u src/sys/arch/sun3/dev/eeprom.c:1.34 src/sys/arch/sun3/dev/eeprom.c:1.35
--- src/sys/arch/sun3/dev/eeprom.c:1.34 Sat Nov 21 00:27:52 2020
+++ src/sys/arch/sun3/dev/eeprom.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eeprom.c,v 1.34 2020/11/21 00:27:52 thorpej Exp $ */
+/* $NetBSD: eeprom.c,v 1.35 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.34 2020/11/21 00:27:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.35 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ static void eeprom_attach(device_t, devi
CFATTACH_DECL_NEW(eeprom, 0,
eeprom_match, eeprom_attach, NULL, NULL);
-static int
+static int
eeprom_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -87,7 +87,7 @@ eeprom_match(device_t parent, cfdata_t c
return 1;
}
-static void
+static void
eeprom_attach(device_t parent, device_t self, void *args)
{
struct confargs *ca = args;
Index: src/sys/arch/sun3/dev/esp.c
diff -u src/sys/arch/sun3/dev/esp.c:1.29 src/sys/arch/sun3/dev/esp.c:1.30
--- src/sys/arch/sun3/dev/esp.c:1.29 Sun Jun 2 13:28:45 2024
+++ src/sys/arch/sun3/dev/esp.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.29 2024/06/02 13:28:45 andvar Exp $ */
+/* $NetBSD: esp.c,v 1.30 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.29 2024/06/02 13:28:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.30 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -101,7 +101,7 @@ static struct ncr53c9x_glue esp_glue = {
NULL, /* gl_clear_latched_intr */
};
-static int
+static int
espmatch(device_t parent, struct cfdata *cf, void *aux)
{
struct confargs *ca = aux;
@@ -120,7 +120,7 @@ espmatch(device_t parent, struct cfdata
return 1;
}
-static void
+static void
espattach(device_t parent, device_t self, void *aux)
{
struct esp_softc *esc = device_private(self);
@@ -266,7 +266,7 @@ esp_write_reg(struct ncr53c9x_softc *sc,
bus_space_write_1(esc->sc_bst, esc->sc_bsh, reg * 4, val);
}
-int
+int
esp_dma_isintr(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -274,7 +274,7 @@ esp_dma_isintr(struct ncr53c9x_softc *sc
return DMA_ISINTR(esc->sc_dma);
}
-void
+void
esp_dma_reset(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -282,7 +282,7 @@ esp_dma_reset(struct ncr53c9x_softc *sc)
dma_reset(esc->sc_dma);
}
-int
+int
esp_dma_intr(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -290,7 +290,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
return espdmaintr(esc->sc_dma);
}
-int
+int
esp_dma_setup(struct ncr53c9x_softc *sc, uint8_t **addr, size_t *len,
int datain, size_t *dmasize)
{
@@ -299,7 +299,7 @@ esp_dma_setup(struct ncr53c9x_softc *sc,
return dma_setup(esc->sc_dma, addr, len, datain, dmasize);
}
-void
+void
esp_dma_go(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -307,7 +307,7 @@ esp_dma_go(struct ncr53c9x_softc *sc)
DMA_GO(esc->sc_dma);
}
-void
+void
esp_dma_stop(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -315,7 +315,7 @@ esp_dma_stop(struct ncr53c9x_softc *sc)
DMA_STOP(esc->sc_dma);
}
-int
+int
esp_dma_isactive(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
Index: src/sys/arch/sun3/dev/fb.c
diff -u src/sys/arch/sun3/dev/fb.c:1.16 src/sys/arch/sun3/dev/fb.c:1.17
--- src/sys/arch/sun3/dev/fb.c:1.16 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sun3/dev/fb.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.16 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: fb.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.16 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ static int fbpriority;
* This is called by the real driver (i.e. bw2, cg3, ...)
* to declare itself as a potential default frame buffer.
*/
-void
+void
fb_attach(struct fbdevice *fb, int newpri)
{
if (fbpriority < newpri) {
@@ -96,7 +96,7 @@ fb_attach(struct fbdevice *fb, int newpr
}
}
-int
+int
fbopen(dev_t dev, int flags, int mode, struct lwp *l)
{
@@ -105,20 +105,20 @@ fbopen(dev_t dev, int flags, int mode, s
return ((*devfb->fb_driver->fbd_open)(dev, flags, mode, l));
}
-int
+int
fbclose(dev_t dev, int flags, int mode, struct lwp *l)
{
return ((*devfb->fb_driver->fbd_close)(dev, flags, mode, l));
}
-int
+int
fbioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
return (fbioctlfb(devfb, cmd, data));
}
-paddr_t
+paddr_t
fbmmap(dev_t dev, off_t off, int prot)
{
return ((*devfb->fb_driver->fbd_mmap)(dev, off, prot));
@@ -127,7 +127,7 @@ fbmmap(dev_t dev, off_t off, int prot)
/*
* Common fb ioctl function
*/
-int
+int
fbioctlfb(struct fbdevice *fb, u_long cmd, void *data)
{
struct fbdriver *fbd = fb->fb_driver;
@@ -167,7 +167,7 @@ fbioctlfb(struct fbdevice *fb, u_long cm
return (error);
}
-void
+void
fb_unblank(void)
{
int on = 1;
@@ -182,7 +182,7 @@ fb_unblank(void)
* Default ioctl function to put in struct fbdriver
* for functions that are not supported.
*/
-int
+int
fb_noioctl(struct fbdevice *fbd, void *vp)
{
return ENOTTY;
@@ -193,7 +193,7 @@ fb_noioctl(struct fbdevice *fbd, void *v
*/
/* Set FB size based on EEPROM screen shape code. */
-void
+void
fb_eeprom_setsize(struct fbdevice *fb)
{
int szcode;
@@ -237,7 +237,7 @@ fb_eeprom_setsize(struct fbdevice *fb)
* Probe for a P4 register at the passed virtual address.
* Returns P4 ID value, or -1 if no P4 register.
*/
-int
+int
fb_pfour_id(void *va)
{
volatile uint32_t val, save, *pfour = va;
@@ -263,7 +263,7 @@ fb_pfour_id(void *va)
/*
* Return the status of the video enable.
*/
-int
+int
fb_pfour_get_video(struct fbdevice *fb)
{
@@ -273,7 +273,7 @@ fb_pfour_get_video(struct fbdevice *fb)
/*
* Turn video on or off using the P4 register.
*/
-void
+void
fb_pfour_set_video(struct fbdevice *fb, int on)
{
int pfour;
@@ -296,7 +296,7 @@ static const struct {
/*
* Use the P4 register to determine the screen size.
*/
-void
+void
fb_pfour_setsize(struct fbdevice *fb)
{
int p4, p4type, p4size;
Index: src/sys/arch/sun3/dev/if_ie_sebuf.c
diff -u src/sys/arch/sun3/dev/if_ie_sebuf.c:1.16 src/sys/arch/sun3/dev/if_ie_sebuf.c:1.17
--- src/sys/arch/sun3/dev/if_ie_sebuf.c:1.16 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/dev/if_ie_sebuf.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_sebuf.c,v 1.16 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: if_ie_sebuf.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_sebuf.c,v 1.16 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_sebuf.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_inet.h"
@@ -89,7 +89,7 @@ static void ie_sebuf_attach(device_t, de
CFATTACH_DECL_NEW(ie_sebuf, sizeof(struct ie_softc),
ie_sebuf_match, ie_sebuf_attach, NULL, NULL);
-static int
+static int
ie_sebuf_match(device_t parent, cfdata_t cf, void *args)
{
struct sebuf_attach_args *aa = args;
@@ -103,7 +103,7 @@ ie_sebuf_match(device_t parent, cfdata_t
return 1;
}
-static void
+static void
ie_sebuf_attach(device_t parent, device_t self, void *args)
{
struct ie_softc *sc = device_private(self);
@@ -183,7 +183,7 @@ ie_sebuf_attach(device_t parent, device_
}
/* Whack the "channel attetion" line. */
-void
+void
ie_sebuf_attend(struct ie_softc *sc)
{
volatile struct ie_regs *regs = (struct ie_regs *)sc->sc_reg;
@@ -196,7 +196,7 @@ ie_sebuf_attend(struct ie_softc *sc)
* This is called during driver attach.
* Reset and initialize.
*/
-void
+void
ie_sebuf_reset(struct ie_softc *sc)
{
volatile struct ie_regs *regs = (struct ie_regs *)sc->sc_reg;
@@ -209,7 +209,7 @@ ie_sebuf_reset(struct ie_softc *sc)
* This is called at the end of ieinit().
* optional.
*/
-void
+void
ie_sebuf_run(struct ie_softc *sc)
{
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.87 src/sys/arch/sun3/dev/fd.c:1.88
--- src/sys/arch/sun3/dev/fd.c:1.87 Fri May 20 19:34:22 2022
+++ src/sys/arch/sun3/dev/fd.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.87 2022/05/20 19:34:22 andvar Exp $ */
+/* $NetBSD: fd.c,v 1.88 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.87 2022/05/20 19:34:22 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.88 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_ddb.h"
@@ -354,7 +354,7 @@ static void fdconf(struct fdc_softc *);
*/
#define FCR_REG_SYNC() (*fdc->sc_reg_fcr = fdc->sc_fcr)
-int
+int
fdcmatch(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -381,7 +381,7 @@ struct fdc_attach_args {
* Return QUIET (config_find ignores this if the device was configured) to
* avoid printing `fdN not configured' messages.
*/
-int
+int
fdprint(void *aux, const char *fdc)
{
struct fdc_attach_args *fa = aux;
@@ -391,7 +391,7 @@ fdprint(void *aux, const char *fdc)
return QUIET;
}
-static void
+static void
fdconf(struct fdc_softc *fdc)
{
int vroom;
@@ -414,7 +414,7 @@ fdconf(struct fdc_softc *fdc)
/* No result phase */
}
-void
+void
fdcattach(device_t parent, device_t self, void *aux)
{
struct confargs *ca = aux;
@@ -498,7 +498,7 @@ fdcattach(device_t parent, device_t self
}
}
-int
+int
fdmatch(device_t parent, cfdata_t cf, void *aux)
{
struct fdc_softc *fdc = device_private(parent);
@@ -559,7 +559,7 @@ fdmatch(device_t parent, cfdata_t cf, vo
/*
* Controller is working, and drive responded. Attach it.
*/
-void
+void
fdattach(device_t parent, device_t self, void *aux)
{
struct fdc_softc *fdc = device_private(parent);
@@ -654,7 +654,7 @@ fd_dev_to_type(struct fd_softc *fd, dev_
return type ? &fd_types[type - 1] : fd->sc_deftype;
}
-void
+void
fdstrategy(struct buf *bp)
{
struct fd_softc *fd;
@@ -729,7 +729,7 @@ fdstrategy(struct buf *bp)
biodone(bp);
}
-void
+void
fdstart(struct fd_softc *fd)
{
struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
@@ -744,7 +744,7 @@ fdstart(struct fd_softc *fd)
fdcstart(fdc);
}
-void
+void
fdfinish(struct fd_softc *fd, struct buf *bp)
{
struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
@@ -773,7 +773,7 @@ fdfinish(struct fd_softc *fd, struct buf
fdc->sc_state = DEVIDLE;
}
-void
+void
fdc_reset(struct fdc_softc *fdc)
{
@@ -790,7 +790,7 @@ fdc_reset(struct fdc_softc *fdc)
#endif
}
-void
+void
fd_set_motor(struct fdc_softc *fdc)
{
struct fd_softc *fd;
@@ -809,7 +809,7 @@ fd_set_motor(struct fdc_softc *fdc)
FCR_REG_SYNC();
}
-void
+void
fd_motor_off(void *arg)
{
struct fd_softc *fd = arg;
@@ -821,7 +821,7 @@ fd_motor_off(void *arg)
splx(s);
}
-void
+void
fd_motor_on(void *arg)
{
struct fd_softc *fd = arg;
@@ -836,7 +836,7 @@ fd_motor_on(void *arg)
splx(s);
}
-int
+int
fdcresult(struct fdc_softc *fdc)
{
uint8_t i;
@@ -876,7 +876,7 @@ out_fdc(struct fdc_softc *fdc, u_char x)
return 0;
}
-int
+int
fdopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit, pmask;
@@ -922,7 +922,7 @@ fdopen(dev_t dev, int flags, int fmt, st
return 0;
}
-int
+int
fdclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct fd_softc *fd = device_lookup_private(&fd_cd, FDUNIT(dev));
@@ -946,21 +946,21 @@ fdclose(dev_t dev, int flags, int fmt, s
return 0;
}
-int
+int
fdread(dev_t dev, struct uio *uio, int flag)
{
return physio(fdstrategy, NULL, dev, B_READ, minphys, uio);
}
-int
+int
fdwrite(dev_t dev, struct uio *uio, int flag)
{
return physio(fdstrategy, NULL, dev, B_WRITE, minphys, uio);
}
-void
+void
fdcstart(struct fdc_softc *fdc)
{
@@ -1006,7 +1006,7 @@ fdcpstatus(int n, struct fdc_softc *fdc)
}
}
-void
+void
fdcstatus(device_t dv, int n, const char *s)
{
struct fdc_softc *fdc = device_private(device_parent(dv));
@@ -1030,7 +1030,7 @@ fdcstatus(device_t dv, int n, const char
fdcpstatus(n, fdc);
}
-void
+void
fdctimeout(void *arg)
{
struct fdc_softc *fdc = arg;
@@ -1049,7 +1049,7 @@ fdctimeout(void *arg)
splx(s);
}
-void
+void
fdcpseudointr(void *arg)
{
struct fdc_softc *fdc = arg;
@@ -1066,7 +1066,7 @@ fdcpseudointr(void *arg)
* hardware interrupt entry point: must be converted to `fast'
* (in-window) handler.
*/
-int
+int
fdchwintr(void *arg)
{
struct fdc_softc *fdc = arg;
@@ -1131,7 +1131,7 @@ fdchwintr(void *arg)
return 1;
}
-void
+void
fdcswintr(void *arg)
{
struct fdc_softc *fdc = arg;
@@ -1146,7 +1146,7 @@ fdcswintr(void *arg)
splx(s);
}
-int
+int
fdcstate(struct fdc_softc *fdc)
{
#define st0 fdc->sc_status[0]
@@ -1539,7 +1539,7 @@ fdcstate(struct fdc_softc *fdc)
#undef cyl
}
-void
+void
fdcretry(struct fdc_softc *fdc)
{
struct fd_softc *fd;
@@ -1586,7 +1586,7 @@ fdcretry(struct fdc_softc *fdc)
fdc->sc_errors++;
}
-int
+int
fdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct fd_softc *fd = device_lookup_private(&fd_cd, FDUNIT(dev));
@@ -1820,7 +1820,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
#endif
}
-int
+int
fdformat(dev_t dev, struct ne7_fd_formb *finfo, struct proc *p)
{
int rv = 0;
@@ -1864,7 +1864,7 @@ fdformat(dev_t dev, struct ne7_fd_formb
return rv;
}
-void
+void
fdgetdisklabel(dev_t dev)
{
int unit = FDUNIT(dev), i;
@@ -1925,7 +1925,7 @@ fdgetdisklabel(dev_t dev)
}
}
-void
+void
fd_do_eject(struct fdc_softc *fdc, int unit)
{
@@ -1941,7 +1941,7 @@ int fd_read_md_image(size_t *, void **);
#endif
/* ARGSUSED */
-void
+void
fd_mountroot_hook(device_t dev)
{
struct fd_softc *fd;
@@ -1972,7 +1972,7 @@ fd_mountroot_hook(device_t dev)
#define FDMICROROOTSIZE ((2*18*80) << DEV_BSHIFT)
-int
+int
fd_read_md_image(size_t *sizep, void **addrp)
{
struct fdc_softc *fdc;
Index: src/sys/arch/sun3/dev/if_ie_obio.c
diff -u src/sys/arch/sun3/dev/if_ie_obio.c:1.25 src/sys/arch/sun3/dev/if_ie_obio.c:1.26
--- src/sys/arch/sun3/dev/if_ie_obio.c:1.25 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/dev/if_ie_obio.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_obio.c,v 1.25 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: if_ie_obio.c,v 1.26 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.25 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.26 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_inet.h"
@@ -78,7 +78,7 @@ static void ie_obio_attach(device_t, dev
CFATTACH_DECL_NEW(ie_obio, sizeof(struct ie_softc),
ie_obio_match, ie_obio_attach, NULL, NULL);
-static int
+static int
ie_obio_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -94,7 +94,7 @@ ie_obio_match(device_t parent, cfdata_t
return 1;
}
-void
+void
ie_obio_attach(device_t parent, device_t self, void *args)
{
struct ie_softc *sc = device_private(self);
@@ -164,7 +164,7 @@ ie_obio_attach(device_t parent, device_t
*/
/* Whack the "channel attetion" line. */
-void
+void
ie_obattend(struct ie_softc *sc)
{
volatile struct ieob *ieo = (struct ieob *)sc->sc_reg;
@@ -177,7 +177,7 @@ ie_obattend(struct ie_softc *sc)
* This is called during driver attach.
* Reset and initialize.
*/
-void
+void
ie_obreset(struct ie_softc *sc)
{
volatile struct ieob *ieo = (struct ieob *)sc->sc_reg;
@@ -190,7 +190,7 @@ ie_obreset(struct ie_softc *sc)
* This is called at the end of ieinit().
* optional.
*/
-void
+void
ie_obrun(struct ie_softc *sc)
{
Index: src/sys/arch/sun3/dev/if_ie_vme.c
diff -u src/sys/arch/sun3/dev/if_ie_vme.c:1.23 src/sys/arch/sun3/dev/if_ie_vme.c:1.24
--- src/sys/arch/sun3/dev/if_ie_vme.c:1.23 Sat Jun 28 12:13:38 2008
+++ src/sys/arch/sun3/dev/if_ie_vme.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_vme.c,v 1.23 2008/06/28 12:13:38 tsutsui Exp $ */
+/* $NetBSD: if_ie_vme.c,v 1.24 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.23 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.24 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_inet.h"
@@ -86,7 +86,7 @@ static void ie_vme_attach(device_t, devi
CFATTACH_DECL_NEW(ie_vme, sizeof(struct ie_softc),
ie_vme_match, ie_vme_attach, NULL, NULL);
-static int
+static int
ie_vme_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -111,7 +111,7 @@ ie_vme_match(device_t parent, cfdata_t c
* a multibus/vme card. if you want to use a 3E you'll have
* to fix this.
*/
-void
+void
ie_vme_attach(device_t parent, device_t self, void *args)
{
struct ie_softc *sc = device_private(self);
@@ -194,7 +194,7 @@ ie_vme_attach(device_t parent, device_t
* MULTIBUS/VME support
*/
-void
+void
ie_vmeattend(struct ie_softc *sc)
{
volatile struct ievme *iev = (struct ievme *)sc->sc_reg;
@@ -203,7 +203,7 @@ ie_vmeattend(struct ie_softc *sc)
iev->status &= ~IEVME_ATTEN; /* down. */
}
-void
+void
ie_vmereset(struct ie_softc *sc)
{
volatile struct ievme *iev = (struct ievme *)sc->sc_reg;
@@ -213,7 +213,7 @@ ie_vmereset(struct ie_softc *sc)
iev->status = (IEVME_ONAIR | IEVME_IENAB | IEVME_PEINT);
}
-void
+void
ie_vmerun(struct ie_softc *sc)
{
Index: src/sys/arch/sun3/dev/if_le.c
diff -u src/sys/arch/sun3/dev/if_le.c:1.52 src/sys/arch/sun3/dev/if_le.c:1.53
--- src/sys/arch/sun3/dev/if_le.c:1.52 Tue Jan 19 22:06:23 2010
+++ src/sys/arch/sun3/dev/if_le.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.52 2010/01/19 22:06:23 pooka Exp $ */
+/* $NetBSD: if_le.c,v 1.53 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.52 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.53 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_inet.h"
@@ -100,9 +100,9 @@ CFATTACH_DECL_NEW(le, sizeof(struct le_s
#endif
hide void lewrcsr(struct lance_softc *, uint16_t, uint16_t);
-hide uint16_t lerdcsr(struct lance_softc *, uint16_t);
+hide uint16_t lerdcsr(struct lance_softc *, uint16_t);
-hide void
+hide void
lewrcsr(struct lance_softc *sc, uint16_t port, uint16_t val)
{
struct lereg1 *ler1 = ((struct le_softc *)sc)->sc_r1;
@@ -111,7 +111,7 @@ lewrcsr(struct lance_softc *sc, uint16_t
ler1->ler1_rdp = val;
}
-hide uint16_t
+hide uint16_t
lerdcsr(struct lance_softc *sc, uint16_t port)
{
struct lereg1 *ler1 = ((struct le_softc *)sc)->sc_r1;
@@ -120,9 +120,9 @@ lerdcsr(struct lance_softc *sc, uint16_t
ler1->ler1_rap = port;
val = ler1->ler1_rdp;
return (val);
-}
+}
-int
+int
le_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -138,7 +138,7 @@ le_match(device_t parent, cfdata_t cf, v
return (1);
}
-void
+void
le_attach(device_t parent, device_t self, void *aux)
{
struct le_softc *lesc = device_private(self);
Index: src/sys/arch/sun3/dev/kd.c
diff -u src/sys/arch/sun3/dev/kd.c:1.59 src/sys/arch/sun3/dev/kd.c:1.60
--- src/sys/arch/sun3/dev/kd.c:1.59 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sun3/dev/kd.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.59 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: kd.c,v 1.60 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.59 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.60 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.59
#include <machine/psl.h>
#include <dev/cons.h>
-#include <dev/sun/event_var.h>
+#include <dev/sun/event_var.h>
#include <dev/sun/kbd_xlate.h>
#include <dev/sun/kbdvar.h>
#include <sun3/dev/zs_cons.h>
@@ -112,7 +112,7 @@ const struct cdevsw kd_cdevsw = {
/*
* Prepare the console tty; called on first open of /dev/console
*/
-void
+void
kd_init(struct kd_softc *kd)
{
struct tty *tp;
@@ -139,7 +139,7 @@ kdtty(dev_t dev)
return (kd->kd_tty);
}
-int
+int
kdopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct kd_softc *kd;
@@ -191,7 +191,7 @@ static int firstopen = 1;
return ((*tp->t_linesw->l_open)(dev, tp));
}
-int
+int
kdclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct kd_softc *kd;
@@ -212,7 +212,7 @@ kdclose(dev_t dev, int flag, int mode, s
return (0);
}
-int
+int
kdread(dev_t dev, struct uio *uio, int flag)
{
struct kd_softc *kd;
@@ -224,7 +224,7 @@ kdread(dev_t dev, struct uio *uio, int f
return ((*tp->t_linesw->l_read)(tp, uio, flag));
}
-int
+int
kdwrite(dev_t dev, struct uio *uio, int flag)
{
struct kd_softc *kd;
@@ -236,7 +236,7 @@ kdwrite(dev_t dev, struct uio *uio, int
return ((*tp->t_linesw->l_write)(tp, uio, flag));
}
-int
+int
kdpoll(dev_t dev, int events, struct lwp *l)
{
struct kd_softc *kd;
@@ -244,11 +244,11 @@ kdpoll(dev_t dev, int events, struct lwp
kd = &kd_softc; /* XXX */
tp = kd->kd_tty;
-
+
return ((*tp->t_linesw->l_poll)(tp, events, l));
}
-int
+int
kdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
struct kd_softc *kd;
@@ -273,7 +273,7 @@ kdioctl(dev_t dev, u_long cmd, void *dat
return EPASSTHROUGH;
}
-static int
+static int
kdparam(struct tty *tp, struct termios *t)
{
/* XXX - These are ignored... */
@@ -286,7 +286,7 @@ kdparam(struct tty *tp, struct termios *
static void kd_putfb(struct tty *);
-static void
+static void
kdstart(struct tty *tp)
{
struct clist *cl;
@@ -330,7 +330,7 @@ out:
* Timeout function to do delayed writes to the screen.
* Called at splsoftclock when requested by kdstart.
*/
-static void
+static void
kd_later(void *tpaddr)
{
struct tty *tp = tpaddr;
@@ -349,7 +349,7 @@ kd_later(void *tpaddr)
* This can take a while, so to avoid missing
* interrupts, this is called at splsoftclock.
*/
-static void
+static void
kd_putfb(struct tty *tp)
{
char buf[PUT_WSIZE];
@@ -367,7 +367,7 @@ kd_putfb(struct tty *tp)
}
}
-void
+void
cons_attach_input(struct cons_channel *cc, struct consdev *cn)
{
struct kd_softc *kd = &kd_softc;
@@ -384,14 +384,14 @@ static int kd_rom_iclose(struct cons_cha
static struct cons_channel prom_cons_channel;
-int
+int
kd_rom_iopen(struct cons_channel *cc)
{
/* No-op */
return (0);
}
-int
+int
kd_rom_iclose(struct cons_channel *cc)
{
/* No-op */
@@ -402,7 +402,7 @@ kd_rom_iclose(struct cons_channel *cc)
* Our "interrupt" routine for input. This is called by
* the keyboard driver (dev/sun/kbd.c) at spltty.
*/
-void
+void
kd_cons_input(int c)
{
struct kd_softc *kd = &kd_softc;
@@ -442,12 +442,12 @@ struct consdev consdev_kd = {
};
/* We never call this. */
-static void
+static void
kdcnprobe(struct consdev *cn)
{
}
-static void
+static void
kdcninit(struct consdev *cn)
{
struct kbd_state *ks = &kdcn_state;
@@ -469,7 +469,7 @@ kdcninit(struct consdev *cn)
kd_is_console = 1;
}
-static int
+static int
kdcngetc(dev_t dev)
{
struct kbd_state *ks = &kdcn_state;
@@ -510,13 +510,13 @@ out:
return (keysym);
}
-static void
+static void
kdcnputc(dev_t dev, int c)
{
(romVectorPtr->fbWriteChar)(c & 0x7f);
}
-static void
+static void
kdcnpollc(dev_t dev, int on)
{
struct kbd_state *ks = &kdcn_state;
Index: src/sys/arch/sun3/dev/memerr.c
diff -u src/sys/arch/sun3/dev/memerr.c:1.22 src/sys/arch/sun3/dev/memerr.c:1.23
--- src/sys/arch/sun3/dev/memerr.c:1.22 Tue Dec 16 22:35:27 2008
+++ src/sys/arch/sun3/dev/memerr.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: memerr.c,v 1.22 2008/12/16 22:35:27 christos Exp $ */
+/* $NetBSD: memerr.c,v 1.23 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memerr.c,v 1.22 2008/12/16 22:35:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memerr.c,v 1.23 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ CFATTACH_DECL_NEW(memerr, sizeof(struct
static int memerr_attached;
-static int
+static int
memerr_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -99,7 +99,7 @@ memerr_match(device_t parent, cfdata_t c
return 1;
}
-static void
+static void
memerr_attach(device_t parent, device_t self, void *args)
{
struct memerr_softc *sc = device_private(self);
@@ -154,7 +154,7 @@ memerr_attach(device_t parent, device_t
* Functions for ECC memory
*****************************************************************/
-static int
+static int
memerr_interrupt(void *arg)
{
struct memerr_softc *sc = arg;
@@ -230,7 +230,7 @@ recover:
* Need to look at the ECC syndrome register on
* the memory board that caused the error...
*/
-void
+void
memerr_correctable(struct memerr_softc *sc)
{
Index: src/sys/arch/sun3/dev/sebuf.c
diff -u src/sys/arch/sun3/dev/sebuf.c:1.20 src/sys/arch/sun3/dev/sebuf.c:1.21
--- src/sys/arch/sun3/dev/sebuf.c:1.20 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/sebuf.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sebuf.c,v 1.20 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: sebuf.c,v 1.21 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.20 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.21 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ static int sebuf_print(void *, const ch
CFATTACH_DECL_NEW(sebuf, sizeof(struct sebuf_softc),
sebuf_match, sebuf_attach, NULL, NULL);
-static int
+static int
sebuf_match(device_t parent, cfdata_t cf, void *args)
{
struct confargs *ca = args;
@@ -132,7 +132,7 @@ sebuf_match(device_t parent, cfdata_t cf
return 1;
}
-static void
+static void
sebuf_attach(device_t parent, device_t self, void *args)
{
struct sebuf_softc *sc = device_private(self);
@@ -172,7 +172,7 @@ sebuf_attach(device_t parent, device_t s
(void)config_found(self, (void *)&aa, sebuf_print, CFARGS_NONE);
}
-static int
+static int
sebuf_print(void *aux, const char *name)
{
Index: src/sys/arch/sun3/dev/si.c
diff -u src/sys/arch/sun3/dev/si.c:1.64 src/sys/arch/sun3/dev/si.c:1.65
--- src/sys/arch/sun3/dev/si.c:1.64 Sat Nov 21 00:27:52 2020
+++ src/sys/arch/sun3/dev/si.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: si.c,v 1.64 2020/11/21 00:27:52 thorpej Exp $ */
+/* $NetBSD: si.c,v 1.65 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.64 2020/11/21 00:27:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.65 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ static void si_minphys(struct buf *);
* structures are in si_obio.c and si_vme.c
*/
-void
+void
si_attach(struct si_softc *sc)
{
struct ncr5380_softc *ncr_sc = &sc->ncr_sc;
@@ -132,7 +132,7 @@ si_attach(struct si_softc *sc)
*/
ncr_sc->sc_no_disconnect =
(sc->sc_options & SI_NO_DISCONNECT);
- ncr_sc->sc_parity_disable =
+ ncr_sc->sc_parity_disable =
(sc->sc_options & SI_NO_PARITY_CHK) >> 8;
if (sc->sc_options & SI_FORCE_POLLING)
ncr_sc->sc_flags |= NCR5380_FORCE_POLLING;
@@ -253,7 +253,7 @@ si_intr(void *arg)
* for DMA transfer. On the Sun3, this means mapping the buffer
* into DVMA space. dvma_mapin() flushes the cache for us.
*/
-void
+void
si_dma_alloc(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -338,7 +338,7 @@ found:
}
-void
+void
si_dma_free(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -375,7 +375,7 @@ si_dma_free(struct ncr5380_softc *ncr_sc
* xx_dma_stop() will be called next.
* Same for either VME or OBIO.
*/
-void
+void
si_dma_poll(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
Index: src/sys/arch/sun3/dev/si_obio.c
diff -u src/sys/arch/sun3/dev/si_obio.c:1.38 src/sys/arch/sun3/dev/si_obio.c:1.39
--- src/sys/arch/sun3/dev/si_obio.c:1.38 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/dev/si_obio.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: si_obio.c,v 1.38 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: si_obio.c,v 1.39 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
****************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si_obio.c,v 1.38 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si_obio.c,v 1.39 2024/12/20 23:52:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ CFATTACH_DECL_NEW(si_obio, sizeof(struct
int si_obio_options = 0x0f;
-static int
+static int
si_obio_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -151,7 +151,7 @@ si_obio_match(device_t parent, cfdata_t
return 1;
}
-static void
+static void
si_obio_attach(device_t parent, device_t self, void *args)
{
struct si_softc *sc = device_private(self);
@@ -239,7 +239,7 @@ si_obio_reset(struct ncr5380_softc *ncr_
si->fifo_count = 0;
}
-static inline void
+static inline void
si_obio_udc_write(volatile struct si_regs *si, int regnum, int value)
{
@@ -249,7 +249,7 @@ si_obio_udc_write(volatile struct si_reg
delay(UDC_WAIT_USEC);
}
-static inline int
+static inline int
si_obio_udc_read(volatile struct si_regs *si, int regnum)
{
int value;
@@ -272,7 +272,7 @@ si_obio_udc_read(volatile struct si_regs
* register after the SCSI bus goes into any DATA phase, so
* this function has to setup the evil FIFO logic.
*/
-void
+void
si_obio_dma_setup(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -371,7 +371,7 @@ si_obio_dma_setup(struct ncr5380_softc *
}
-void
+void
si_obio_dma_start(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
@@ -422,7 +422,7 @@ si_obio_dma_start(struct ncr5380_softc *
}
-void
+void
si_obio_dma_eop(struct ncr5380_softc *ncr_sc)
{
@@ -430,7 +430,7 @@ si_obio_dma_eop(struct ncr5380_softc *nc
}
-void
+void
si_obio_dma_stop(struct ncr5380_softc *ncr_sc)
{
struct si_softc *sc = (struct si_softc *)ncr_sc;
Index: src/sys/arch/sun3/dev/xd.c
diff -u src/sys/arch/sun3/dev/xd.c:1.78 src/sys/arch/sun3/dev/xd.c:1.79
--- src/sys/arch/sun3/dev/xd.c:1.78 Mon Jan 23 21:52:01 2023
+++ src/sys/arch/sun3/dev/xd.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.78 2023/01/23 21:52:01 andvar Exp $ */
+/* $NetBSD: xd.c,v 1.79 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.78 2023/01/23 21:52:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.79 2024/12/20 23:52:00 tsutsui Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -325,7 +325,7 @@ struct dkdriver xddkdriver = {
static void *xd_labeldata;
-static void
+static void
xddummystrat(struct buf *bp)
{
if (bp->b_bcount != XDFM_BPS)
@@ -335,7 +335,7 @@ xddummystrat(struct buf *bp)
bp->b_cflags &= ~BC_BUSY;
}
-int
+int
xdgetdisklabel(struct xd_softc *xd, void *b)
{
const char *err;
@@ -390,7 +390,7 @@ xdgetdisklabel(struct xd_softc *xd, void
* soft reset to detect the xdc.
*/
-int
+int
xdcmatch(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -413,7 +413,7 @@ xdcmatch(device_t parent, cfdata_t cf, v
/*
* xdcattach: attach controller
*/
-void
+void
xdcattach(device_t parent, device_t self, void *aux)
{
struct xdc_softc *xdc = device_private(self);
@@ -519,7 +519,7 @@ xdcattach(device_t parent, device_t self
callout_reset(&xdc->sc_tick_ch, XDC_TICKCNT, xdc_tick, xdc);
}
-int
+int
xdc_print(void *aux, const char *name)
{
struct xdc_attach_args *xa = aux;
@@ -541,7 +541,7 @@ xdc_print(void *aux, const char *name)
* call xdattach!). Also, wire down the relationship between the
* xd* and xdc* devices, to simplify boot device identification.
*/
-int
+int
xdmatch(device_t parent, cfdata_t cf, void *aux)
{
struct xdc_attach_args *xa = aux;
@@ -558,7 +558,7 @@ xdmatch(device_t parent, cfdata_t cf, vo
/*
* xdattach: attach a disk.
*/
-void
+void
xdattach(device_t parent, device_t self, void *aux)
{
struct xd_softc *xd = device_private(self);
@@ -594,7 +594,7 @@ xdattach(device_t parent, device_t self,
* Initialize a disk. This can be called from both autoconf and
* also from xdopen/xdstrategy.
*/
-static void
+static void
xd_init(struct xd_softc *xd)
{
struct xdc_softc *xdc;
@@ -757,7 +757,7 @@ xd_init(struct xd_softc *xd)
/*
* xdclose: close device
*/
-int
+int
xdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xd_softc *xd = device_lookup_private(&xd_cd, DISKUNIT(dev));
@@ -781,7 +781,7 @@ xdclose(dev_t dev, int flag, int fmt, st
/*
* xddump: crash dump system
*/
-int
+int
xddump(dev_t dev, daddr_t blkno, void *va, size_t sz)
{
int unit, part;
@@ -852,7 +852,7 @@ xd_getkauthreq(u_char cmd)
/*
* xdioctl: ioctls on XD drives. based on ioctl's of other netbsd disks.
*/
-int
+int
xdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct xd_softc *xd;
@@ -941,7 +941,7 @@ xdioctl(dev_t dev, u_long cmd, void *add
/*
* xdopen: open drive
*/
-int
+int
xdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int err, unit, part, s;
@@ -1000,14 +1000,14 @@ xdopen(dev_t dev, int flag, int fmt, str
return err;
}
-int
+int
xdread(dev_t dev, struct uio *uio, int flags)
{
return physio(xdstrategy, NULL, dev, B_READ, minphys, uio);
}
-int
+int
xdwrite(dev_t dev, struct uio *uio, int flags)
{
@@ -1018,7 +1018,7 @@ xdwrite(dev_t dev, struct uio *uio, int
/*
* xdsize: return size of a partition for a dump
*/
-int
+int
xdsize(dev_t dev)
{
struct xd_softc *xdsc;
@@ -1050,7 +1050,7 @@ xdsize(dev_t dev)
/*
* xdstrategy: buffering system interface to xd.
*/
-void
+void
xdstrategy(struct buf *bp)
{
struct xd_softc *xd;
@@ -1144,7 +1144,7 @@ xdstrategy(struct buf *bp)
*
* xdcintr: hardware interrupt.
*/
-int
+int
xdcintr(void *v)
{
struct xdc_softc *xdcsc = v;
@@ -1177,7 +1177,7 @@ xdcintr(void *v)
* xdc_rqinit: fill out the fields of an I/O request
*/
-inline void
+inline void
xdc_rqinit(struct xd_iorq *rq, struct xdc_softc *xdc, struct xd_softc *xd,
int md, u_long blk, int cnt, void *db, struct buf *bp)
{
@@ -1196,7 +1196,7 @@ xdc_rqinit(struct xd_iorq *rq, struct xd
/*
* xdc_rqtopb: load up an IOPB based on an iorq
*/
-void
+void
xdc_rqtopb(struct xd_iorq *iorq, struct xd_iopb *iopb, int cmd, int subfun)
{
u_long block, dp;
@@ -1306,7 +1306,7 @@ xdc_rqtopb(struct xd_iorq *iorq, struct
* If you've already got an IORQ, you can call submit directly (currently
* there is no need to do this). NORM requests are handled separately.
*/
-int
+int
xdc_cmd(struct xdc_softc *xdcsc, int cmd, int subfn, int unit, int block,
int scnt, char *dptr, int fullmode)
{
@@ -1366,7 +1366,7 @@ xdc_cmd(struct xdc_softc *xdcsc, int cmd
* xdc_startbuf
* start a buffer running, assumes nfree > 0
*/
-int
+int
xdc_startbuf(struct xdc_softc *xdcsc, struct xd_softc *xdsc, struct buf *bp)
{
int rqno, partno;
@@ -1479,7 +1479,7 @@ xdc_startbuf(struct xdc_softc *xdcsc, st
* on the iorq free list until some iopbs are available.
*/
-int
+int
xdc_submit_iorq(struct xdc_softc *xdcsc, int iorqno, int type)
{
u_long iopbaddr;
@@ -1556,7 +1556,7 @@ xdc_submit_iorq(struct xdc_softc *xdcsc,
* the caller is interesting in. if freeone is true, then it returns
* when there is a free iorq.
*/
-int
+int
xdc_piodriver(struct xdc_softc *xdcsc, int iorqno, int freeone)
{
int nreset = 0;
@@ -1631,7 +1631,7 @@ xdc_piodriver(struct xdc_softc *xdcsc, i
* xdc_reset: reset one drive. NOTE: assumes xdc was just reset.
* we steal iopb[0] for this, but we put it back when we are done.
*/
-void
+void
xdc_xdreset(struct xdc_softc *xdcsc, struct xd_softc *xdsc)
{
struct xd_iopb tmpiopb;
@@ -1663,7 +1663,7 @@ xdc_xdreset(struct xdc_softc *xdcsc, str
* xdc_reset: reset everything: requests are marked as errors except
* a polled request (which is resubmitted)
*/
-int
+int
xdc_reset(struct xdc_softc *xdcsc, int quiet, int blastmode, int error,
struct xd_softc *xdsc)
{
@@ -1756,7 +1756,7 @@ xdc_reset(struct xdc_softc *xdcsc, int q
/*
* xdc_start: start all waiting buffers
*/
-void
+void
xdc_start(struct xdc_softc *xdcsc, int maxio)
{
int rqno;
@@ -1773,7 +1773,7 @@ xdc_start(struct xdc_softc *xdcsc, int m
/*
* xdc_remove_iorq: remove "done" IOPB's.
*/
-int
+int
xdc_remove_iorq(struct xdc_softc *xdcsc)
{
int errno, rqno, comm, errs;
@@ -1939,7 +1939,7 @@ xdc_remove_iorq(struct xdc_softc *xdcsc)
* is in lasterror. also, if iorq->errno == 0, then we recovered
* from that error (otherwise iorq->errno == iorq->lasterror).
*/
-void
+void
xdc_perror(struct xd_iorq *iorq, struct xd_iopb *iopb, int still_trying)
{
int error = iorq->lasterror;
@@ -1968,7 +1968,7 @@ xdc_perror(struct xd_iorq *iorq, struct
* xdc_error: non-fatal error encountered... recover.
* return AOK if resubmitted, return FAIL if this iopb is done
*/
-int
+int
xdc_error(struct xdc_softc *xdcsc, struct xd_iorq *iorq, struct xd_iopb *iopb,
int rqno, int comm)
@@ -2038,7 +2038,7 @@ xdc_error(struct xdc_softc *xdcsc, struc
/*
* xdc_tick: make sure xd is still alive and ticking (err, kicking).
*/
-void
+void
xdc_tick(void *arg)
{
struct xdc_softc *xdcsc = arg;
@@ -2135,7 +2135,7 @@ xdc_tick(void *arg)
* in user code, and is also useful for some debugging. we return
* an error code. called at user priority.
*/
-int
+int
xdc_ioctlcmd(struct xd_softc *xd, dev_t dev, struct xd_iocmd *xio)
{
int s, err, rqno;
Index: src/sys/arch/sun3/dev/xdreg.h
diff -u src/sys/arch/sun3/dev/xdreg.h:1.8 src/sys/arch/sun3/dev/xdreg.h:1.9
--- src/sys/arch/sun3/dev/xdreg.h:1.8 Sun Oct 24 20:00:11 2021
+++ src/sys/arch/sun3/dev/xdreg.h Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xdreg.h,v 1.8 2021/10/24 20:00:11 andvar Exp $ */
+/* $NetBSD: xdreg.h,v 1.9 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -197,9 +197,9 @@ struct xd_iopb {
/*
* some commands overload bytes 6 to 0x13 of the iopb with different meanings.
- * these commands include:
+ * these commands include:
* section 4.2: controller parameters
- * section 4.3: drive parameters
+ * section 4.3: drive parameters
* section 4.4: format parameters
*
* note that the commands that overload the iopb are not part of the
@@ -281,7 +281,7 @@ struct xd_iopb_ctrl {
#define XDC_DELAY_SPARC 0
/*
- * drive parameters iopb: redefines bytes: 6, 8, 9, a, b, c, d, e
+ * drive parameters iopb: redefines bytes: 6, 8, 9, a, b, c, d, e
*/
struct xd_iopb_drive {
@@ -305,7 +305,7 @@ struct xd_iopb_drive {
};
/*
- * format parameters iopb: redefines bytes: 6, 8, 9, a, b, c, d, 0x10, 0x11
+ * format parameters iopb: redefines bytes: 6, 8, 9, a, b, c, d, 0x10, 0x11
*/
struct xd_iopb_format {
Index: src/sys/arch/sun3/dev/xio.h
diff -u src/sys/arch/sun3/dev/xio.h:1.4 src/sys/arch/sun3/dev/xio.h:1.5
--- src/sys/arch/sun3/dev/xio.h:1.4 Mon Sep 7 03:49:46 2015
+++ src/sys/arch/sun3/dev/xio.h Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xio.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */
+/* $NetBSD: xio.h,v 1.5 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -26,9 +26,9 @@
*/
/*
- * x i o . h
+ * x i o . h
*
- * this file defines the software structure we use to ioctl the
+ * this file defines the software structure we use to ioctl the
* 753/7053. this interface isn't set in stone and may (or may not)
* need adjustment.
*
Index: src/sys/arch/sun3/dev/xy.c
diff -u src/sys/arch/sun3/dev/xy.c:1.82 src/sys/arch/sun3/dev/xy.c:1.83
--- src/sys/arch/sun3/dev/xy.c:1.82 Sat Aug 7 16:19:06 2021
+++ src/sys/arch/sun3/dev/xy.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.82 2021/08/07 16:19:06 thorpej Exp $ */
+/* $NetBSD: xy.c,v 1.83 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.82 2021/08/07 16:19:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.83 2024/12/20 23:52:00 tsutsui Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -256,7 +256,7 @@ struct dkdriver xydkdriver = {
static void *xy_labeldata;
-static void
+static void
xydummystrat(struct buf *bp)
{
@@ -267,7 +267,7 @@ xydummystrat(struct buf *bp)
bp->b_cflags &= ~BC_BUSY;
}
-int
+int
xygetdisklabel(struct xy_softc *xy, void *b)
{
const char *err;
@@ -321,7 +321,7 @@ xygetdisklabel(struct xy_softc *xy, void
* xycmatch: determine if xyc is present or not. we do a
* soft reset to detect the xyc.
*/
-static int
+static int
xycmatch(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -344,7 +344,7 @@ xycmatch(device_t parent, cfdata_t cf, v
/*
* xycattach: attach controller
*/
-static void
+static void
xycattach(device_t parent, device_t self, void *aux)
{
struct xyc_softc *xyc = device_private(self);
@@ -454,7 +454,7 @@ xycattach(device_t parent, device_t self
callout_reset(&xyc->sc_tick_ch, XYC_TICKCNT, xyc_tick, xyc);
}
-static int
+static int
xyc_print(void *aux, const char *name)
{
struct xyc_attach_args *xa = aux;
@@ -476,7 +476,7 @@ xyc_print(void *aux, const char *name)
* call xyattach!). Also, wire down the relationship between the
* xy* and xyc* devices, to simplify boot device identification.
*/
-static int
+static int
xymatch(device_t parent, cfdata_t cf, void *aux)
{
struct xyc_attach_args *xa = aux;
@@ -493,7 +493,7 @@ xymatch(device_t parent, cfdata_t cf, vo
/*
* xyattach: attach a disk.
*/
-static void
+static void
xyattach(device_t parent, device_t self, void *aux)
{
struct xy_softc *xy = device_private(self);
@@ -533,7 +533,7 @@ xyattach(device_t parent, device_t self,
* Initialize a disk. This can be called from both autoconf and
* also from xyopen/xystrategy.
*/
-static void
+static void
xy_init(struct xy_softc *xy)
{
struct xyc_softc *xyc;
@@ -704,7 +704,7 @@ xy_init(struct xy_softc *xy)
/*
* xyclose: close device
*/
-int
+int
xyclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xy_softc *xy = device_lookup_private(&xy_cd, DISKUNIT(dev));
@@ -728,7 +728,7 @@ xyclose(dev_t dev, int flag, int fmt, st
/*
* xydump: crash dump system
*/
-int
+int
xydump(dev_t dev, daddr_t blkno, void *va, size_t sz)
{
int unit, part;
@@ -805,7 +805,7 @@ xy_getkauthreq(u_char cmd)
/*
* xyioctl: ioctls on XY drives. based on ioctl's of other netbsd disks.
*/
-int
+int
xyioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct xy_softc *xy;
@@ -894,7 +894,7 @@ xyioctl(dev_t dev, u_long cmd, void *add
/*
* xyopen: open drive
*/
-int
+int
xyopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int err, unit, part, s;
@@ -953,14 +953,14 @@ xyopen(dev_t dev, int flag, int fmt, str
return err;
}
-int
+int
xyread(dev_t dev, struct uio *uio, int flags)
{
return physio(xystrategy, NULL, dev, B_READ, minphys, uio);
}
-int
+int
xywrite(dev_t dev, struct uio *uio, int flags)
{
@@ -972,7 +972,7 @@ xywrite(dev_t dev, struct uio *uio, int
* xysize: return size of a partition for a dump
*/
-int
+int
xysize(dev_t dev)
{
struct xy_softc *xysc;
@@ -1004,7 +1004,7 @@ xysize(dev_t dev)
/*
* xystrategy: buffering system interface to xy.
*/
-void
+void
xystrategy(struct buf *bp)
{
struct xy_softc *xy;
@@ -1092,7 +1092,7 @@ xystrategy(struct buf *bp)
*
* xycintr: hardware interrupt.
*/
-int
+int
xycintr(void *v)
{
struct xyc_softc *xycsc = v;
@@ -1120,7 +1120,7 @@ xycintr(void *v)
* xyc_rqinit: fill out the fields of an I/O request
*/
-inline void
+inline void
xyc_rqinit(struct xy_iorq *rq, struct xyc_softc *xyc, struct xy_softc *xy,
int md, u_long blk, int cnt, void *db, struct buf *bp)
{
@@ -1140,7 +1140,7 @@ xyc_rqinit(struct xy_iorq *rq, struct xy
* xyc_rqtopb: load up an IOPB based on an iorq
*/
-void
+void
xyc_rqtopb(struct xy_iorq *iorq, struct xy_iopb *iopb, int cmd, int subfun)
{
u_long block, dp;
@@ -1187,7 +1187,7 @@ xyc_rqtopb(struct xy_iorq *iorq, struct
* xyc_unbusy: wait for the xyc to go unbusy, or timeout.
*/
-int
+int
xyc_unbusy(struct xyc *xyc, int del)
{
@@ -1203,7 +1203,7 @@ xyc_unbusy(struct xyc *xyc, int del)
* xyc_cmd: front end for POLL'd and WAIT'd commands. Returns 0 or error.
* note that NORM requests are handled separately.
*/
-int
+int
xyc_cmd(struct xyc_softc *xycsc, int cmd, int subfn, int unit, int block,
int scnt, char *dptr, int fullmode)
{
@@ -1249,7 +1249,7 @@ xyc_cmd(struct xyc_softc *xycsc, int cmd
* start a buffer for running
*/
-int
+int
xyc_startbuf(struct xyc_softc *xycsc, struct xy_softc *xysc, struct buf *bp)
{
struct xy_iorq *iorq;
@@ -1352,7 +1352,7 @@ xyc_startbuf(struct xyc_softc *xycsc, st
* on the iorq free list until some iopbs are available.
*/
-int
+int
xyc_submit_iorq(struct xyc_softc *xycsc, struct xy_iorq *iorq, int type)
{
struct xy_iopb *iopb;
@@ -1494,7 +1494,7 @@ xyc_chain(struct xyc_softc *xycsc, struc
* and drains off the polled i/o request. it returns the status of the iorq
* the caller is interesting in.
*/
-int
+int
xyc_piodriver(struct xyc_softc *xycsc, struct xy_iorq *iorq)
{
int nreset = 0;
@@ -1552,7 +1552,7 @@ xyc_piodriver(struct xyc_softc *xycsc, s
* xyc_xyreset: reset one drive. NOTE: assumes xyc was just reset.
* we steal iopb[XYC_CTLIOPB] for this, but we put it back when we are done.
*/
-void
+void
xyc_xyreset(struct xyc_softc *xycsc, struct xy_softc *xysc)
{
struct xy_iopb tmpiopb;
@@ -1592,7 +1592,7 @@ xyc_xyreset(struct xyc_softc *xycsc, str
* xyc_reset: reset everything: requests are marked as errors except
* a polled request (which is resubmitted)
*/
-int
+int
xyc_reset(struct xyc_softc *xycsc, int quiet, struct xy_iorq *blastmode,
int error, struct xy_softc *xysc)
{
@@ -1669,7 +1669,7 @@ xyc_reset(struct xyc_softc *xycsc, int q
* xyc_start: start waiting buffers
*/
-void
+void
xyc_start(struct xyc_softc *xycsc, struct xy_iorq *iorq)
{
int lcv;
@@ -1693,7 +1693,7 @@ xyc_start(struct xyc_softc *xycsc, struc
* xyc_remove_iorq: remove "done" IOPB's.
*/
-int
+int
xyc_remove_iorq(struct xyc_softc *xycsc)
{
int errno, rq, comm, errs;
@@ -1838,7 +1838,7 @@ xyc_remove_iorq(struct xyc_softc *xycsc)
* is in lasterror. also, if iorq->errno == 0, then we recovered
* from that error (otherwise iorq->errno == iorq->lasterror).
*/
-void
+void
xyc_perror(struct xy_iorq *iorq, struct xy_iopb *iopb, int still_trying)
{
int error = iorq->lasterror;
@@ -1866,7 +1866,7 @@ xyc_perror(struct xy_iorq *iorq, struct
* xyc_error: non-fatal error encountered... recover.
* return AOK if resubmitted, return FAIL if this iopb is done
*/
-int
+int
xyc_error(struct xyc_softc *xycsc, struct xy_iorq *iorq, struct xy_iopb *iopb,
int comm)
{
@@ -1931,7 +1931,7 @@ xyc_error(struct xyc_softc *xycsc, struc
/*
* xyc_tick: make sure xy is still alive and ticking (err, kicking).
*/
-void
+void
xyc_tick(void *arg)
{
struct xyc_softc *xycsc = arg;
@@ -1966,7 +1966,7 @@ xyc_tick(void *arg)
*
* XXX missing a few commands (see the 7053 driver for ideas)
*/
-int
+int
xyc_ioctlcmd(struct xy_softc *xy, dev_t dev, struct xd_iocmd *xio)
{
int s, err, rqno;
@@ -2103,7 +2103,7 @@ xyc_e2str(int no)
}
}
-int
+int
xyc_entoact(int errno)
{
Index: src/sys/arch/sun3/dev/xyreg.h
diff -u src/sys/arch/sun3/dev/xyreg.h:1.5 src/sys/arch/sun3/dev/xyreg.h:1.6
--- src/sys/arch/sun3/dev/xyreg.h:1.5 Tue Feb 1 20:19:32 2011
+++ src/sys/arch/sun3/dev/xyreg.h Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xyreg.h,v 1.5 2011/02/01 20:19:32 chuck Exp $ */
+/* $NetBSD: xyreg.h,v 1.6 2024/12/20 23:52:00 tsutsui Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -84,9 +84,9 @@ struct xyc {
* add iopb to the chain, and clear AREQ to resume I/O
*
* when the controller is done with a command it may interrupt (if you
- * ask it to) and it will set the XYC_IPND bit in the csr. clear
+ * ask it to) and it will set the XYC_IPND bit in the csr. clear
* the interrupt by writing one to this bit.
- *
+ *
* the format of the iopb is described in section 2.4 of the manual.
* note that it is byte-swapped on the sun.
*/
Index: src/sys/arch/sun3/dev/zs.c
diff -u src/sys/arch/sun3/dev/zs.c:1.91 src/sys/arch/sun3/dev/zs.c:1.92
--- src/sys/arch/sun3/dev/zs.c:1.91 Sat Sep 11 20:28:05 2021
+++ src/sys/arch/sun3/dev/zs.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.91 2021/09/11 20:28:05 andvar Exp $ */
+/* $NetBSD: zs.c,v 1.92 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.91 2021/09/11 20:28:05 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.92 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_kgdb.h"
@@ -158,7 +158,7 @@ static uint8_t zs_init_reg[16] = {
/* Find PROM mappings (for console support). */
-void
+void
zs_init(void)
{
vaddr_t va;
@@ -210,7 +210,7 @@ static int zs_get_speed(struct zs_chanst
/*
* Is the zs chip present?
*/
-static int
+static int
zs_match(device_t parent, cfdata_t cf, void *aux)
{
struct confargs *ca = aux;
@@ -251,7 +251,7 @@ zs_match(device_t parent, cfdata_t cf, v
* Match slave number to zs unit number, so that misconfiguration will
* not set up the keyboard as ttya, etc.
*/
-static void
+static void
zs_attach(device_t parent, device_t self, void *aux)
{
struct zsc_softc *zsc = device_private(self);
@@ -361,7 +361,7 @@ zs_attach(device_t parent, device_t self
}
}
-static int
+static int
zs_print(void *aux, const char *name)
{
struct zsc_attach_args *args = aux;
@@ -380,7 +380,7 @@ zs_print(void *aux, const char *name)
* but we establish zshard handler per each ZS chip
* to avoid holding unnecessary locks in interrupt context.
*/
-static int
+static int
zshard(void *arg)
{
struct zsc_softc *zsc = arg;
@@ -396,7 +396,7 @@ zshard(void *arg)
/*
* Compute the current baud rate given a ZS channel.
*/
-static int
+static int
zs_get_speed(struct zs_chanstate *cs)
{
int tconst;
@@ -409,7 +409,7 @@ zs_get_speed(struct zs_chanstate *cs)
/*
* MD functions for setting the baud rate and control modes.
*/
-int
+int
zs_set_speed(struct zs_chanstate *cs, int bps)
{
int tconst, real_bps;
@@ -440,7 +440,7 @@ zs_set_speed(struct zs_chanstate *cs, in
return (0);
}
-int
+int
zs_set_modes(struct zs_chanstate *cs, int cflag /* bits per second */)
{
@@ -550,7 +550,7 @@ void *zs_conschan;
/*
* Handle user request to enter kernel debugger.
*/
-void
+void
zs_abort(struct zs_chanstate *cs)
{
volatile struct zschan *zc = zs_conschan;
@@ -570,7 +570,7 @@ zs_abort(struct zs_chanstate *cs)
/*
* Polled input char.
*/
-int
+int
zs_getc(void *arg)
{
volatile struct zschan *zc = arg;
@@ -597,7 +597,7 @@ zs_getc(void *arg)
/*
* Polled output char.
*/
-void
+void
zs_putc(void *arg, int c)
{
volatile struct zschan *zc = arg;
@@ -633,7 +633,7 @@ struct consdev consdev_tty = {
NULL,
};
-static void
+static void
zscninit(struct consdev *cn)
{
}
@@ -641,7 +641,7 @@ zscninit(struct consdev *cn)
/*
* Polled console input putchar.
*/
-static int
+static int
zscngetc(dev_t dev)
{
return (zs_getc(zs_conschan));
@@ -650,7 +650,7 @@ zscngetc(dev_t dev)
/*
* Polled console output putchar.
*/
-static void
+static void
zscnputc(dev_t dev, int c)
{
zs_putc(zs_conschan, c);
@@ -675,12 +675,12 @@ struct consdev consdev_prom = {
nullcnpollc,
};
-void
+void
nullcnprobe(struct consdev *cn)
{
}
-static void
+static void
prom_cninit(struct consdev *cn)
{
}
@@ -689,7 +689,7 @@ prom_cninit(struct consdev *cn)
* PROM console input putchar.
* (dummy - this is output only)
*/
-static int
+static int
prom_cngetc(dev_t dev)
{
return (0);
@@ -698,7 +698,7 @@ prom_cngetc(dev_t dev)
/*
* PROM console output putchar.
*/
-static void
+static void
prom_cnputc(dev_t dev, int c)
{
(*romVectorPtr->putChar)(c & 0x7f);
@@ -728,7 +728,7 @@ static const char * const prom_inSrc_nam
* Determine which device is the console using
* the PROM "input source" and "output sink".
*/
-void
+void
cninit(void)
{
struct sunromvec *v;
Index: src/sys/arch/sun3/dev/zs_kgdb.c
diff -u src/sys/arch/sun3/dev/zs_kgdb.c:1.27 src/sys/arch/sun3/dev/zs_kgdb.c:1.28
--- src/sys/arch/sun3/dev/zs_kgdb.c:1.27 Tue Oct 24 19:05:06 2023
+++ src/sys/arch/sun3/dev/zs_kgdb.c Fri Dec 20 23:52:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.27 2023/10/24 19:05:06 andvar Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.28 2024/12/20 23:52:00 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.27 2023/10/24 19:05:06 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.28 2024/12/20 23:52:00 tsutsui Exp $");
#include "opt_kgdb.h"
@@ -100,7 +100,7 @@ static u_char zs_kgdb_regs[16] = {
/*
* This replaces "zs_reset()" in the sparc driver.
*/
-static void
+static void
zs_setparam(struct zs_chanstate *cs, int iena, int rate)
{
int s, tconst;
@@ -127,7 +127,7 @@ zs_setparam(struct zs_chanstate *cs, int
* KGDB interrupts will be enabled later when zs0 is configured.
* Called after cninit(), so printf() etc. works.
*/
-void
+void
zs_kgdb_init(void)
{
struct zs_chanstate cs;
@@ -173,7 +173,7 @@ zs_kgdb_init(void)
*
* Set the speed to kgdb_rate, CS8, etc.
*/
-int
+int
zs_check_kgdb(struct zs_chanstate *cs, int dev)
{
@@ -196,7 +196,7 @@ zs_check_kgdb(struct zs_chanstate *cs, i
* KGDB framing character received: enter kernel debugger. This probably
* should time out after a few seconds to avoid hanging on spurious input.
*/
-static void
+static void
zskgdb(struct zs_chanstate *cs)
{
int unit = minor(kgdb_dev);
@@ -218,7 +218,7 @@ static void zs_kgdb_softint(struct zs_ch
int kgdb_input_lost;
-static void
+static void
zs_kgdb_rxint(struct zs_chanstate *cs)
{
u_char c, rr1;
@@ -242,13 +242,13 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
}
}
-static void
+static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
-static void
+static void
zs_kgdb_stint(struct zs_chanstate *cs, int force)
{
int rr0;
@@ -265,7 +265,7 @@ zs_kgdb_stint(struct zs_chanstate *cs, i
}
}
-static void
+static void
zs_kgdb_softint(struct zs_chanstate *cs)
{
printf("zs_kgdb_softint?\n");
