update for changed struct wsdisplay_accessops:show_screen signature.

no functional changes
This commit is contained in:
drochner 1999-12-06 19:25:56 +00:00
parent 162086b1cd
commit 0893832078
15 changed files with 156 additions and 69 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.22 1999/01/11 21:54:22 drochner Exp $ */
/* $NetBSD: cfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.22 1999/01/11 21:54:22 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -103,7 +103,8 @@ int cfbintr __P((void *));
static int cfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void cfb_free_screen __P((void *, void *));
static void cfb_show_screen __P((void *, void *));
static int cfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
struct wsdisplay_accessops cfb_accessops = {
cfbioctl,
@ -358,11 +359,16 @@ cfb_free_screen(v, cookie)
sc->nscreens--;
}
void
cfb_show_screen(v, cookie)
int
cfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.22 1999/01/11 21:54:22 drochner Exp $ */
/* $NetBSD: sfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.22 1999/01/11 21:54:22 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -100,7 +100,8 @@ int sfbmmap __P((void *, off_t, int));
static int sfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void sfb_free_screen __P((void *, void *));
static void sfb_show_screen __P((void *, void *));
static int sfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
void sfb_blank __P((struct sfb_devconfig *));
void sfb_unblank __P((struct sfb_devconfig *));
@ -477,11 +478,16 @@ sfb_free_screen(v, cookie)
sc->nscreens--;
}
void
sfb_show_screen(v, cookie)
int
sfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: pfb.c,v 1.4 1999/06/22 02:04:07 sakamoto Exp $ */
/* $NetBSD: pfb.c,v 1.5 1999/12/06 19:25:57 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -94,7 +94,8 @@ static int pfb_mmap __P((void *, off_t, int));
static int pfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void pfb_free_screen __P((void *, void *));
static void pfb_show_screen __P((void *, void *));
static int pfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
struct wsdisplay_accessops pfb_accessops = {
pfb_ioctl,
@ -271,11 +272,16 @@ pfb_free_screen(v, cookie)
sc->nscreens--;
}
void
pfb_show_screen(v, cookie)
int
pfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.8 1999/11/25 16:40:19 ad Exp $ */
/* $NetBSD: fb.c,v 1.9 1999/12/06 19:25:58 drochner Exp $ */
/*-
* Copyright (c) 1999
@ -67,7 +67,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$Id: fb.c,v 1.8 1999/11/25 16:40:19 ad Exp $";
"$Id: fb.c,v 1.9 1999/12/06 19:25:58 drochner Exp $";
#include <sys/param.h>
@ -118,7 +118,8 @@ static int fb_getdevconfig __P((struct fb_devconfig *dc));
static int fb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void fb_free_screen __P((void *, void *));
static void fb_show_screen __P((void *, void *));
static int fb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static int pow __P((int, int));
#if defined(USE_RASTERCONS) & defined(WSCONS_FONT_HACK)
@ -499,12 +500,16 @@ fb_free_screen(v, cookie)
sc->nscreens--;
}
void
fb_show_screen(v, cookie)
int
fb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
DPRINTF(("%s(%d): fb_show_screen()\n", __FILE__, __LINE__));
return (0);
}
#if defined(USE_RASTERCONS) & defined(WSCONS_FONT_HACK)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ofb.c,v 1.9 1999/03/24 05:51:04 mrg Exp $ */
/* $NetBSD: ofb.c,v 1.10 1999/12/06 19:25:58 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -93,7 +93,8 @@ static int ofb_mmap __P((void *, off_t, int));
static int ofb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void ofb_free_screen __P((void *, void *));
static void ofb_show_screen __P((void *, void *));
static int ofb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
struct wsdisplay_accessops ofb_accessops = {
ofb_ioctl,
@ -353,11 +354,16 @@ ofb_free_screen(v, cookie)
sc->nscreens--;
}
void
ofb_show_screen(v, cookie)
int
ofb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: nextdisplay.c,v 1.2 1999/03/24 23:15:52 dbj Exp $ */
/* $NetBSD: nextdisplay.c,v 1.3 1999/12/06 19:25:58 drochner Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@ -107,7 +107,8 @@ static int nextdisplay_mmap __P((void *, off_t, int));
static int nextdisplay_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void nextdisplay_free_screen __P((void *, void *));
static void nextdisplay_show_screen __P((void *, void *));
static int nextdisplay_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static int nextdisplay_load_font __P((void *, void *, struct wsdisplay_font *));
const struct wsdisplay_accessops nextdisplay_accessops = {
@ -359,11 +360,16 @@ nextdisplay_free_screen(v, cookie)
sc->nscreens--;
}
void
nextdisplay_show_screen(v, cookie)
int
nextdisplay_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
static int

View File

@ -1,4 +1,4 @@
/* $NetBSD: smg.c,v 1.18 1999/10/27 16:40:47 ragge Exp $ */
/* $NetBSD: smg.c,v 1.19 1999/12/06 19:25:57 drochner Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -117,7 +117,8 @@ static int smg_mmap __P((void *, off_t, int));
static int smg_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void smg_free_screen __P((void *, void *));
static void smg_show_screen __P((void *, void *));
static int smg_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static void smg_crsr_blink __P((void *));
const struct wsdisplay_accessops smg_accessops = {
@ -432,16 +433,19 @@ smg_free_screen(v, cookie)
{
}
void
smg_show_screen(v, cookie)
int
smg_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
struct smg_screen *ss = cookie;
int row, col, line;
if (ss == curscr)
return;
return (0);
for (row = 0; row < SM_ROWS; row++)
for (line = 0; line < SM_CHEIGHT; line++) {
@ -461,6 +465,7 @@ smg_show_screen(v, cookie)
cursor = &sm_addr[(ss->ss_cury * SM_CHEIGHT * SM_COLS) + ss->ss_curx +
((SM_CHEIGHT - 1) * SM_COLS)];
curscr = ss;
return (0);
}
cons_decl(smg);

View File

@ -1,4 +1,4 @@
/* $NetBSD: pcdisplay.c,v 1.6 1999/01/11 21:35:54 drochner Exp $ */
/* $NetBSD: pcdisplay.c,v 1.7 1999/12/06 19:25:59 drochner Exp $ */
/*
* Copyright (c) 1998
@ -112,7 +112,8 @@ static int pcdisplay_mmap __P((void *, off_t, int));
static int pcdisplay_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void pcdisplay_free_screen __P((void *, void *));
static void pcdisplay_show_screen __P((void *, void *));
static int pcdisplay_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
const struct wsdisplay_accessops pcdisplay_accessops = {
pcdisplay_ioctl,
@ -386,10 +387,13 @@ pcdisplay_free_screen(v, cookie)
sc->nscreens--;
}
static void
pcdisplay_show_screen(v, cookie)
static int
pcdisplay_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
#ifdef DIAGNOSTIC
struct pcdisplay_softc *sc = v;
@ -397,6 +401,7 @@ pcdisplay_show_screen(v, cookie)
if (cookie != sc->sc_dc)
panic("pcdisplay_show_screen: bad screen");
#endif
return (0);
}
static int

View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.14 1999/04/28 23:24:33 ross Exp $ */
/* $NetBSD: tga.c,v 1.15 1999/12/06 19:25:59 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -79,7 +79,8 @@ static void tga_copycols __P((void *, int, int, int, int));
static int tga_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void tga_free_screen __P((void *, void *));
static void tga_show_screen __P((void *, void *));
static int tga_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static int tga_rop __P((struct raster *, int, int, int, int, int,
struct raster *, int, int));
static int tga_rop_nosrc __P((struct raster *, int, int, int, int, int));
@ -480,11 +481,16 @@ tga_free_screen(v, cookie)
sc->nscreens--;
}
void
tga_show_screen(v, cookie)
int
tga_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.14 1999/11/29 07:50:54 nisimura Exp $ */
/* $NetBSD: cfb.c,v 1.15 1999/12/06 19:26:00 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.14 1999/11/29 07:50:54 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.15 1999/12/06 19:26:00 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -202,7 +202,8 @@ static int cfbmmap __P((void *, off_t, int));
static int cfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void cfb_free_screen __P((void *, void *));
static void cfb_show_screen __P((void *, void *));
static int cfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static const struct wsdisplay_accessops cfb_accessops = {
cfbioctl,
@ -486,11 +487,16 @@ cfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
static int
cfb_show_screen(v, cookie)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
/* EXPORT */ int

