Module Name:    src
Committed By:   tsutsui
Date:           Sat Dec 21 17:40:11 UTC 2024

Modified Files:
        src/sys/arch/sun3/dev: bw2.c cg2.c cg4.c fb.c fd.c kd.c xd.c xy.c

Log Message:
Make local dev_type_*() functions static.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sun3/dev/bw2.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun3/dev/cg2.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sun3/dev/cg4.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/dev/fb.c
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sun3/dev/kd.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sun3/dev/xy.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/bw2.c
diff -u src/sys/arch/sun3/dev/bw2.c:1.38 src/sys/arch/sun3/dev/bw2.c:1.39
--- src/sys/arch/sun3/dev/bw2.c:1.38	Fri Dec 20 23:51:59 2024
+++ src/sys/arch/sun3/dev/bw2.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: bw2.c,v 1.38 2024/12/20 23:51:59 tsutsui Exp $	*/
+/*	$NetBSD: bw2.c,v 1.39 2024/12/21 17:40:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.38 2024/12/20 23:51:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.39 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,9 +89,9 @@ static void	bw2attach(device_t, device_t
 CFATTACH_DECL_NEW(bwtwo, sizeof(struct bw2_softc),
     bw2match, bw2attach, NULL, NULL);
 
-dev_type_open(bw2open);
-dev_type_ioctl(bw2ioctl);
-dev_type_mmap(bw2mmap);
+static dev_type_open(bw2open);
+static dev_type_ioctl(bw2ioctl);
+static dev_type_mmap(bw2mmap);
 
 const struct cdevsw bwtwo_cdevsw = {
 	.d_open = bw2open,
@@ -295,7 +295,7 @@ bw2attach(device_t parent, device_t self
 	fb_attach(fb, 1);
 }
 
-int
+static 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
+static 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
+static paddr_t
 bw2mmap(dev_t dev, off_t off, int prot)
 {
 	struct bw2_softc *sc = device_lookup_private(&bwtwo_cd, minor(dev));

Index: src/sys/arch/sun3/dev/cg2.c
diff -u src/sys/arch/sun3/dev/cg2.c:1.33 src/sys/arch/sun3/dev/cg2.c:1.34
--- src/sys/arch/sun3/dev/cg2.c:1.33	Fri Dec 20 23:51:59 2024
+++ src/sys/arch/sun3/dev/cg2.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cg2.c,v 1.33 2024/12/20 23:51:59 tsutsui Exp $	*/
+/*	$NetBSD: cg2.c,v 1.34 2024/12/21 17:40:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.33 2024/12/20 23:51:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.34 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,9 +99,9 @@ static void	cg2attach(device_t, device_t
 CFATTACH_DECL_NEW(cgtwo, sizeof(struct cg2_softc),
     cg2match, cg2attach, NULL, NULL);
 
-dev_type_open(cg2open);
-dev_type_ioctl(cg2ioctl);
-dev_type_mmap(cg2mmap);
+static dev_type_open(cg2open);
+static dev_type_ioctl(cg2ioctl);
+static dev_type_mmap(cg2mmap);
 
 const struct cdevsw cgtwo_cdevsw = {
 	.d_open = cg2open,
@@ -202,7 +202,7 @@ cg2attach(device_t parent, device_t self
 	fb_attach(fb, 2);
 }
 
-int
+static 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
+static 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
+static paddr_t
 cg2mmap(dev_t dev, off_t off, int prot)
 {
 	struct cg2_softc *sc = device_lookup_private(&cgtwo_cd, minor(dev));

Index: src/sys/arch/sun3/dev/cg4.c
diff -u src/sys/arch/sun3/dev/cg4.c:1.43 src/sys/arch/sun3/dev/cg4.c:1.44
--- src/sys/arch/sun3/dev/cg4.c:1.43	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/cg4.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cg4.c,v 1.43 2024/12/20 23:52:00 tsutsui Exp $	*/
+/*	$NetBSD: cg4.c,v 1.44 2024/12/21 17:40:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cg4.c,v 1.43 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cg4.c,v 1.44 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,9 +122,9 @@ static void	cg4attach(device_t, device_t
 CFATTACH_DECL_NEW(cgfour, sizeof(struct cg4_softc),
     cg4match, cg4attach, NULL, NULL);
 
-dev_type_open(cg4open);
-dev_type_ioctl(cg4ioctl);
-dev_type_mmap(cg4mmap);
+static dev_type_open(cg4open);
+static dev_type_ioctl(cg4ioctl);
+static dev_type_mmap(cg4mmap);
 
 const struct cdevsw cgfour_cdevsw = {
 	.d_open = cg4open,
@@ -337,7 +337,7 @@ cg4attach(device_t parent, device_t self
 	fb_attach(fb, 4);
 }
 
-int
+static 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
+static 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
+static paddr_t
 cg4mmap(dev_t dev, off_t off, int prot)
 {
 	struct cg4_softc *sc = device_lookup_private(&cgfour_cd, minor(dev));

Index: src/sys/arch/sun3/dev/fb.c
diff -u src/sys/arch/sun3/dev/fb.c:1.17 src/sys/arch/sun3/dev/fb.c:1.18
--- src/sys/arch/sun3/dev/fb.c:1.17	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/fb.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $ */
+/*	$NetBSD: fb.c,v 1.18 2024/12/21 17:40:11 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.17 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.18 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,10 +60,10 @@ __KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.17 
 #include <sun3/dev/fbvar.h>
 #include <sun3/dev/p4reg.h>
 
-dev_type_open(fbopen);
-dev_type_close(fbclose);
-dev_type_ioctl(fbioctl);
-dev_type_mmap(fbmmap);
+static dev_type_open(fbopen);
+static dev_type_close(fbclose);
+static dev_type_ioctl(fbioctl);
+static dev_type_mmap(fbmmap);
 
 const struct cdevsw fb_cdevsw = {
 	.d_open = fbopen,
@@ -96,7 +96,7 @@ fb_attach(struct fbdevice *fb, int newpr
 	}
 }
 
-int
+static 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
+static int
 fbclose(dev_t dev, int flags, int mode, struct lwp *l)
 {
 
 	return ((*devfb->fb_driver->fbd_close)(dev, flags, mode, l));
 }
 
-int
+static int
 fbioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
 {
 	return (fbioctlfb(devfb, cmd, data));
 }
 
-paddr_t
+static paddr_t
 fbmmap(dev_t dev, off_t off, int prot)
 {
 	return ((*devfb->fb_driver->fbd_mmap)(dev, off, prot));

Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.88 src/sys/arch/sun3/dev/fd.c:1.89
--- src/sys/arch/sun3/dev/fd.c:1.88	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/fd.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.88 2024/12/20 23:52:00 tsutsui Exp $	*/
+/*	$NetBSD: fd.c,v 1.89 2024/12/21 17:40:11 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.88 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.89 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -271,12 +271,12 @@ static void	fdattach(device_t, device_t,
 CFATTACH_DECL_NEW(fd, sizeof(struct fd_softc),
     fdmatch, fdattach, NULL, NULL);
 
-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);
 
 const struct bdevsw fd_bdevsw = {
 	.d_open = fdopen,
@@ -654,7 +654,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;
@@ -876,7 +876,7 @@ out_fdc(struct fdc_softc *fdc, u_char x)
 	return 0;
 }
 
-int
+static 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
+static int
 fdclose(dev_t dev, int flags, int fmt, struct lwp *l)
 {
 	struct fd_softc *fd = device_lookup_private(&fd_cd, FDUNIT(dev));
@@ -946,14 +946,14 @@ fdclose(dev_t dev, int flags, int fmt, s
 	return 0;
 }
 
-int
+static int
 fdread(dev_t dev, struct uio *uio, int flag)
 {
 
 	return physio(fdstrategy, NULL, dev, B_READ, minphys, uio);
 }
 
-int
+static int
 fdwrite(dev_t dev, struct uio *uio, int flag)
 {
 
@@ -1586,7 +1586,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 = device_lookup_private(&fd_cd, FDUNIT(dev));

Index: src/sys/arch/sun3/dev/kd.c
diff -u src/sys/arch/sun3/dev/kd.c:1.60 src/sys/arch/sun3/dev/kd.c:1.61
--- src/sys/arch/sun3/dev/kd.c:1.60	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/kd.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: kd.c,v 1.60 2024/12/20 23:52:00 tsutsui Exp $	*/
+/*	$NetBSD: kd.c,v 1.61 2024/12/21 17:40:11 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.60 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.61 2024/12/21 17:40:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -86,13 +86,13 @@ static void kd_init(struct kd_softc *);
 static void kd_cons_input(int);
 static void kd_later(void *);
 
-dev_type_open(kdopen);
-dev_type_close(kdclose);
-dev_type_read(kdread);
-dev_type_write(kdwrite);
-dev_type_ioctl(kdioctl);
-dev_type_tty(kdtty);
-dev_type_poll(kdpoll);
+static dev_type_open(kdopen);
+static dev_type_close(kdclose);
+static dev_type_read(kdread);
+static dev_type_write(kdwrite);
+static dev_type_ioctl(kdioctl);
+static dev_type_tty(kdtty);
+static dev_type_poll(kdpoll);
 
 const struct cdevsw kd_cdevsw = {
 	.d_open = kdopen,
@@ -130,7 +130,7 @@ kd_init(struct kd_softc *kd)
 	return;
 }
 
-struct tty *
+static struct tty *
 kdtty(dev_t dev)
 {
 	struct kd_softc *kd;
@@ -139,7 +139,7 @@ kdtty(dev_t dev)
 	return (kd->kd_tty);
 }
 
-int
+static 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
+static 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
+static 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
+static 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
+static int
 kdpoll(dev_t dev, int events, struct lwp *l)
 {
 	struct kd_softc *kd;
@@ -248,7 +248,7 @@ kdpoll(dev_t dev, int events, struct lwp
 	return ((*tp->t_linesw->l_poll)(tp, events, l));
 }
 
-int
+static int
 kdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 {
 	struct kd_softc *kd;

Index: src/sys/arch/sun3/dev/xd.c
diff -u src/sys/arch/sun3/dev/xd.c:1.79 src/sys/arch/sun3/dev/xd.c:1.80
--- src/sys/arch/sun3/dev/xd.c:1.79	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/xd.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: xd.c,v 1.79 2024/12/20 23:52:00 tsutsui Exp $	*/
+/*	$NetBSD: xd.c,v 1.80 2024/12/21 17:40:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.79 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.80 2024/12/21 17:40:11 tsutsui Exp $");
 
 #undef XDC_DEBUG		/* full debug */
 #define XDC_DIAG		/* extra sanity checks */
