Module Name: src
Committed By: tsutsui
Date: Sun Jun 26 06:25:09 UTC 2022
Modified Files:
src/sys/arch/atari/dev: clock.c fd.c grf.c hdfd.c ite.c lpt.c ms.c
ser.c view.c zs.c
Log Message:
Make local devsw functions static.
No visible regression on TT030.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/atari/dev/clock.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/atari/dev/ite.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/atari/dev/lpt.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/atari/dev/ms.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/atari/dev/ser.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/atari/dev/view.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/atari/dev/zs.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/atari/dev/clock.c
diff -u src/sys/arch/atari/dev/clock.c:1.62 src/sys/arch/atari/dev/clock.c:1.63
--- src/sys/arch/atari/dev/clock.c:1.62 Fri Jul 3 16:23:03 2020
+++ src/sys/arch/atari/dev/clock.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.62 2020/07/03 16:23:03 maxv Exp $ */
+/* $NetBSD: clock.c,v 1.63 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.62 2020/07/03 16:23:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.63 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -107,10 +107,10 @@ struct clock_softc {
*/
#define RTC_OPEN 1
-dev_type_open(rtcopen);
-dev_type_close(rtcclose);
-dev_type_read(rtcread);
-dev_type_write(rtcwrite);
+static dev_type_open(rtcopen);
+static dev_type_close(rtcclose);
+static dev_type_read(rtcread);
+static dev_type_write(rtcwrite);
static void clockattach(device_t, device_t, void *);
static int clockmatch(device_t, cfdata_t, void *);
@@ -482,7 +482,7 @@ atari_rtc_set(todr_chip_handle_t todr, s
/***********************************************************************
* RTC-device support *
***********************************************************************/
-int
+static int
rtcopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -498,7 +498,7 @@ rtcopen(dev_t dev, int flag, int mode, s
return 0;
}
-int
+static int
rtcclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -508,7 +508,7 @@ rtcclose(dev_t dev, int flag, int mode,
return 0;
}
-int
+static int
rtcread(dev_t dev, struct uio *uio, int flags)
{
mc_todregs clkregs;
@@ -546,7 +546,7 @@ twodigits(char *buffer, int pos)
return result;
}
-int
+static int
rtcwrite(dev_t dev, struct uio *uio, int flags)
{
mc_todregs clkregs;
Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.92 src/sys/arch/atari/dev/fd.c:1.93
--- src/sys/arch/atari/dev/fd.c:1.92 Sun May 15 20:37:51 2022
+++ src/sys/arch/atari/dev/fd.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $ */
+/* $NetBSD: fd.c,v 1.93 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -193,12 +193,12 @@ static short def_type = 0; /* Reflects
typedef void (*FPV)(void *);
-dev_type_open(fdopen);
-dev_type_close(fdclose);
-dev_type_read(fdread);
-dev_type_write(fdwrite);
-dev_type_ioctl(fdioctl);
-dev_type_strategy(fdstrategy);
+static dev_type_open(fdopen);
+static dev_type_close(fdclose);
+static dev_type_read(fdread);
+static dev_type_write(fdwrite);
+static dev_type_ioctl(fdioctl);
+static dev_type_strategy(fdstrategy);
/*
* Private drive functions....
@@ -424,7 +424,7 @@ fdattach(device_t parent, device_t self,
disk_attach(&sc->dkdev);
}
-int
+static int
fdioctl(dev_t dev, u_long cmd, void * addr, int flag, struct lwp *l)
{
struct fd_softc *sc;
@@ -465,7 +465,7 @@ fdioctl(dev_t dev, u_long cmd, void * ad
* partition 0: 360Kb
* partition 1: 780Kb
*/
-int
+static int
fdopen(dev_t dev, int flags, int devtype, struct lwp *l)
{
struct fd_softc *sc;
@@ -564,7 +564,7 @@ fdopen(dev_t dev, int flags, int devtype
return 0;
}
-int
+static int
fdclose(dev_t dev, int flags, int devtype, struct lwp *l)
{
struct fd_softc *sc;
@@ -580,7 +580,7 @@ fdclose(dev_t dev, int flags, int devtyp
return 0;
}
-void
+static void
fdstrategy(struct buf *bp)
{
struct fd_softc *sc;
@@ -648,14 +648,14 @@ done:
biodone(bp);
}
-int
+static int
fdread(dev_t dev, struct uio *uio, int flags)
{
return physio(fdstrategy, NULL, dev, B_READ, fdminphys, uio);
}
-int
+static int
fdwrite(dev_t dev, struct uio *uio, int flags)
{
Index: src/sys/arch/atari/dev/grf.c
diff -u src/sys/arch/atari/dev/grf.c:1.53 src/sys/arch/atari/dev/grf.c:1.54
--- src/sys/arch/atari/dev/grf.c:1.53 Sat Aug 7 16:18:46 2021
+++ src/sys/arch/atari/dev/grf.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.53 2021/08/07 16:18:46 thorpej Exp $ */
+/* $NetBSD: grf.c,v 1.54 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.53 2021/08/07 16:18:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.54 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -102,10 +102,10 @@ struct grf_softc *grfsp[NGRF]; /* XXX */
CFATTACH_DECL_NEW(grfbus, 0,
grfbusmatch, grfbusattach, NULL, NULL);
-dev_type_open(grfopen);
-dev_type_close(grfclose);
-dev_type_ioctl(grfioctl);
-dev_type_mmap(grfmmap);
+static dev_type_open(grfopen);
+static dev_type_close(grfclose);
+static dev_type_ioctl(grfioctl);
+static dev_type_mmap(grfmmap);
const struct cdevsw grf_cdevsw = {
.d_open = grfopen,
@@ -166,7 +166,7 @@ grfbusprint(void *aux, const char *name)
}
/*ARGSUSED*/
-int
+static int
grfopen(dev_t dev, int flags, int devtype, struct lwp *l)
{
struct grf_softc *gp;
@@ -189,7 +189,7 @@ grfopen(dev_t dev, int flags, int devtyp
}
/*ARGSUSED*/
-int
+static int
grfclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct grf_softc *gp;
@@ -201,7 +201,7 @@ grfclose(dev_t dev, int flags, int mode,
}
/*ARGSUSED*/
-int
+static int
grfioctl(dev_t dev, u_long cmd, void * data, int flag, struct lwp *l)
{
struct grf_softc *gp;
@@ -266,7 +266,7 @@ grfioctl(dev_t dev, u_long cmd, void * d
* map the contents of a graphics display card into process'
* memory space.
*/
-paddr_t
+static paddr_t
grfmmap(dev_t dev, off_t off, int prot)
{
struct grf_softc *gp;
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.89 src/sys/arch/atari/dev/hdfd.c:1.90
--- src/sys/arch/atari/dev/hdfd.c:1.89 Sat Aug 7 16:18:46 2021
+++ src/sys/arch/atari/dev/hdfd.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.89 2021/08/07 16:18:46 thorpej Exp $ */
+/* $NetBSD: hdfd.c,v 1.90 2022/06/26 06:25:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.89 2021/08/07 16:18:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.90 2022/06/26 06:25:09 tsutsui Exp $");
#include "opt_ddb.h"
@@ -131,12 +131,12 @@ __KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.8
/*
* {b,c}devsw[] function prototypes
*/
-dev_type_open(fdopen);
-dev_type_close(fdclose);
-dev_type_read(fdread);
-dev_type_write(fdwrite);
-dev_type_ioctl(fdioctl);
-dev_type_strategy(fdstrategy);
+static dev_type_open(fdopen);
+static dev_type_close(fdclose);
+static dev_type_read(fdread);
+static dev_type_write(fdwrite);
+static dev_type_ioctl(fdioctl);
+static dev_type_strategy(fdstrategy);
volatile u_char *fdio_addr;
@@ -602,7 +602,7 @@ fd_dev_to_type(struct fd_softc *fd, dev_
return type ? &fd_types[type - 1] : fd->sc_deftype;
}
-void
+static void
fdstrategy(struct buf *bp)
{
struct fd_softc *fd = device_lookup_private(&hdfd_cd, FDUNIT(bp->b_dev));
@@ -717,14 +717,14 @@ fdfinish(struct fd_softc *fd, struct buf
fdc->sc_state = DEVIDLE;
}
-int
+static int
fdread(dev_t dev, struct uio *uio, int flags)
{
return physio(fdstrategy, NULL, dev, B_READ, minphys, uio);
}
-int
+static int
fdwrite(dev_t dev, struct uio *uio, int flags)
{
@@ -815,7 +815,7 @@ out_fdc(u_char x)
return 0;
}
-int
+static int
fdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct fd_softc *fd;
@@ -840,7 +840,7 @@ fdopen(dev_t dev, int flags, int mode, s
return 0;
}
-int
+static int
fdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct fd_softc *fd = device_lookup_private(&hdfd_cd, FDUNIT(dev));
@@ -1289,7 +1289,7 @@ fdcretry(struct fdc_softc *fdc)
fdc->sc_errors++;
}
-int
+static int
fdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct fd_softc *fd;
Index: src/sys/arch/atari/dev/ite.c
diff -u src/sys/arch/atari/dev/ite.c:1.82 src/sys/arch/atari/dev/ite.c:1.83
--- src/sys/arch/atari/dev/ite.c:1.82 Sat Jun 25 03:33:29 2022
+++ src/sys/arch/atari/dev/ite.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.82 2022/06/25 03:33:29 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.83 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.82 2022/06/25 03:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.83 2022/06/26 06:25:09 tsutsui Exp $");
#include "opt_ddb.h"
@@ -152,13 +152,13 @@ dev_type_cnputc(itecnputc);
CFATTACH_DECL_NEW(ite, sizeof(struct ite_softc),
itematch, iteattach, NULL, NULL);
-dev_type_open(iteopen);
-dev_type_close(iteclose);
-dev_type_read(iteread);
-dev_type_write(itewrite);
-dev_type_ioctl(iteioctl);
-dev_type_tty(itetty);
-dev_type_poll(itepoll);
+static dev_type_open(iteopen);
+static dev_type_close(iteclose);
+static dev_type_read(iteread);
+static dev_type_write(itewrite);
+static dev_type_ioctl(iteioctl);
+static dev_type_tty(itetty);
+static dev_type_poll(itepoll);
const struct cdevsw ite_cdevsw = {
.d_open = iteopen,
@@ -378,7 +378,7 @@ iteinit(dev_t dev)
sc->flags |= ITE_INITED;
}
-int
+static int
iteopen(dev_t dev, int mode, int devtype, struct lwp *l)
{
struct ite_softc *sc;
@@ -449,7 +449,7 @@ bad:
return (error);
}
-int
+static int
iteclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct tty *tp;
@@ -463,7 +463,7 @@ iteclose(dev_t dev, int flag, int mode,
return (0);
}
-int
+static int
iteread(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp;
@@ -474,7 +474,7 @@ iteread(dev_t dev, struct uio *uio, int
return ((*tp->t_linesw->l_read) (tp, uio, flag));
}
-int
+static int
itewrite(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp;
@@ -485,7 +485,7 @@ itewrite(dev_t dev, struct uio *uio, int
return ((*tp->t_linesw->l_write) (tp, uio, flag));
}
-int
+static int
itepoll(dev_t dev, int events, struct lwp *l)
{
struct tty *tp;
@@ -496,13 +496,13 @@ itepoll(dev_t dev, int events, struct lw
return ((*tp->t_linesw->l_poll)(tp, events, l));
}
-struct tty *
+static struct tty *
itetty(dev_t dev)
{
return(getitesp(dev)->tp);
}
-int
+static int
iteioctl(dev_t dev, u_long cmd, void * addr, int flag, struct lwp *l)
{
struct iterepeat *irp;
Index: src/sys/arch/atari/dev/lpt.c
diff -u src/sys/arch/atari/dev/lpt.c:1.38 src/sys/arch/atari/dev/lpt.c:1.39
--- src/sys/arch/atari/dev/lpt.c:1.38 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/atari/dev/lpt.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.38 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: lpt.c,v 1.39 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.38 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.39 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,10 +114,10 @@ struct lpt_softc {
#define NOT_READY() (MFP->mf_gpip & IO_PBSY)
/* {b,c}devsw[] function prototypes */
-dev_type_open(lpopen);
-dev_type_close(lpclose);
-dev_type_write(lpwrite);
-dev_type_ioctl(lpioctl);
+static dev_type_open(lpopen);
+static dev_type_close(lpclose);
+static dev_type_write(lpwrite);
+static dev_type_ioctl(lpioctl);
static void lptwakeup (void *arg);
static int pushbytes (struct lpt_softc *);
@@ -185,7 +185,7 @@ lpattach(device_t parent, device_t self,
/*
* Reset the printer, then wait until it's selected and not busy.
*/
-int
+static int
lpopen(dev_t dev, int flag, int mode, struct lwp *l)
{
u_char flags = LPTFLAGS(dev);
@@ -256,7 +256,7 @@ lptwakeup(void *arg)
/*
* Close the device, and free the local line buffer.
*/
-int
+static int
lpclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct lpt_softc *sc = device_lookup_private(&lp_cd, LPTUNIT(dev));
@@ -339,7 +339,7 @@ pushbytes(struct lpt_softc *sc)
* Copy a line from user space to a local buffer, then call putc to get the
* chars moved to the output queue.
*/
-int
+static int
lpwrite(dev_t dev, struct uio *uio, int flags)
{
struct lpt_softc *sc = device_lookup_private(&lp_cd,LPTUNIT(dev));
@@ -415,7 +415,7 @@ lpthwintr(void *arg)
return 1;
}
-int
+static int
lpioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
int error = 0;
Index: src/sys/arch/atari/dev/ms.c
diff -u src/sys/arch/atari/dev/ms.c:1.27 src/sys/arch/atari/dev/ms.c:1.28
--- src/sys/arch/atari/dev/ms.c:1.27 Sun Jun 26 06:02:28 2022
+++ src/sys/arch/atari/dev/ms.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.27 2022/06/26 06:02:28 tsutsui Exp $ */
+/* $NetBSD: ms.c,v 1.28 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.27 2022/06/26 06:02:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.28 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -83,12 +83,12 @@ typedef void (*FPV)(void *);
static struct ms_softc ms_softc[NMOUSE];
-dev_type_open(msopen);
-dev_type_close(msclose);
-dev_type_read(msread);
-dev_type_ioctl(msioctl);
-dev_type_poll(mspoll);
-dev_type_kqfilter(mskqfilter);
+static dev_type_open(msopen);
+static dev_type_close(msclose);
+static dev_type_read(msread);
+static dev_type_ioctl(msioctl);
+static dev_type_poll(mspoll);
+static dev_type_kqfilter(mskqfilter);
const struct cdevsw ms_cdevsw = {
.d_open = msopen,
@@ -319,7 +319,7 @@ mouse_soft(REL_MOUSE *rel_ms, int size,
EV_WAKEUP(&ms->ms_events);
}
-int
+static int
msopen(dev_t dev, int flags, int mode, struct lwp *l)
{
uint8_t report_ms_joy[] = { 0x14, 0x08 };
@@ -349,7 +349,7 @@ msopen(dev_t dev, int flags, int mode, s
return 0;
}
-int
+static int
msclose(dev_t dev, int flags, int mode, struct lwp *l)
{
uint8_t disable_ms_joy[] = { 0x12, 0x1a };
@@ -368,7 +368,7 @@ msclose(dev_t dev, int flags, int mode,
return 0;
}
-int
+static int
msread(dev_t dev, struct uio *uio, int flags)
{
struct ms_softc *ms;
@@ -377,7 +377,7 @@ msread(dev_t dev, struct uio *uio, int f
return ev_read(&ms->ms_events, uio, flags);
}
-int
+static int
msioctl(dev_t dev, u_long cmd, register void * data, int flag, struct lwp *l)
{
struct ms_softc *ms;
@@ -418,7 +418,7 @@ msioctl(dev_t dev, u_long cmd, register
return ENOTTY;
}
-int
+static int
mspoll(dev_t dev, int events, struct lwp *l)
{
struct ms_softc *ms;
@@ -427,7 +427,7 @@ mspoll(dev_t dev, int events, struct lwp
return ev_poll(&ms->ms_events, events, l);
}
-int
+static int
mskqfilter(dev_t dev, struct knote *kn)
{
struct ms_softc *ms;
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.56 src/sys/arch/atari/dev/ser.c:1.57
--- src/sys/arch/atari/dev/ser.c:1.56 Sat Nov 15 19:20:01 2014
+++ src/sys/arch/atari/dev/ser.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.56 2014/11/15 19:20:01 christos Exp $ */
+/* $NetBSD: ser.c,v 1.57 2022/06/26 06:25:09 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.56 2014/11/15 19:20:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.57 2022/06/26 06:25:09 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -249,14 +249,14 @@ static void serattach(device_t, device_t
CFATTACH_DECL_NEW(ser, sizeof(struct ser_softc),
sermatch, serattach, NULL, NULL);
-dev_type_open(seropen);
-dev_type_close(serclose);
-dev_type_read(serread);
-dev_type_write(serwrite);
-dev_type_ioctl(serioctl);
-dev_type_stop(serstop);
-dev_type_tty(sertty);
-dev_type_poll(serpoll);
+static dev_type_open(seropen);
+static dev_type_close(serclose);
+static dev_type_read(serread);
+static dev_type_write(serwrite);
+static dev_type_ioctl(serioctl);
+static dev_type_stop(serstop);
+static dev_type_tty(sertty);
+static dev_type_poll(serpoll);
const struct cdevsw ser_cdevsw = {
.d_open = seropen,
@@ -371,7 +371,7 @@ serstatus(struct ser_softc *sc, char *st
}
#endif /* SER_DEBUG */
-int
+static int
seropen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = SERUNIT(dev);
@@ -489,7 +489,7 @@ bad:
return error;
}
-int
+static int
serclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = SERUNIT(dev);
@@ -515,7 +515,7 @@ serclose(dev_t dev, int flag, int mode,
return 0;
}
-int
+static int
serread(dev_t dev, struct uio *uio, int flag)
{
struct ser_softc *sc = device_lookup_private(&ser_cd, SERUNIT(dev));
@@ -524,7 +524,7 @@ serread(dev_t dev, struct uio *uio, int
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
-int
+static int
serwrite(dev_t dev, struct uio *uio, int flag)
{
struct ser_softc *sc = device_lookup_private(&ser_cd, SERUNIT(dev));
@@ -533,7 +533,7 @@ serwrite(dev_t dev, struct uio *uio, int
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
-int
+static int
serpoll(dev_t dev, int events, struct lwp *l)
{
struct ser_softc *sc = device_lookup_private(&ser_cd, SERUNIT(dev));
@@ -542,7 +542,7 @@ serpoll(dev_t dev, int events, struct lw
return (*tp->t_linesw->l_poll)(tp, events, l);
}
-struct tty *
+static struct tty *
sertty(dev_t dev)
{
struct ser_softc *sc = device_lookup_private(&ser_cd, SERUNIT(dev));
@@ -551,7 +551,7 @@ sertty(dev_t dev)
return tp;
}
-int
+static int
serioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
int unit = SERUNIT(dev);
@@ -989,7 +989,7 @@ out:
/*
* Stop output on a line.
*/
-void
+static void
serstop(struct tty *tp, int flag)
{
struct ser_softc *sc =
Index: src/sys/arch/atari/dev/view.c
diff -u src/sys/arch/atari/dev/view.c:1.36 src/sys/arch/atari/dev/view.c:1.37
--- src/sys/arch/atari/dev/view.c:1.36 Sun Sep 19 10:34:08 2021
+++ src/sys/arch/atari/dev/view.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.36 2021/09/19 10:34:08 andvar Exp $ */
+/* $NetBSD: view.c,v 1.37 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.36 2021/09/19 10:34:08 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.37 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,10 +72,10 @@ int view_default_width = 640;
int view_default_height = 400;
int view_default_depth = 1;
-dev_type_open(viewopen);
-dev_type_close(viewclose);
-dev_type_ioctl(viewioctl);
-dev_type_mmap(viewmmap);
+static dev_type_open(viewopen);
+static dev_type_close(viewclose);
+static dev_type_ioctl(viewioctl);
+static dev_type_mmap(viewmmap);
const struct cdevsw view_cdevsw = {
.d_open = viewopen,
@@ -302,7 +302,7 @@ view_set_colormap(struct view_softc *vu,
*/
/*ARGSUSED*/
-int
+static int
viewopen(dev_t dev, int flags, int mode, struct lwp *l)
{
dimen_t size;
@@ -334,7 +334,7 @@ viewopen(dev_t dev, int flags, int mode,
}
/*ARGSUSED*/
-int
+static int
viewclose (dev_t dev, int flags, int mode, struct lwp *l)
{
struct view_softc *vu;
@@ -352,7 +352,7 @@ viewclose (dev_t dev, int flags, int mod
/*ARGSUSED*/
-int
+static int
viewioctl (dev_t dev, u_long cmd, void * data, int flag, struct lwp *l)
{
struct view_softc *vu;
@@ -399,7 +399,7 @@ viewioctl (dev_t dev, u_long cmd, void *
}
/*ARGSUSED*/
-paddr_t
+static paddr_t
viewmmap(dev_t dev, off_t off, int prot)
{
struct view_softc *vu;
Index: src/sys/arch/atari/dev/zs.c
diff -u src/sys/arch/atari/dev/zs.c:1.79 src/sys/arch/atari/dev/zs.c:1.80
--- src/sys/arch/atari/dev/zs.c:1.79 Sun Jan 3 17:42:10 2021
+++ src/sys/arch/atari/dev/zs.c Sun Jun 26 06:25:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.79 2021/01/03 17:42:10 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.80 2022/06/26 06:25:09 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.79 2021/01/03 17:42:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.80 2022/06/26 06:25:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,14 +228,14 @@ CFATTACH_DECL_NEW(zs, sizeof(struct zs_s
zsmatch, zsattach, NULL, NULL);
/* {b,c}devsw[] function prototypes */
-dev_type_open(zsopen);
-dev_type_close(zsclose);
-dev_type_read(zsread);
-dev_type_write(zswrite);
-dev_type_ioctl(zsioctl);
-dev_type_stop(zsstop);
-dev_type_tty(zstty);
-dev_type_poll(zspoll);
+static dev_type_open(zsopen);
+static dev_type_close(zsclose);
+static dev_type_read(zsread);
+static dev_type_write(zswrite);
+static dev_type_ioctl(zsioctl);
+static dev_type_stop(zsstop);
+static dev_type_tty(zstty);
+static dev_type_poll(zspoll);
const struct cdevsw zs_cdevsw = {
.d_open = zsopen,
@@ -386,7 +386,7 @@ zsattach(device_t parent, device_t self,
/*
* Open a zs serial port.
*/
-int
+static int
zsopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct tty *tp;
@@ -483,7 +483,7 @@ bad:
/*
* Close a zs serial port.
*/
-int
+static int
zsclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct zs_chanstate *cs;
@@ -512,7 +512,7 @@ zsclose(dev_t dev, int flags, int mode,
/*
* Read/write zs serial port.
*/
-int
+static int
zsread(dev_t dev, struct uio *uio, int flags)
{
struct zs_chanstate *cs;
@@ -528,7 +528,7 @@ zsread(dev_t dev, struct uio *uio, int f
return (*tp->t_linesw->l_read)(tp, uio, flags);
}
-int
+static int
zswrite(dev_t dev, struct uio *uio, int flags)
{
struct zs_chanstate *cs;
@@ -544,7 +544,7 @@ zswrite(dev_t dev, struct uio *uio, int
return (*tp->t_linesw->l_write)(tp, uio, flags);
}
-int
+static int
zspoll(dev_t dev, int events, struct lwp *l)
{
struct zs_chanstate *cs;
@@ -560,7 +560,7 @@ zspoll(dev_t dev, int events, struct lwp
return (*tp->t_linesw->l_poll)(tp, events, l);
}
-struct tty *
+static struct tty *
zstty(dev_t dev)
{
struct zs_chanstate *cs;
@@ -854,7 +854,7 @@ again:
return retval;
}
-int
+static int
zsioctl(dev_t dev, u_long cmd, void * data, int flag, struct lwp *l)
{
int unit = ZS_UNIT(dev);
@@ -1027,7 +1027,7 @@ out:
/*
* Stop output, e.g., for ^S or output flush.
*/
-void
+static void
zsstop(struct tty *tp, int flag)
{
struct zs_chanstate *cs;