View File

@ -1,4 +1,4 @@
/* $NetBSD: mfb.c,v 1.19 1999/11/29 07:50:55 nisimura Exp $ */
/* $NetBSD: mfb.c,v 1.20 1999/12/06 19:26:00 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.19 1999/11/29 07:50:55 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.20 1999/12/06 19:26:00 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -181,7 +181,8 @@ static int mfbmmap __P((void *, off_t, int));
static int mfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void mfb_free_screen __P((void *, void *));
static void mfb_show_screen __P((void *, void *));
static int mfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static const struct wsdisplay_accessops mfb_accessops = {
mfbioctl,
@ -458,11 +459,16 @@ mfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
mfb_show_screen(v, cookie)
static int
mfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
/* EXPORT */ int

View File

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.29 1999/12/04 14:01:56 drochner Exp $ */
/* $NetBSD: sfb.c,v 1.30 1999/12/06 19:26:00 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.29 1999/12/04 14:01:56 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.30 1999/12/06 19:26:00 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -194,7 +194,8 @@ static int sfbmmap __P((void *, off_t, int));
static int sfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void sfb_free_screen __P((void *, void *));
static void sfb_show_screen __P((void *, void *));
static int sfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static const struct wsdisplay_accessops sfb_accessops = {
sfbioctl,
@ -506,11 +507,16 @@ sfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
sfb_show_screen(v, cookie)
static int
sfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
/* EXPORT */ int

