Module Name: src
Committed By: tsutsui
Date: Sat Feb 14 13:07:39 UTC 2015
Modified Files:
src/sys/arch/luna68k/stand/boot: disklabel.c init_main.c machdep.c sc.c
sd.c
Log Message:
Explicitly denote static functions.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/stand/boot/disklabel.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/luna68k/stand/boot/init_main.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/stand/boot/sc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/luna68k/stand/boot/sd.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/luna68k/stand/boot/disklabel.c
diff -u src/sys/arch/luna68k/stand/boot/disklabel.c:1.9 src/sys/arch/luna68k/stand/boot/disklabel.c:1.10
--- src/sys/arch/luna68k/stand/boot/disklabel.c:1.9 Sat Feb 14 06:16:29 2015
+++ src/sys/arch/luna68k/stand/boot/disklabel.c Sat Feb 14 13:07:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.9 2015/02/14 06:16:29 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.10 2015/02/14 13:07:39 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -329,7 +329,7 @@ disklabel(int argc, char *argv[])
return ST_NORMAL;
}
-void
+static void
display(struct disklabel *lp)
{
int i, j;
Index: src/sys/arch/luna68k/stand/boot/init_main.c
diff -u src/sys/arch/luna68k/stand/boot/init_main.c:1.15 src/sys/arch/luna68k/stand/boot/init_main.c:1.16
--- src/sys/arch/luna68k/stand/boot/init_main.c:1.15 Mon Apr 21 11:06:55 2014
+++ src/sys/arch/luna68k/stand/boot/init_main.c Sat Feb 14 13:07:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.15 2014/04/21 11:06:55 tsutsui Exp $ */
+/* $NetBSD: init_main.c,v 1.16 2015/02/14 13:07:39 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -328,7 +328,7 @@ main(void)
exit(0);
}
-int
+static int
get_plane_numbers(void)
{
int r = ROM_plane;
@@ -341,7 +341,7 @@ get_plane_numbers(void)
return n;
}
-int
+static int
reorder_dipsw(int dipsw)
{
int i, sw = 0;
Index: src/sys/arch/luna68k/stand/boot/machdep.c
diff -u src/sys/arch/luna68k/stand/boot/machdep.c:1.4 src/sys/arch/luna68k/stand/boot/machdep.c:1.5
--- src/sys/arch/luna68k/stand/boot/machdep.c:1.4 Sat Feb 14 05:58:02 2015
+++ src/sys/arch/luna68k/stand/boot/machdep.c Sat Feb 14 13:07:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.4 2015/02/14 05:58:02 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.5 2015/02/14 13:07:39 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -157,7 +157,7 @@ regdump(int *rp /* must not be register
/* #define KSADDR ((int *)&(((char *)&u)[(UPAGES-1)*NBPG])) */
-void
+static void
dumpmem(int *ptr, int sz, int ustack)
{
int i, val;
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.13 src/sys/arch/luna68k/stand/boot/sc.c:1.14
--- src/sys/arch/luna68k/stand/boot/sc.c:1.13 Sat Feb 14 05:58:02 2015
+++ src/sys/arch/luna68k/stand/boot/sc.c Sat Feb 14 13:07:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.13 2015/02/14 05:58:02 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.14 2015/02/14 13:07:39 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -135,7 +135,7 @@ scinit(int ctlr, void *addr)
return 1;
}
-void
+static void
screset(struct scsi_softc *hs)
{
struct scsidevice *hd = hs->sc_spc;
@@ -270,7 +270,7 @@ scprobe(struct scsi_softc *hs, uint targ
* SPC Arbitration/Selection routine
*/
-int
+static int
issue_select(struct scsidevice *hd, uint8_t target)
{
@@ -299,7 +299,7 @@ issue_select(struct scsidevice *hd, uint
* SPC Program Transfer routines
*/
-void
+static void
ixfer_start(struct scsidevice *hd, int len, uint8_t phase, int wait)
{
@@ -310,7 +310,7 @@ ixfer_start(struct scsidevice *hd, int l
hd->scsi_scmd = SCMD_XFR | SCMD_PROG_XFR;
}
-void
+static void
ixfer_out(struct scsidevice *hd, int len, uint8_t *buf)
{
@@ -322,7 +322,7 @@ ixfer_out(struct scsidevice *hd, int len
}
}
-void
+static void
ixfer_in(struct scsidevice *hd, int len, uint8_t *buf)
{
@@ -339,7 +339,7 @@ ixfer_in(struct scsidevice *hd, int len,
* SPC drive routines
*/
-int
+static int
scrun(int ctlr, int target, uint8_t *cdb, int cdblen, uint8_t *buf, int len,
volatile int *lock)
{
@@ -376,7 +376,7 @@ scrun(int ctlr, int target, uint8_t *cdb
return 1;
}
-int
+static int
scfinish(int ctlr)
{
struct scsi_softc *hs = &scsi_softc[ctlr];
@@ -398,7 +398,7 @@ scfinish(int ctlr)
return status;
}
-void
+static void
scabort(struct scsi_softc *hs)
{
struct scsidevice *hd = hs->sc_spc;
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.11 src/sys/arch/luna68k/stand/boot/sd.c:1.12
--- src/sys/arch/luna68k/stand/boot/sd.c:1.11 Wed Apr 16 12:01:53 2014
+++ src/sys/arch/luna68k/stand/boot/sd.c Sat Feb 14 13:07:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.11 2014/04/16 12:01:53 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.12 2015/02/14 13:07:39 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -96,10 +96,10 @@ struct sd_softc {
struct disklabel sc_label;
};
-static struct sd_softc *sdinit(uint);
static int sdident(struct sd_softc *);
+static struct sd_softc *sdinit(uint);
-int
+static int
sdident(struct sd_softc *sc)
{
struct scsi_inquiry inqbuf;
@@ -123,7 +123,7 @@ sdident(struct sd_softc *sc)
return inqbuf.type;
}
-struct sd_softc *
+static struct sd_softc *
sdinit(uint unit)
{
struct sd_softc *sc;