Module Name: src
Committed By: tsutsui
Date: Sat Jun 29 16:41:19 UTC 2019
Modified Files:
src/sys/arch/atari/atari: autoconf.c
src/sys/arch/atari/dev: grf.c hdfd.c ite.c ite_cc.c ite_et.c ncr5380.c
wdc_mb.c
src/sys/arch/atari/isa: fdcisa.c
Log Message:
Make local functions static.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/atari/dev/ite.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/atari/dev/ite_cc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/atari/dev/ite_et.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/atari/dev/ncr5380.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/isa/fdcisa.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/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.66 src/sys/arch/atari/atari/autoconf.c:1.67
--- src/sys/arch/atari/atari/autoconf.c:1.66 Fri May 3 01:08:28 2019
+++ src/sys/arch/atari/atari/autoconf.c Sat Jun 29 16:41:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.67 2019/06/29 16:41:18 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.67 2019/06/29 16:41:18 tsutsui Exp $");
#include "opt_md.h"
@@ -55,10 +55,10 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include "ioconf.h"
static void findroot(void);
-int mbmatch(device_t, cfdata_t, void *);
-void mbattach(device_t, device_t, void *);
+static int mbmatch(device_t, cfdata_t, void *);
+static void mbattach(device_t, device_t, void *);
#if 0
-int mbprint(void *, const char *);
+static int mbprint(void *, const char *);
#endif
int atari_realconfig;
@@ -293,7 +293,7 @@ CFATTACH_DECL_NEW(mainbus, 0,
static int mb_attached;
-int
+static int
mbmatch(device_t parent, cfdata_t cf, void *aux)
{
@@ -308,7 +308,7 @@ mbmatch(device_t parent, cfdata_t cf, vo
/*
* "find" all the things that should be there.
*/
-void
+static void
mbattach(device_t parent, device_t self, void *aux)
{
@@ -332,7 +332,7 @@ mbattach(device_t parent, device_t self,
}
#if 0
-int
+static int
mbprint(void *aux, const char *pnp)
{
Index: src/sys/arch/atari/dev/grf.c
diff -u src/sys/arch/atari/dev/grf.c:1.49 src/sys/arch/atari/dev/grf.c:1.50
--- src/sys/arch/atari/dev/grf.c:1.49 Fri Jul 25 08:10:32 2014
+++ src/sys/arch/atari/dev/grf.c Sat Jun 29 16:41:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.49 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: grf.c,v 1.50 2019/06/29 16:41:18 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.49 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.50 2019/06/29 16:41:18 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -90,9 +90,9 @@ int grfon(dev_t);
int grfoff(dev_t);
int grfsinfo(dev_t, struct grfdyninfo *);
-int grfbusprint(void *, const char *);
-int grfbusmatch(device_t, cfdata_t, void *);
-void grfbusattach(device_t, device_t, void *);
+static int grfbusprint(void *, const char *);
+static int grfbusmatch(device_t, cfdata_t, void *);
+static void grfbusattach(device_t, device_t, void *);
/*
* pointers to grf drivers device structs
@@ -127,7 +127,7 @@ const struct cdevsw grf_cdevsw = {
*/
static cfdata_t cfdata_gbus = NULL;
-int
+static int
grfbusmatch(device_t parent, cfdata_t cf, void *aux)
{
@@ -139,7 +139,7 @@ grfbusmatch(device_t parent, cfdata_t cf
return 1; /* Always there */
}
-void
+static void
grfbusattach(device_t parent, device_t self, void *aux)
{
grf_auxp_t grf_auxp;
@@ -155,7 +155,7 @@ grfbusattach(device_t parent, device_t s
}
}
-int
+static int
grfbusprint(void *aux, const char *name)
{
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.84 src/sys/arch/atari/dev/hdfd.c:1.85
--- src/sys/arch/atari/dev/hdfd.c:1.84 Fri Feb 8 08:47:35 2019
+++ src/sys/arch/atari/dev/hdfd.c Sat Jun 29 16:41:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $ */
+/* $NetBSD: hdfd.c,v 1.85 2019/06/29 16:41:18 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.85 2019/06/29 16:41:18 tsutsui Exp $");
#include "opt_ddb.h"
@@ -202,9 +202,9 @@ struct fdc_softc {
};
/* controller driver configuration */
-int fdcprobe(device_t, cfdata_t, void *);
-int fdprint(void *, const char *);
-void fdcattach(device_t, device_t, void *);
+static int fdcprobe(device_t, cfdata_t, void *);
+static int fdprint(void *, const char *);
+static void fdcattach(device_t, device_t, void *);
CFATTACH_DECL_NEW(fdc, sizeof(struct fdc_softc),
fdcprobe, fdcattach, NULL, NULL);
@@ -279,8 +279,8 @@ struct fd_softc {
};
/* floppy driver configuration */
-int fdprobe(device_t, cfdata_t, void *);
-void fdattach(device_t, device_t, void *);
+static int fdprobe(device_t, cfdata_t, void *);
+static void fdattach(device_t, device_t, void *);
CFATTACH_DECL_NEW(hdfd, sizeof(struct fd_softc),
fdprobe, fdattach, NULL, NULL);
@@ -337,7 +337,7 @@ static void fdgetdefaultlabel(struct fd_
static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
-int
+static int
fdcprobe(device_t parent, cfdata_t cf, void *aux)
{
static int fdc_matched = 0;
@@ -402,7 +402,7 @@ struct fdc_attach_args {
* Return QUIET (config_find ignores this if the device was configured) to
* avoid printing `fdN not configured' messages.
*/
-int
+static int
fdprint(void *aux, const char *fdc)
{
register struct fdc_attach_args *fa = aux;
@@ -412,7 +412,7 @@ fdprint(void *aux, const char *fdc)
return QUIET;
}
-void
+static void
fdcattach(device_t parent, device_t self, void *aux)
{
struct fdc_softc *fdc = device_private(self);
@@ -468,7 +468,7 @@ fdcattach(device_t parent, device_t self
}
}
-int
+static int
fdprobe(device_t parent, cfdata_t cf, void *aux)
{
struct fdc_softc *fdc = device_private(parent);
@@ -521,7 +521,7 @@ fdprobe(device_t parent, cfdata_t cf, vo
/*
* Controller is working, and drive responded. Attach it.
*/
-void
+static void
fdattach(device_t parent, device_t self, void *aux)
{
struct fdc_softc *fdc = device_private(parent);
Index: src/sys/arch/atari/dev/ite.c
diff -u src/sys/arch/atari/dev/ite.c:1.78 src/sys/arch/atari/dev/ite.c:1.79
--- src/sys/arch/atari/dev/ite.c:1.78 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/atari/dev/ite.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.78 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: ite.c,v 1.79 2019/06/29 16:41:19 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.78 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.79 2019/06/29 16:41:19 tsutsui Exp $");
#include "opt_ddb.h"
@@ -135,10 +135,11 @@ static void itestart(struct tty *);
static void ite_switch(int);
static void repeat_handler(void *);
-void iteputchar(int c, struct ite_softc *sc);
-void ite_putstr(const u_char * s, int len, dev_t dev);
-void iteattach(device_t, device_t, void *);
-int itematch(device_t, cfdata_t, void *);
+static void iteputchar(int c, struct ite_softc *sc);
+static void ite_putstr(const u_char * s, int len, dev_t dev);
+
+static void iteattach(device_t, device_t, void *);
+static int itematch(device_t, cfdata_t, void *);
/*
* Console specific types.
@@ -180,7 +181,7 @@ const struct cdevsw ite_cdevsw = {
*/
static int cons_ite = -1;
-int
+static int
itematch(device_t parent, cfdata_t cf, void *aux)
{
@@ -197,7 +198,7 @@ itematch(device_t parent, cfdata_t cf, v
return 1;
}
-void
+static void
iteattach(device_t parent, device_t self, void *aux)
{
struct grf_softc *gsc;
@@ -1324,7 +1325,7 @@ ite_zargnum (struct ite_softc *sc)
return n; /* don't "n ? n : 1" here, <CSI>0m != <CSI>1m ! */
}
-void
+static void
ite_putstr(const u_char *s, int len, dev_t dev)
{
struct ite_softc *sc;
@@ -1344,7 +1345,7 @@ ite_putstr(const u_char *s, int len, dev
}
-void
+static void
iteputchar(register int c, struct ite_softc *sc)
{
struct tty *kbd_tty;
Index: src/sys/arch/atari/dev/ite_cc.c
diff -u src/sys/arch/atari/dev/ite_cc.c:1.39 src/sys/arch/atari/dev/ite_cc.c:1.40
--- src/sys/arch/atari/dev/ite_cc.c:1.39 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/atari/dev/ite_cc.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_cc.c,v 1.39 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: ite_cc.c,v 1.40 2019/06/29 16:41:19 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.39 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.40 2019/06/29 16:41:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -105,9 +105,9 @@ static void scrollbmap(bmap_t *, u_short
/*
* grfcc config stuff
*/
-void grfccattach(device_t, device_t, void *);
-int grfccmatch(device_t, cfdata_t, void *);
-int grfccprint(void *, const char *);
+static void grfccattach(device_t, device_t, void *);
+static int grfccmatch(device_t, cfdata_t, void *);
+static int grfccprint(void *, const char *);
CFATTACH_DECL_NEW(grfcc, sizeof(struct grf_softc),
grfccmatch, grfccattach, NULL, NULL);
@@ -127,7 +127,7 @@ void tt_probe_video(MODES *);
void falcon_probe_video(MODES *);
#endif /* FALCON_VIDEO */
-int
+static int
grfccmatch(device_t parent, cfdata_t cf, void *aux)
{
static int did_consinit = 0;
@@ -194,7 +194,7 @@ grfccmatch(device_t parent, cfdata_t cf,
* attach: initialize the grf-structure and try to attach an ite to us.
* note : self is NULL during early console init.
*/
-void
+static void
grfccattach(device_t parent, device_t self, void *aux)
{
static struct grf_softc congrf;
@@ -281,7 +281,7 @@ grfccattach(device_t parent, device_t se
}
}
-int
+static int
grfccprint(void *aux, const char *pnp)
{
Index: src/sys/arch/atari/dev/ite_et.c
diff -u src/sys/arch/atari/dev/ite_et.c:1.30 src/sys/arch/atari/dev/ite_et.c:1.31
--- src/sys/arch/atari/dev/ite_et.c:1.30 Sun Jun 5 16:25:12 2011
+++ src/sys/arch/atari/dev/ite_et.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_et.c,v 1.30 2011/06/05 16:25:12 tsutsui Exp $ */
+/* $NetBSD: ite_et.c,v 1.31 2019/06/29 16:41:19 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.30 2011/06/05 16:25:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.31 2019/06/29 16:41:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,9 +90,9 @@ void et_scroll(struct ite_softc *ip, int
/*
* grfet config stuff
*/
-void grfetattach(device_t, device_t, void *);
-int grfetmatch(device_t, cfdata_t, void *);
-int grfetprint(void *, const char *);
+static void grfetattach(device_t, device_t, void *);
+static int grfetmatch(device_t, cfdata_t, void *);
+static int grfetprint(void *, const char *);
CFATTACH_DECL_NEW(grfet, sizeof(struct grf_softc),
grfetmatch, grfetattach, NULL, NULL);
@@ -102,7 +102,7 @@ CFATTACH_DECL_NEW(grfet, sizeof(struct g
*/
static struct cfdata *cfdata_grf = NULL;
-int
+static int
grfetmatch(device_t parent, cfdata_t cf, void *aux)
{
static int card_probed = -1;
@@ -168,7 +168,7 @@ grfetmatch(device_t parent, cfdata_t cf,
* attach: initialize the grf-structure and try to attach an ite to us.
* note : self is NULL during early console init.
*/
-void
+static void
grfetattach(device_t parent, device_t self, void *aux)
{
static struct grf_softc congrf;
@@ -255,7 +255,7 @@ grfetattach(device_t parent, device_t se
}
}
-int
+static int
grfetprint(void *aux, const char *pnp)
{
Index: src/sys/arch/atari/dev/ncr5380.c
diff -u src/sys/arch/atari/dev/ncr5380.c:1.72 src/sys/arch/atari/dev/ncr5380.c:1.73
--- src/sys/arch/atari/dev/ncr5380.c:1.72 Sat Oct 18 08:33:25 2014
+++ src/sys/arch/atari/dev/ncr5380.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380.c,v 1.72 2014/10/18 08:33:25 snj Exp $ */
+/* $NetBSD: ncr5380.c,v 1.73 2019/06/29 16:41:19 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.72 2014/10/18 08:33:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.73 2019/06/29 16:41:19 tsutsui Exp $");
/*
* Bit mask of targets you want debugging to be shown
@@ -171,8 +171,8 @@ finish_req(SC_REQ *reqp)
/*
* Auto config stuff....
*/
-void ncr_attach(device_t, device_t, void *);
-int ncr_match(device_t, cfdata_t, void *);
+static void ncr_attach(device_t, device_t, void *);
+static int ncr_match(device_t, cfdata_t, void *);
/*
* Tricks to make driver-name configurable
@@ -187,14 +187,14 @@ CFATTACH_DECL_NEW(CFDRNAME(DRNAME), size
extern struct cfdriver CFNAME(DRNAME);
-int
+static int
ncr_match(device_t parent, cfdata_t cf, void *aux)
{
return machine_match(parent, cf, aux, &CFNAME(DRNAME));
}
-void
+static void
ncr_attach(device_t parent, device_t self, void *aux)
{
struct ncr_softc *sc;
Index: src/sys/arch/atari/dev/wdc_mb.c
diff -u src/sys/arch/atari/dev/wdc_mb.c:1.40 src/sys/arch/atari/dev/wdc_mb.c:1.41
--- src/sys/arch/atari/dev/wdc_mb.c:1.40 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/atari/dev/wdc_mb.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_mb.c,v 1.40 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: wdc_mb.c,v 1.41 2019/06/29 16:41:19 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.40 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.41 2019/06/29 16:41:19 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -76,13 +76,13 @@ struct wdc_mb_softc {
void *sc_ih;
};
-int wdc_mb_probe(device_t, struct cfdata *, void *);
-void wdc_mb_attach(device_t, device_t, void *);
+static int wdc_mb_probe(device_t, struct cfdata *, void *);
+static void wdc_mb_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(wdc_mb, sizeof(struct wdc_mb_softc),
wdc_mb_probe, wdc_mb_attach, NULL, NULL);
-int
+static int
wdc_mb_probe(device_t parent, cfdata_t cfp, void *aux)
{
static int wdc_matched = 0;
@@ -141,7 +141,7 @@ wdc_mb_probe(device_t parent, cfdata_t c
return result;
}
-void
+static void
wdc_mb_attach(device_t parent, device_t self, void *aux)
{
struct wdc_mb_softc *sc = device_private(self);
Index: src/sys/arch/atari/isa/fdcisa.c
diff -u src/sys/arch/atari/isa/fdcisa.c:1.14 src/sys/arch/atari/isa/fdcisa.c:1.15
--- src/sys/arch/atari/isa/fdcisa.c:1.14 Fri Jul 1 20:34:06 2011
+++ src/sys/arch/atari/isa/fdcisa.c Sat Jun 29 16:41:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdcisa.c,v 1.14 2011/07/01 20:34:06 dyoung Exp $ */
+/* $NetBSD: fdcisa.c,v 1.15 2019/06/29 16:41:19 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.14 2011/07/01 20:34:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.15 2019/06/29 16:41:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,8 +82,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1
/* controller driver configuration */
-int fdc_isa_probe (device_t, cfdata_t, void *);
-void fdc_isa_attach (device_t, device_t, void *);
+static int fdc_isa_probe (device_t, cfdata_t, void *);
+static void fdc_isa_attach (device_t, device_t, void *);
struct fdc_isa_softc {
struct fdc_softc sc_fdc; /* base fdc device */
@@ -93,7 +93,7 @@ struct fdc_isa_softc {
CFATTACH_DECL_NEW(fdcisa, sizeof(struct fdc_isa_softc),
fdc_isa_probe, fdc_isa_attach, NULL, NULL);
-int
+static int
fdc_isa_probe(device_t parent, cfdata_t cfp, void *aux)
{
struct isa_attach_args *ia = aux;
@@ -177,7 +177,7 @@ out:
return fdc_matched;
}
-void
+static void
fdc_isa_attach(device_t parent, device_t self, void *aux)
{
struct fdc_isa_softc *isc = device_private(self);