View File

@ -1,4 +1,4 @@
/* $NetBSD: sfbplus.c,v 1.1 1999/12/03 09:50:53 nisimura Exp $ */
/* $NetBSD: sfbplus.c,v 1.2 1999/12/06 19:26:01 drochner Exp $ */
/*
* Copyright (c) 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.1 1999/12/03 09:50:53 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.2 1999/12/06 19:26:01 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -176,7 +176,8 @@ static int sfbmmap __P((void *, off_t, int));
static int sfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void sfb_free_screen __P((void *, void *));
static void sfb_show_screen __P((void *, void *));
static int sfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
/* EXPORT */ int sfb_alloc_attr __P((void *, int, int, int, long *));
static const struct wsdisplay_accessops sfb_accessops = {
@ -528,11 +529,16 @@ sfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
sfb_show_screen(v, cookie)
static int
sfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: tfb.c,v 1.20 1999/11/29 07:50:55 nisimura Exp $ */
/* $NetBSD: tfb.c,v 1.21 1999/12/06 19:26:01 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.20 1999/11/29 07:50:55 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.21 1999/12/06 19:26:01 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -258,7 +258,8 @@ static int tfbmmap __P((void *, off_t, int));
static int tfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void tfb_free_screen __P((void *, void *));
static void tfb_show_screen __P((void *, void *));
static int tfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static const struct wsdisplay_accessops tfb_accessops = {
tfbioctl,
@ -541,11 +542,16 @@ tfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
tfb_show_screen(v, cookie)
static int
tfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
/* EXPORT */ int

View File

@ -1,4 +1,4 @@
/* $NetBSD: xcfb.c,v 1.13 1999/11/29 07:50:55 nisimura Exp $ */
/* $NetBSD: xcfb.c,v 1.14 1999/12/06 19:25:59 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.13 1999/11/29 07:50:55 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.14 1999/12/06 19:25:59 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -153,7 +153,8 @@ static int xcfbmmap __P((void *, off_t, int));
static int xcfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void xcfb_free_screen __P((void *, void *));
static void xcfb_show_screen __P((void *, void *));
static int xcfb_show_screen __P((void *, void *, int,
void (*) (void *, int, int), void *));
static const struct wsdisplay_accessops xcfb_accessops = {
xcfbioctl,
@ -514,11 +515,16 @@ xcfb_free_screen(v, cookie)
sc->nscreens--;
}
static void
xcfb_show_screen(v, cookie)
static int
xcfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
void (*cb) __P((void *, int, int));
void *cbarg;
{
return (0);
}
static int