@@ -276,14 +276,14 @@ struct xdc_attach_args {	/* this is the 
 	int	booting;	/* are we booting or not? */
 };
 
-dev_type_open(xdopen);
-dev_type_close(xdclose);
-dev_type_read(xdread);
-dev_type_write(xdwrite);
-dev_type_ioctl(xdioctl);
-dev_type_strategy(xdstrategy);
-dev_type_dump(xddump);
-dev_type_size(xdsize);
+static dev_type_open(xdopen);
+static dev_type_close(xdclose);
+static dev_type_read(xdread);
+static dev_type_write(xdwrite);
+static dev_type_ioctl(xdioctl);
+static dev_type_strategy(xdstrategy);
+static dev_type_dump(xddump);
+static dev_type_size(xdsize);
 
 const struct bdevsw xd_bdevsw = {
 	.d_open = xdopen,
@@ -757,7 +757,7 @@ xd_init(struct xd_softc *xd)
 /*
  * xdclose: close device
  */
-int
+static 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
+static 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
+static 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
+static 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
+static int
 xdread(dev_t dev, struct uio *uio, int flags)
 {
 
 	return physio(xdstrategy, NULL, dev, B_READ, minphys, uio);
 }
 
-int
+static 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
+static int
 xdsize(dev_t dev)
 {
 	struct xd_softc *xdsc;
@@ -1050,7 +1050,7 @@ xdsize(dev_t dev)
 /*
  * xdstrategy: buffering system interface to xd.
  */
-void
+static void
 xdstrategy(struct buf *bp)
 {
 	struct xd_softc *xd;

Index: src/sys/arch/sun3/dev/xy.c
diff -u src/sys/arch/sun3/dev/xy.c:1.83 src/sys/arch/sun3/dev/xy.c:1.84
--- src/sys/arch/sun3/dev/xy.c:1.83	Fri Dec 20 23:52:00 2024
+++ src/sys/arch/sun3/dev/xy.c	Sat Dec 21 17:40:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: xy.c,v 1.83 2024/12/20 23:52:00 tsutsui Exp $	*/
+/*	$NetBSD: xy.c,v 1.84 2024/12/21 17:40:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles D. Cranor
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.83 2024/12/20 23:52:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.84 2024/12/21 17:40:11 tsutsui Exp $");
 
 #undef XYC_DEBUG		/* full debug */
 #undef XYC_DIAG			/* extra sanity checks */
@@ -207,14 +207,14 @@ struct xyc_attach_args {	/* this is the 
 	int	driveno;	/* unit number */
 };
 
-dev_type_open(xyopen);
-dev_type_close(xyclose);
-dev_type_read(xyread);
-dev_type_write(xywrite);
-dev_type_ioctl(xyioctl);
-dev_type_strategy(xystrategy);
-dev_type_dump(xydump);
-dev_type_size(xysize);
+static dev_type_open(xyopen);
+static dev_type_close(xyclose);
+static dev_type_read(xyread);
+static dev_type_write(xywrite);
+static dev_type_ioctl(xyioctl);
+static dev_type_strategy(xystrategy);
+static dev_type_dump(xydump);
+static dev_type_size(xysize);
 
 const struct bdevsw xy_bdevsw = {
 	.d_open = xyopen,
@@ -704,7 +704,7 @@ xy_init(struct xy_softc *xy)
 /*
  * xyclose: close device
  */
-int
+static 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
+static 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
+static 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
+static 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
+static int
 xyread(dev_t dev, struct uio *uio, int flags)
 {
 
 	return physio(xystrategy, NULL, dev, B_READ, minphys, uio);
 }
 
-int
+static 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
+static int
 xysize(dev_t dev)
 {
 	struct xy_softc *xysc;
@@ -1004,7 +1004,7 @@ xysize(dev_t dev)
 /*
  * xystrategy: buffering system interface to xy.
  */
-void
+static void
 xystrategy(struct buf *bp)
 {
 	struct xy_softc *xy;

Reply via email to