Module Name: src
Committed By: tsutsui
Date: Sun Oct 24 13:34:27 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev: pvr.c pvrvar.h
Log Message:
- make local functions/variables static
- export more cons(9) functions in pvrvar.h
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/dreamcast/dev/pvrvar.h
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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.29 src/sys/arch/dreamcast/dev/pvr.c:1.30
--- src/sys/arch/dreamcast/dev/pvr.c:1.29 Wed Oct 20 13:00:06 2010
+++ src/sys/arch/dreamcast/dev/pvr.c Sun Oct 24 13:34:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.29 2010/10/20 13:00:06 tsutsui Exp $ */
+/* $NetBSD: pvr.c,v 1.30 2010/10/24 13:34:27 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.29 2010/10/20 13:00:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.30 2010/10/24 13:34:27 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,43 +155,43 @@
int nscreens;
};
-int pvr_match(device_t, cfdata_t, void *);
-void pvr_attach(device_t, device_t, void *);
+static int pvr_match(device_t, cfdata_t, void *);
+static void pvr_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(pvr, sizeof(struct pvr_softc),
pvr_match, pvr_attach, NULL, NULL);
-void pvr_getdevconfig(struct fb_devconfig *);
+static void pvr_getdevconfig(struct fb_devconfig *);
-struct fb_devconfig pvr_console_dc;
+static struct fb_devconfig pvr_console_dc;
-char pvr_stdscreen_textgeom[32] = { "std" }; /* XXX yuck */
+static char pvr_stdscreen_textgeom[32] = { "std" }; /* XXX yuck */
-struct wsscreen_descr pvr_stdscreen = {
+static struct wsscreen_descr pvr_stdscreen = {
pvr_stdscreen_textgeom, 0, 0,
0, /* textops */
0, 0,
WSSCREEN_WSCOLORS,
};
-const struct wsscreen_descr *_pvr_scrlist[] = {
+static const struct wsscreen_descr *_pvr_scrlist[] = {
&pvr_stdscreen,
};
-const struct wsscreen_list pvr_screenlist = {
+static const struct wsscreen_list pvr_screenlist = {
sizeof(_pvr_scrlist) / sizeof(struct wsscreen_descr *), _pvr_scrlist
};
-int pvrioctl(void *, void *, u_long, void *, int, struct lwp *);
-paddr_t pvrmmap(void *, void *, off_t, int);
+static int pvrioctl(void *, void *, u_long, void *, int, struct lwp *);
+static paddr_t pvrmmap(void *, void *, off_t, int);
-int pvr_alloc_screen(void *, const struct wsscreen_descr *,
- void **, int *, int *, long *);
-void pvr_free_screen(void *, void *);
-int pvr_show_screen(void *, void *, int,
- void (*)(void *, int, int), void *);
+static int pvr_alloc_screen(void *, const struct wsscreen_descr *,
+ void **, int *, int *, long *);
+static void pvr_free_screen(void *, void *);
+static int pvr_show_screen(void *, void *, int,
+ void (*)(void *, int, int), void *);
-const struct wsdisplay_accessops pvr_accessops = {
+static const struct wsdisplay_accessops pvr_accessops = {
pvrioctl,
pvrmmap,
pvr_alloc_screen,
@@ -200,7 +200,7 @@
NULL, /* load_font */
};
-void pvrinit(struct fb_devconfig *);
+static void pvrinit(struct fb_devconfig *);
int pvr_is_console;
@@ -580,9 +580,6 @@
/* Console support. */
-void pvrcnprobe(struct consdev *);
-void pvrcninit(struct consdev *);
-
void
pvrcninit(struct consdev *cndev)
{
Index: src/sys/arch/dreamcast/dev/pvrvar.h
diff -u src/sys/arch/dreamcast/dev/pvrvar.h:1.3 src/sys/arch/dreamcast/dev/pvrvar.h:1.4
--- src/sys/arch/dreamcast/dev/pvrvar.h:1.3 Thu Feb 1 01:25:56 2001
+++ src/sys/arch/dreamcast/dev/pvrvar.h Sun Oct 24 13:34:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pvrvar.h,v 1.3 2001/02/01 01:25:56 thorpej Exp $ */
+/* $NetBSD: pvrvar.h,v 1.4 2010/10/24 13:34:27 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -32,4 +32,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+void pvrcnprobe(struct consdev *);
+void pvrcninit(struct consdev *);
int pvr_cnattach(void);
