Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an extra cookie to the ioctl and mmap wsdisplay accessops that points

Browse Source 
to the screen on which they are being called.  The driver cannot guess
this by itself but it is needed to implement, at least, the getwschar and
putwschar functions in the correct place.  There are no functional changes
yet.

Tested on i386 (vga, vga_raster, machfb, vesafb), macppc and sparc64.
Suggested and reviewed by macallan@.
This commit is contained in:
jmmv 2006-04-12 19:38:22 +00:00
parent 76264cfc6a
commit 7a51d4dddc
47 changed files with 312 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/acorn26/vidc/arcvideo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arcvideo.c,v 1.9 2005/12/11 12:16:05 christos Exp $ */
/* $NetBSD: arcvideo.c,v 1.10 2006/04/12 19:38:22 jmmv Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.9 2005/12/11 12:16:05 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.10 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -72,9 +72,9 @@ static int arcvideo_setmode(struct device *self, struct arcvideo_mode *mode);
static void arcvideo_await_vsync(struct device *self);
#endif
static int arcvideo_intr(void *cookie);
static int arcvideo_ioctl(void *cookie, u_long cmd, caddr_t data,
static int arcvideo_ioctl(void *cookie, void *vs, u_long cmd, caddr_t data,
int flag, struct lwp *l);
static paddr_t arcvideo_mmap(void *cookie, off_t off, int prot);
static paddr_t arcvideo_mmap(void *cookie, void *vs, off_t off, int prot);
static int arcvideo_alloc_screen(void *cookie, const struct wsscreen_descr *scr,
void **scookiep, int *curxp, int *curyp,
long *defattrp);
@ -392,7 +392,7 @@ arccons_8bpp_hack(struct rasops_info *ri)
/* wsdisplay access functions */
static int
arcvideo_ioctl(void *cookie, u_long cmd, caddr_t data, int flag,
arcvideo_ioctl(void *cookie, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct arcvideo_softc *sc = cookie;
@ -426,7 +426,7 @@ arcvideo_ioctl(void *cookie, u_long cmd, caddr_t data, int flag,
}
static paddr_t
arcvideo_mmap(void *cookie, off_t off, int prot)
arcvideo_mmap(void *cookie, void *vs, off_t off, int prot)
{
return ENODEV;

13
sys/arch/amiga/dev/amidisplaycc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amidisplaycc.c,v 1.18 2005/12/11 12:16:28 christos Exp $ */
/* $NetBSD: amidisplaycc.c,v 1.19 2006/04/12 19:38:22 jmmv Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.18 2005/12/11 12:16:28 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.19 2006/04/12 19:38:22 jmmv Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@ -143,8 +143,8 @@ int amidisplaycc_allocattr(void *, int, int, int, long *);
/* accessops for wscons */
int amidisplaycc_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t amidisplaycc_mmap(void *, off_t, int);
int amidisplaycc_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t amidisplaycc_mmap(void *, void *, off_t, int);
int amidisplaycc_alloc_screen(void *, const struct wsscreen_descr *, void **,
int *, int *, long *);
void amidisplaycc_free_screen( void *, void *);
@ -1021,7 +1021,8 @@ amidisplaycc_allocattr(void *screen, int fg, int bg, int flags, long *attrp)
}
int
amidisplaycc_ioctl(void *dp, u_long cmd, caddr_t data, int flag, struct lwp *l)
amidisplaycc_ioctl(void *dp, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct amidisplaycc_softc *adp;
@ -1158,7 +1159,7 @@ amidisplaycc_gfxscreen(struct amidisplaycc_softc *adp, int on)
* by switching to mapped mode by using an ioctl.
*/
paddr_t
amidisplaycc_mmap(void *dp, off_t off, int prot)
amidisplaycc_mmap(void *dp, void *vs, off_t off, int prot)
{
struct amidisplaycc_softc * adp;
bmap_t * bm;

15
sys/arch/arm/iomd/vidcvideo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vidcvideo.c,v 1.21 2005/12/11 12:16:47 christos Exp $ */
/* $NetBSD: vidcvideo.c,v 1.22 2006/04/12 19:38:22 jmmv Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@ -36,7 +36,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.21 2005/12/11 12:16:47 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.22 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -165,8 +165,9 @@ static const struct wsscreen_list vidcvideo_screenlist = {
sizeof(_vidcvideo_scrlist) / sizeof(struct wsscreen_descr *), _vidcvideo_scrlist
};
static int vidcvideoioctl __P((void *, u_long, caddr_t, int, struct lwp *));
static paddr_t vidcvideommap __P((void *, off_t, int));
static int vidcvideoioctl __P((void *, void *, u_long, caddr_t, int,
struct lwp *));
static paddr_t vidcvideommap __P((void *, void *, off_t, int));
static int vidcvideo_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
@ -409,8 +410,9 @@ vidcvideo_attach(parent, self, aux)
static int
vidcvideoioctl(v, cmd, data, flag, l)
vidcvideoioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -489,8 +491,9 @@ vidcvideoioctl(v, cmd, data, flag, l)
paddr_t
vidcvideommap(v, offset, prot)
vidcvideommap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

9
sys/arch/arm/xscale/pxa2x0_lcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pxa2x0_lcd.c,v 1.12 2006/04/10 03:36:03 simonb Exp $ */
/* $NetBSD: pxa2x0_lcd.c,v 1.13 2006/04/12 19:38:22 jmmv Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.12 2006/04/10 03:36:03 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.13 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -612,7 +612,8 @@ pxa2x0_lcd_free_screen(void *v, void *cookie)
}
int
pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
pxa2x0_lcd_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct pxa2x0_lcd_softc *sc = v;
struct wsdisplay_fbinfo *wsdisp_info;
@ -666,7 +667,7 @@ pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
pxa2x0_lcd_mmap(void *v, off_t offset, int prot)
pxa2x0_lcd_mmap(void *v, void *vs, off_t offset, int prot)
{
struct pxa2x0_lcd_softc *sc = v;
struct pxa2x0_lcd_screen *screen = sc->active; /* ??? */

6
sys/arch/arm/xscale/pxa2x0_lcd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pxa2x0_lcd.h,v 1.3 2005/12/11 12:16:52 christos Exp $ */
/* $NetBSD: pxa2x0_lcd.h,v 1.4 2006/04/12 19:38:22 jmmv Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@ -138,8 +138,8 @@ int pxa2x0_lcd_setup_wsscreen(struct pxa2x0_wsscreen_descr *,
const struct lcd_panel_geometry *, const char * );
int pxa2x0_lcd_show_screen(void *, void *, int, void (*)(void *, int, int), void *);
int pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l);
paddr_t pxa2x0_lcd_mmap(void *, off_t, int);
int pxa2x0_lcd_ioctl(void *v, void *, u_long cmd, caddr_t data, int flag, struct lwp *l);
paddr_t pxa2x0_lcd_mmap(void *, void *, off_t, int);
int pxa2x0_lcd_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
void pxa2x0_lcd_free_screen(void *, void *);

14
sys/arch/bebox/pci/pfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pfb.c,v 1.13 2005/12/11 12:17:04 christos Exp $ */
/* $NetBSD: pfb.c,v 1.14 2006/04/12 19:38:22 jmmv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pfb.c,v 1.13 2005/12/11 12:17:04 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pfb.c,v 1.14 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -92,8 +92,8 @@ struct wsscreen_list pfb_screenlist = {
sizeof(_pfb_scrlist) / sizeof(struct wsscreen_descr *), _pfb_scrlist
};
static int pfb_ioctl __P((void *, u_long, caddr_t, int, struct lwp *));
static paddr_t pfb_mmap __P((void *, off_t, int));
static int pfb_ioctl __P((void *, void *, u_long, caddr_t, int, struct lwp *));
static paddr_t pfb_mmap __P((void *, 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 *));
@ -196,8 +196,9 @@ pfb_common_init(addr, dc)
}
int
pfb_ioctl(v, cmd, data, flag, l)
pfb_ioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -224,8 +225,9 @@ pfb_ioctl(v, cmd, data, flag, l)
}
paddr_t
pfb_mmap(v, offset, prot)
pfb_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

12
sys/arch/dreamcast/dev/pvr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pvr.c,v 1.21 2005/12/24 20:06:58 perry Exp $ */
/* $NetBSD: pvr.c,v 1.22 2006/04/12 19:38:22 jmmv Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.21 2005/12/24 20:06:58 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.22 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -212,8 +212,8 @@ const struct wsscreen_list pvr_screenlist = {
sizeof(_pvr_scrlist) / sizeof(struct wsscreen_descr *), _pvr_scrlist
};
int pvrioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t pvrmmap(void *, off_t, int);
int pvrioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t pvrmmap(void *, void *, off_t, int);
int pvr_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -340,7 +340,7 @@ pvr_attach(struct device *parent, struct device *self, void *aux)
}
int
pvrioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
pvrioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pvr_softc *sc = v;
struct fb_devconfig *dc = sc->sc_dc;
@ -403,7 +403,7 @@ pvrioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
pvrmmap(void *v, off_t offset, int prot)
pvrmmap(void *v, void *vs, off_t offset, int prot)
{
/*

6
sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: g42xxeb_lcd.c,v 1.4 2006/03/08 23:46:23 lukem Exp $ */
/* $NetBSD: g42xxeb_lcd.c,v 1.5 2006/04/12 19:38:22 jmmv Exp $ */
/*-
* Copyright (c) 2001, 2002, 2005 Genetec corp.
@ -103,7 +103,7 @@ const struct wsscreen_list lcd_screen_list = {
lcd_scr_descr
};
int lcd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
int lcd_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
int lcd_show_screen(void *, void *, int,
void (*)(void *, int, int), void *);
@ -240,7 +240,7 @@ void lcd_attach( struct device *parent, struct device *self, void *aux )
#if NWSDISPLAY > 0
int
lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
lcd_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct obio_softc *osc =
(struct obio_softc *) device_parent((struct device *)v);

8
sys/arch/evbarm/lubbock/lubbock_lcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lubbock_lcd.c,v 1.3 2006/02/23 05:37:47 thorpej Exp $ */
/* $NetBSD: lubbock_lcd.c,v 1.4 2006/04/12 19:38:22 jmmv Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@ -40,7 +40,7 @@
* LCD panel geometry
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.3 2006/02/23 05:37:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.4 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -113,7 +113,7 @@ const struct wsscreen_list lcd_screen_list = {
lcd_scr_descr
};
int lcd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
int lcd_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
int lcd_show_screen(void *, void *, int,
void (*)(void *, int, int), void *);
@ -215,7 +215,7 @@ void lcd_attach( struct device *parent, struct device *self, void *aux )
#if NWSDISPLAY > 0
int
lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
lcd_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct obio_softc *osc =
(struct obio_softc *) device_parent((struct device *)v);

12
sys/arch/ews4800mips/sbd/fb_sbdio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fb_sbdio.c,v 1.1 2005/12/29 15:20:09 tsutsui Exp $ */
/* $NetBSD: fb_sbdio.c,v 1.2 2006/04/12 19:38:22 jmmv Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#define WIRED_FB_TLB
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.1 2005/12/29 15:20:09 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.2 2006/04/12 19:38:22 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -78,8 +78,8 @@ void fb_sbdio_attach(struct device *, struct device *, void *);
CFATTACH_DECL(fb_sbdio, sizeof(struct fb_softc),
fb_sbdio_match, fb_sbdio_attach, NULL, NULL);
int _fb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t _fb_mmap(void *, off_t, int);
int _fb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t _fb_mmap(void *, void *, off_t, int);
int _fb_alloc_screen(void *, const struct wsscreen_descr *, void **,
int *, int *, long *);
void _fb_free_screen(void *, void *);
@ -276,7 +276,7 @@ fb_sbdio_cnattach(uint32_t mem, uint32_t reg, int flags)
}
int
_fb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
_fb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct fb_softc *sc = v;
struct wsdisplay_fbinfo *fbinfo = (void *)data;
@ -330,7 +330,7 @@ _fb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
_fb_mmap(void *v, off_t offset, int prot)
_fb_mmap(void *v, void *vs, off_t offset, int prot)
{
if (offset < 0 || offset >= GA_FRB_SIZE)

14
sys/arch/i386/bios/vesafb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vesafb.c,v 1.12 2006/04/11 14:18:01 jmcneill Exp $ */
/* $NetBSD: vesafb.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
@ -35,7 +35,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vesafb.c,v 1.12 2006/04/11 14:18:01 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: vesafb.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -70,8 +70,9 @@ struct wsscreen_descr vesafb_stdscreen = {
8, 16,
};
static int vesafb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vesafb_mmap(void *, off_t, int);
static int vesafb_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t vesafb_mmap(void *, void *, off_t, int);
static void vesafb_init_screen(void *, struct vcons_screen *,
int, long *);
@ -312,7 +313,8 @@ out:
}
static int
vesafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
vesafb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vcons_data *vd;
struct vesafb_softc *sc;
@ -396,7 +398,7 @@ vesafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
vesafb_mmap(void *v, off_t offset, int prot)
vesafb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd;
struct vesafb_softc *sc;

15
sys/arch/luna68k/dev/lunafb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lunafb.c,v 1.13 2005/12/11 12:17:52 christos Exp $ */
/* $NetBSD: lunafb.c,v 1.14 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.13 2005/12/11 12:17:52 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.14 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -134,8 +134,9 @@ static const struct wsscreen_list omfb_screenlist = {
sizeof(_omfb_scrlist) / sizeof(struct wsscreen_descr *), _omfb_scrlist
};
static int omfbioctl __P((void *, u_long, caddr_t, int, struct lwp *));
static paddr_t omfbmmap __P((void *, off_t, int));
static int omfbioctl __P((void *, void *, u_long, caddr_t, int,
struct lwp *));
static paddr_t omfbmmap __P((void *, void *, off_t, int));
static int omfb_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
static void omfb_free_screen __P((void *, void *));
@ -230,8 +231,9 @@ omfb_cnattach()
}
static int
omfbioctl(v, cmd, data, flag, l)
omfbioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -277,8 +279,9 @@ omfbioctl(v, cmd, data, flag, l)
* offset, allowing for the given protection, or return -1 for error.
*/
static paddr_t
omfbmmap(v, offset, prot)
omfbmmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

13
sys/arch/mac68k/dev/macfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: macfb.c,v 1.13 2006/03/28 17:38:25 thorpej Exp $ */
/* $NetBSD: macfb.c,v 1.14 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: macfb.c,v 1.13 2006/03/28 17:38:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: macfb.c,v 1.14 2006/04/12 19:38:23 jmmv Exp $");
#include "opt_wsdisplay_compat.h"
#include "grf.h"
@ -90,8 +90,8 @@ const struct wsscreen_list macfb_screenlist = {
_macfb_scrlist
};
static int macfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t macfb_mmap(void *, off_t, int);
static int macfb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t macfb_mmap(void *, void *, off_t, int);
static int macfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void macfb_free_screen(void *, void *);
@ -246,7 +246,8 @@ macfb_attach(struct device *parent, struct device *self, void *aux)
int
macfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
macfb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct macfb_softc *sc = v;
struct macfb_devconfig *dc = sc->sc_dc;
@ -282,7 +283,7 @@ macfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
macfb_mmap(void *v, off_t offset, int prot)
macfb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct macfb_softc *sc = v;
struct macfb_devconfig *dc = sc->sc_dc;

12
sys/arch/macppc/dev/ofb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofb.c,v 1.47 2006/02/16 18:48:38 macallan Exp $ */
/* $NetBSD: ofb.c,v 1.48 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.47 2006/02/16 18:48:38 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.48 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -92,8 +92,8 @@ struct wsscreen_list ofb_screenlist = {
sizeof(_ofb_scrlist) / sizeof(struct wsscreen_descr *), _ofb_scrlist
};
static int ofb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t ofb_mmap(void *, off_t, int);
static int ofb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t ofb_mmap(void *, void *, off_t, int);
static int copy_rom_font(void);
static int ofb_init_rasops(int, struct rasops_info *);
@ -343,7 +343,7 @@ ofb_is_console()
}
static int
ofb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
ofb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vcons_data *vd = v;
struct ofb_softc *sc = vd->cookie;
@ -408,7 +408,7 @@ ofb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
ofb_mmap(void *v, off_t offset, int prot)
ofb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd = v;
struct ofb_softc *sc = vd->cookie;

12
sys/arch/newsmips/apbus/xafb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xafb.c,v 1.12 2005/12/24 20:07:24 perry Exp $ */
/* $NetBSD: xafb.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@ -29,7 +29,7 @@
/* "xa" frame buffer driver. Currently supports 1280x1024x8 only. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.12 2005/12/24 20:07:24 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -82,8 +82,8 @@ void xafb_attach(struct device *, struct device *, void *);
int xafb_common_init(struct xafb_devconfig *);
int xafb_is_console(void);
int xafb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t xafb_mmap(void *, off_t, int);
int xafb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t xafb_mmap(void *, void *, off_t, int);
int xafb_alloc_screen(void *, const struct wsscreen_descr *, void **, int *,
int *, long *);
void xafb_free_screen(void *, void *);
@ -241,7 +241,7 @@ xafb_is_console(void)
}
int
xafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
xafb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct xafb_softc *sc = v;
struct xafb_devconfig *dc = sc->sc_dc;
@ -275,7 +275,7 @@ xafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
xafb_mmap(void *v, off_t offset, int prot)
xafb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct xafb_softc *sc = v;
struct xafb_devconfig *dc = sc->sc_dc;

12
sys/arch/newsmips/dev/fb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.21 2005/12/11 12:18:24 christos Exp $ */
/* $NetBSD: fb.c,v 1.22 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.21 2005/12/11 12:18:24 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.22 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -62,8 +62,8 @@ void fb_attach(struct device *, struct device *, void *);
int fb_common_init(struct fb_devconfig *);
int fb_is_console(void);
int fb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t fb_mmap(void *, off_t, int);
int fb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t fb_mmap(void *, void *, off_t, int);
int fb_alloc_screen(void *, const struct wsscreen_descr *, void **, int *,
int *, long *);
void fb_free_screen(void *, void *);
@ -231,7 +231,7 @@ fb_is_console(void)
}
int
fb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
fb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct fb_softc *sc = v;
struct fb_devconfig *dc = sc->sc_dc;
@ -266,7 +266,7 @@ fb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
fb_mmap(void *v, off_t offset, int prot)
fb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct fb_softc *sc = v;
struct fb_devconfig *dc = sc->sc_dc;

14
sys/arch/next68k/dev/nextdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nextdisplay.c,v 1.18 2005/12/11 12:18:25 christos Exp $ */
/* $NetBSD: nextdisplay.c,v 1.19 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.18 2005/12/11 12:18:25 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.19 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@ -106,8 +106,9 @@ const struct wsscreen_list nextdisplay_screenlist_color = {
_nextdisplay_scrlist_color
};
static int nextdisplay_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t nextdisplay_mmap(void *, off_t, int);
static int nextdisplay_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t nextdisplay_mmap(void *, void *, off_t, int);
static int nextdisplay_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void nextdisplay_free_screen(void *, void *);
@ -297,7 +298,8 @@ nextdisplay_intr(void *arg)
}
int
nextdisplay_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
nextdisplay_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct nextdisplay_softc *sc = v;
struct nextdisplay_config *dc = sc->sc_dc;
@ -331,7 +333,7 @@ nextdisplay_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
nextdisplay_mmap(void *v, off_t offset, int prot)
nextdisplay_mmap(void *v, void *vs, off_t offset, int prot)
{
/* XXX */

13
sys/arch/playstation2/ee/gsfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gsfb.c,v 1.15 2006/02/04 14:54:56 christos Exp $ */
/* $NetBSD: gsfb.c,v 1.16 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gsfb.c,v 1.15 2006/02/04 14:54:56 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: gsfb.c,v 1.16 2006/04/12 19:38:23 jmmv Exp $");
#include "debug_playstation2.h"
@ -208,8 +208,8 @@ STATIC void _gsfb_eraserows(void *, int, int, long);
STATIC int _gsfb_allocattr(void *, int, int, int, long *);
/* access ops */
STATIC int _gsfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
STATIC paddr_t _gsfb_mmap(void *, off_t, int);
STATIC int _gsfb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
STATIC paddr_t _gsfb_mmap(void *, void *, off_t, int);
STATIC int _gsfb_alloc_screen(void *, const struct wsscreen_descr *, void **,
int *, int *, long *);
STATIC void _gsfb_free_screen(void *, void *);
@ -529,14 +529,15 @@ _gsfb_allocattr(void *cookie, int fg, int bg, int flags, long *attr)
}
int
_gsfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
_gsfb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
return (EPASSTHROUGH); /* Inappropriate ioctl for device */
}
paddr_t
_gsfb_mmap(void *v, off_t offset, int prot)
_gsfb_mmap(void *v, void *vs, off_t offset, int prot)
{
return (-1); /* can't mmap */

12
sys/arch/pmax/ibus/pm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pm.c,v 1.3 2005/12/11 12:18:36 christos Exp $ */
/* $NetBSD: pm.c,v 1.4 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.3 2005/12/11 12:18:36 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.4 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -128,8 +128,8 @@ struct pm_softc {
int pm_match(struct device *, struct cfdata *, void *);
void pm_attach(struct device *, struct device *, void *);
int pm_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t pm_mmap(void *, off_t, int);
int pm_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t pm_mmap(void *, void *, off_t, int);
int pm_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
void pm_free_screen(void *, void *);
@ -408,7 +408,7 @@ pm_cursor_on(struct pm_softc *sc)
}
int
pm_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
pm_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pm_softc *sc;
struct rasops_info *ri;
@ -516,7 +516,7 @@ pm_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
pm_mmap(void *v, off_t offset, int prot)
pm_mmap(void *v, void *vs, off_t offset, int prot)
{
struct pm_softc *sc;

14
sys/arch/prep/pci/gten.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gten.c,v 1.12 2005/12/11 12:18:47 christos Exp $ */
/* $NetBSD: gten.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.12 2005/12/11 12:18:47 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.13 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -88,8 +88,8 @@ static struct wsscreen_list gten_screenlist = {
sizeof(_gten_scrlist) / sizeof(struct wsscreen_descr *), _gten_scrlist
};
static int gten_ioctl (void *, u_long, caddr_t, int, struct proc *);
static paddr_t gten_mmap (void *, off_t, int);
static int gten_ioctl (void *, void *, u_long, caddr_t, int, struct proc *);
static paddr_t gten_mmap (void *, void *, off_t, int);
static int gten_alloc_screen (void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void gten_free_screen (void *, void *);
@ -248,8 +248,9 @@ gten_common_init(struct rasops_info *ri)
}
static int
gten_ioctl(v, cmd, data, flag, p)
gten_ioctl(v, vs, cmd, data, flag, p)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -282,8 +283,9 @@ gten_ioctl(v, cmd, data, flag, p)
}
static paddr_t
gten_mmap(v, offset, prot)
gten_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

13
sys/arch/sgimips/gio/grtwo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grtwo.c,v 1.6 2005/12/11 12:18:53 christos Exp $ */
/* $NetBSD: grtwo.c,v 1.7 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2004 Christopher SEKIYA
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.6 2005/12/11 12:18:53 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.7 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -99,8 +99,8 @@ static void grtwo_eraserows(void *, int, int, long);
static int grtwo_allocattr(void *, int, int, int, long *);
/* accessops */
static int grtwo_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t grtwo_mmap(void *, off_t, int);
static int grtwo_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t grtwo_mmap(void *, void *, off_t, int);
static int
grtwo_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -720,7 +720,8 @@ grtwo_allocattr(void *c, int fg, int bg, int flags, long *attr)
/* wsdisplay accessops */
static int
grtwo_ioctl(void *c, u_long cmd, caddr_t data, int flag, struct lwp *l)
grtwo_ioctl(void *c, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct grtwo_softc *sc = c;
@ -741,7 +742,7 @@ grtwo_ioctl(void *c, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
grtwo_mmap(void *c, off_t offset, int prot)
grtwo_mmap(void *c, void *vs, off_t offset, int prot)
{
struct grtwo_devconfig *dc = c;

14
sys/arch/sgimips/gio/newport.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newport.c,v 1.6 2005/12/11 12:18:53 christos Exp $ */
/* $NetBSD: newport.c,v 1.7 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.6 2005/12/11 12:18:53 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.7 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -87,8 +87,9 @@ static void newport_eraserows(void *, int, int, long);
static int newport_allocattr(void *, int, int, int, long *);
/* accessops */
static int newport_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t newport_mmap(void *, off_t, int);
static int newport_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t newport_mmap(void *, void *, off_t, int);
static int newport_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void newport_free_screen(void *, void *);
@ -854,7 +855,8 @@ newport_allocattr(void *c, int fg, int bg, int flags, long *attr)
/**** wsdisplay accessops ****/
static int
newport_ioctl(void *c, u_long cmd, caddr_t data, int flag, struct lwp *l)
newport_ioctl(void *c, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct newport_softc *sc = c;
@ -875,7 +877,7 @@ newport_ioctl(void *c, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
newport_mmap(void *c, off_t offset, int prot)
newport_mmap(void *c, void *vs, off_t offset, int prot)
{
struct newport_devconfig *dc = c;

12
sys/arch/sparc64/dev/ffb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffb.c,v 1.23 2006/03/29 04:16:47 thorpej Exp $ */
/* $NetBSD: ffb.c,v 1.24 2006/04/12 19:38:23 jmmv Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.23 2006/03/29 04:16:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.24 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -86,9 +86,9 @@ struct wsscreen_list ffb_screenlist = {
static struct ffb_screen ffb_console_screen;
int ffb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
int ffb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static int ffb_blank(struct ffb_softc *, u_long, u_int *);
paddr_t ffb_mmap(void *, off_t, int);
paddr_t ffb_mmap(void *, void *, off_t, int);
void ffb_ras_fifo_wait(struct ffb_softc *, int);
void ffb_ras_wait(struct ffb_softc *);
void ffb_ras_init(struct ffb_softc *);
@ -238,7 +238,7 @@ ffb_attach(struct ffb_softc *sc)
}
int
ffb_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct lwp *l)
ffb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct ffb_softc *sc = v;
struct wsdisplay_fbinfo *wdf;
@ -378,7 +378,7 @@ ffb_blank(struct ffb_softc *sc, u_long cmd, u_int *data)
}
paddr_t
ffb_mmap(void *vsc, off_t off, int prot)
ffb_mmap(void *vsc, void *vs, off_t off, int prot)
{
struct ffb_softc *sc = vsc;
int i;

13
sys/arch/vax/vsa/lcspx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lcspx.c,v 1.4 2005/12/11 12:19:37 christos Exp $ */
/* $NetBSD: lcspx.c,v 1.5 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lcspx.c,v 1.4 2005/12/11 12:19:37 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: lcspx.c,v 1.5 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -131,8 +131,8 @@ static u_char *qf;
line * SPX_XWIDTH + dot]
static int lcspx_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t lcspx_mmap(void *, off_t, int);
static int lcspx_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t lcspx_mmap(void *, void *, off_t, int);
static int lcspx_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void lcspx_free_screen(void *, void *);
@ -367,7 +367,8 @@ lcspx_allocattr(void *id, int fg, int bg, int flags, long *attrp)
}
int
lcspx_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
lcspx_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct wsdisplay_fbinfo *fb = (void *)data;
@ -408,7 +409,7 @@ lcspx_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
lcspx_mmap(void *v, off_t offset, int prot)
lcspx_mmap(void *v, void *vs, off_t offset, int prot)
{
if (offset >= SPXSIZE || offset < 0)
return -1;

12
sys/arch/vax/vsa/smg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smg.c,v 1.40 2005/12/11 12:19:37 christos Exp $ */
/* $NetBSD: smg.c,v 1.41 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.40 2005/12/11 12:19:37 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.41 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -164,8 +164,8 @@ static u_char *qf;
sm_addr[col + (row * SM_CHEIGHT * SM_COLS) + line * SM_COLS]
static int smg_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t smg_mmap(void *, off_t, int);
static int smg_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t smg_mmap(void *, void *, off_t, int);
static int smg_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void smg_free_screen(void *, void *);
@ -465,7 +465,7 @@ setcursor(struct wsdisplay_cursor *v)
}
int
smg_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
smg_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct wsdisplay_fbinfo *fb = (void *)data;
static short curc;
@ -526,7 +526,7 @@ smg_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
smg_mmap(void *v, off_t offset, int prot)
smg_mmap(void *v, void *vs, off_t offset, int prot)
{
if (offset >= SMSIZE || offset < 0)
return -1;

15
sys/dev/hpc/hpcfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcfb.c,v 1.35 2006/03/29 06:37:35 thorpej Exp $ */
/* $NetBSD: hpcfb.c,v 1.36 2006/04/12 19:38:23 jmmv Exp $ */
/*-
* Copyright (c) 1999
@ -43,13 +43,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.35 2006/03/29 06:37:35 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.36 2006/04/12 19:38:23 jmmv Exp $");
#define FBDEBUG
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: hpcfb.c,v 1.35 2006/03/29 06:37:35 thorpej Exp $";
"$NetBSD: hpcfb.c,v 1.36 2006/04/12 19:38:23 jmmv Exp $";
#include <sys/param.h>
#include <sys/systm.h>
@ -182,8 +182,8 @@ int hpcfbmatch(struct device *, struct cfdata *, void *);
void hpcfbattach(struct device *, struct device *, void *);
int hpcfbprint(void *, const char *);
int hpcfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t hpcfb_mmap(void *, off_t, int);
int hpcfb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t hpcfb_mmap(void *, void *, off_t, int);
void hpcfb_refresh_screen(struct hpcfb_softc *);
void hpcfb_doswitch(struct hpcfb_softc *);
@ -550,7 +550,8 @@ hpcfb_cmap_reorder(struct hpcfb_fbconf *fbconf, struct hpcfb_devconfig *dc)
}
int
hpcfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
hpcfb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct hpcfb_softc *sc = v;
struct hpcfb_devconfig *dc = sc->sc_dc;
@ -624,7 +625,7 @@ hpcfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
hpcfb_mmap(void *v, off_t offset, int prot)
hpcfb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct hpcfb_softc *sc = v;

14
sys/dev/ic/hd44780_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd44780_subr.c,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/* $NetBSD: hd44780_subr.c,v 1.9 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.8 2005/12/11 12:21:26 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.9 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -88,8 +88,8 @@ const struct wsdisplay_emulops hlcd_emulops = {
hlcd_allocattr
};
static int hlcd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t hlcd_mmap(void *, off_t, int);
static int hlcd_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t hlcd_mmap(void *, void *, off_t, int);
static int hlcd_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void hlcd_free_screen(void *, void *);
@ -228,8 +228,9 @@ hlcd_allocattr(id, fg, bg, flags, attrp)
}
static int
hlcd_ioctl(v, cmd, data, flag, l)
hlcd_ioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -255,8 +256,9 @@ hlcd_ioctl(v, cmd, data, flag, l)
}
static paddr_t
hlcd_mmap(v, offset, prot)
hlcd_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

13
sys/dev/ic/igsfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: igsfb.c,v 1.37 2006/04/05 01:13:50 uwe Exp $ */
/* $NetBSD: igsfb.c,v 1.38 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.37 2006/04/05 01:13:50 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.38 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -81,8 +81,8 @@ static const struct wsscreen_list igsfb_screenlist = {
* wsdisplay_accessops
*/
static int igsfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t igsfb_mmap(void *, off_t, int);
static int igsfb_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t igsfb_mmap(void *, void *, off_t, int);
static struct wsdisplay_accessops igsfb_accessops = {
.ioctl = igsfb_ioctl,
@ -574,7 +574,7 @@ igsfb_init_bit_table(struct igsfb_devconfig *dc)
* XXX: allow mmapping i/o mapped i/o regs if INSECURE???
*/
static paddr_t
igsfb_mmap(void *v, off_t offset, int prot)
igsfb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd = v;
struct igsfb_devconfig *dc = vd->cookie;
@ -591,7 +591,8 @@ igsfb_mmap(void *v, off_t offset, int prot)
* wsdisplay_accessops: ioctl()
*/
static int
igsfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
igsfb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vcons_data *vd = v;
struct igsfb_devconfig *dc = vd->cookie;

12
sys/dev/ic/sti.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sti.c,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/* $NetBSD: sti.c,v 1.6 2006/04/12 19:38:23 jmmv Exp $ */
/* $OpenBSD: sti.c,v 1.35 2003/12/16 06:07:13 mickey Exp $ */
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.5 2005/12/11 12:21:28 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.6 2006/04/12 19:38:23 jmmv Exp $");
#include "wsdisplay.h"
@ -74,8 +74,8 @@ struct wsdisplay_emulops sti_emulops = {
sti_alloc_attr
};
int sti_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t sti_mmap(void *, off_t, int);
int sti_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t sti_mmap(void *, void *, off_t, int);
int sti_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
void sti_free_screen(void *, void *);
@ -582,7 +582,7 @@ sti_setcment(struct sti_softc *sc, u_int i, u_char r, u_char g, u_char b)
}
int
sti_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
sti_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct sti_softc *sc = v;
struct wsdisplay_fbinfo *wdf;
@ -683,7 +683,7 @@ sti_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
sti_mmap(void *v, off_t offset, int prot)
sti_mmap(void *v, void *vs, off_t offset, int prot)
{
/* XXX not finished */
return -1;

12
sys/dev/ic/vga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga.c,v 1.85 2006/04/05 15:19:54 drochner Exp $ */
/* $NetBSD: vga.c,v 1.86 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include "opt_wsmsgattrs.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.85 2006/04/05 15:19:54 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.86 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -266,8 +266,8 @@ const struct wsscreen_list vga_screenlist = {
_vga_scrlist_mono
};
static int vga_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_mmap(void *, off_t, int);
static int vga_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_mmap(void *, void *, off_t, int);
static int vga_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void vga_free_screen(void *, void *);
@ -768,7 +768,7 @@ vga_set_video(struct vga_config *vc, int state)
}
int
vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
vga_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@ -820,7 +820,7 @@ vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
vga_mmap(void *v, off_t offset, int prot)
vga_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;

14
sys/dev/ic/vga_raster.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_raster.c,v 1.20 2005/12/12 01:14:22 christos Exp $ */
/* $NetBSD: vga_raster.c,v 1.21 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.20 2005/12/12 01:14:22 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.21 2006/04/12 19:38:23 jmmv Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@ -301,8 +301,9 @@ const struct wsscreen_list vga_screenlist = {
_vga_scrlist_mono
};
static int vga_raster_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_raster_mmap(void *, off_t, int);
static int vga_raster_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t vga_raster_mmap(void *, void *, off_t, int);
static int vga_raster_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void vga_raster_free_screen(void *, void *);
@ -595,7 +596,8 @@ vga_set_video(struct vga_config *vc, int state)
}
int
vga_raster_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
vga_raster_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@ -643,7 +645,7 @@ vga_raster_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
vga_raster_mmap(void *v, off_t offset, int prot)
vga_raster_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;

14
sys/dev/isa/ega.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ega.c,v 1.19 2005/12/11 12:22:02 christos Exp $ */
/* $NetBSD: ega.c,v 1.20 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1999
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.19 2005/12/11 12:22:02 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.20 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -210,8 +210,8 @@ const struct wsscreen_list ega_screenlist = {
_ega_scrlist_mono
};
static int ega_ioctl(void *, u_long, caddr_t, int, struct proc *);
static paddr_t ega_mmap(void *, off_t, int);
static int ega_ioctl(void *, void *, u_long, caddr_t, int, struct proc *);
static paddr_t ega_mmap(void *, void *, off_t, int);
static int ega_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void ega_free_screen(void *, void *);
@ -585,8 +585,9 @@ ega_is_console(iot)
}
static int
ega_ioctl(v, cmd, data, flag, p)
ega_ioctl(v, vs, cmd, data, flag, p)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -599,8 +600,9 @@ ega_ioctl(v, cmd, data, flag, p)
}
static paddr_t
ega_mmap(v, offset, prot)
ega_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

14
sys/dev/isa/pcdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcdisplay.c,v 1.28 2005/12/11 12:22:03 christos Exp $ */
/* $NetBSD: pcdisplay.c,v 1.29 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1998
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.28 2005/12/11 12:22:03 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.29 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -112,8 +112,8 @@ const struct wsscreen_list pcdisplay_screenlist = {
_pcdisplay_scrlist
};
static int pcdisplay_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t pcdisplay_mmap(void *, off_t, int);
static int pcdisplay_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t pcdisplay_mmap(void *, void *, off_t, int);
static int pcdisplay_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void pcdisplay_free_screen(void *, void *);
@ -375,8 +375,9 @@ pcdisplay_is_console(iot)
}
static int
pcdisplay_ioctl(v, cmd, data, flag, l)
pcdisplay_ioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -389,8 +390,9 @@ pcdisplay_ioctl(v, cmd, data, flag, l)
}
static paddr_t
pcdisplay_mmap(v, offset, prot)
pcdisplay_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

14
sys/dev/pci/machfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machfb.c,v 1.39 2006/04/05 15:23:06 drochner Exp $ */
/* $NetBSD: machfb.c,v 1.40 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
"$NetBSD: machfb.c,v 1.39 2006/04/05 15:23:06 drochner Exp $");
"$NetBSD: machfb.c,v 1.40 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -383,8 +383,9 @@ static struct wsscreen_list mach64_screenlist = {
_mach64_scrlist
};
static int mach64_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t mach64_mmap(void *, off_t, int);
static int mach64_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t mach64_mmap(void *, void *, off_t, int);
static int mach64_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void mach64_free_screen(void *, void *);
@ -1591,7 +1592,8 @@ mach64_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
*/
static int
mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
mach64_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct mach64_softc *sc = v;
struct wsdisplay_fbinfo *wdf;
@ -1660,7 +1662,7 @@ mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
mach64_mmap(void *v, off_t offset, int prot)
mach64_mmap(void *v, void *vs, off_t offset, int prot)
{
struct mach64_softc *sc = v;
paddr_t pa;

14
sys/dev/pci/tga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.61 2005/12/11 12:22:50 christos Exp $ */
/* $NetBSD: tga.c,v 1.62 2006/04/12 19:38:23 jmmv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.61 2005/12/11 12:22:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.62 2006/04/12 19:38:23 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -76,8 +76,8 @@ unsigned tga_getdotclock(struct tga_devconfig *dc);
struct tga_devconfig tga_console_dc;
int tga_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t tga_mmap(void *, off_t, int);
int tga_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
paddr_t tga_mmap(void *, void *, off_t, int);
static void tga_copyrows(void *, int, int, int);
static void tga_copycols(void *, int, int, int, int);
static int tga_alloc_screen(void *, const struct wsscreen_descr *,
@ -528,8 +528,9 @@ tga_config_interrupts (d)
}
int
tga_ioctl(v, cmd, data, flag, l)
tga_ioctl(v, vs, cmd, data, flag, l)
void *v;
void *vs;
u_long cmd;
caddr_t data;
int flag;
@ -662,8 +663,9 @@ tga_intr(v)
}
paddr_t
tga_mmap(v, offset, prot)
tga_mmap(v, vs, offset, prot)
void *v;
void *vs;
off_t offset;
int prot;
{

14
sys/dev/pci/voodoofb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: voodoofb.c,v 1.1 2006/04/11 16:11:07 macallan Exp $ */
/* $NetBSD: voodoofb.c,v 1.2 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 2005, 2006 Michael Lorenz
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.1 2006/04/11 16:11:07 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.2 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -186,8 +186,9 @@ struct wsscreen_list voodoofb_screenlist = {
sizeof(_voodoofb_scrlist) / sizeof(struct wsscreen_descr *), _voodoofb_scrlist
};
static int voodoofb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t voodoofb_mmap(void *, off_t, int);
static int voodoofb_ioctl(void *, void *, u_long, caddr_t, int,
struct lwp *);
static paddr_t voodoofb_mmap(void *, void *, off_t, int);
static void voodoofb_clearscreen(struct voodoofb_softc *);
static void voodoofb_init_screen(void *, struct vcons_screen *, int,
@ -853,7 +854,8 @@ voodoofb_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
*/
static int
voodoofb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
voodoofb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vcons_data *vd = v;
struct voodoofb_softc *sc = vd->cookie;
@ -914,7 +916,7 @@ voodoofb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
voodoofb_mmap(void *v, off_t offset, int prot)
voodoofb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd = v;
struct voodoofb_softc *sc = vd->cookie;

13
sys/dev/sbus/p9100.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: p9100.c,v 1.30 2006/04/06 12:22:05 drochner Exp $ */
/* $NetBSD: p9100.c,v 1.31 2006/04/12 19:38:24 jmmv Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.30 2006/04/06 12:22:05 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.31 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -219,8 +219,8 @@ static int p9100_allocattr(void *, int, int, int, long *);
static int p9100_putcmap(struct p9100_softc *, struct wsdisplay_cmap *);
static int p9100_getcmap(struct p9100_softc *, struct wsdisplay_cmap *);
static int p9100_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t p9100_mmap(void *, off_t, int);
static int p9100_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t p9100_mmap(void *, void *, off_t, int);
/*static int p9100_load_font(void *, void *, struct wsdisplay_font *);*/
@ -1122,7 +1122,8 @@ p9100_putchar(void *cookie, int row, int col, u_int c, long attr)
*/
int
p9100_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
p9100_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vcons_data *vd = v;
struct p9100_softc *sc = vd->cookie;
@ -1178,7 +1179,7 @@ p9100_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
p9100_mmap(void *v, off_t offset, int prot)
p9100_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd = v;
struct p9100_softc *sc = vd->cookie;

13
sys/dev/sun/cgsix.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgsix.c,v 1.29 2005/12/12 02:44:09 christos Exp $ */
/* $NetBSD: cgsix.c,v 1.30 2006/04/12 19:38:24 jmmv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.29 2005/12/12 02:44:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.30 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -160,8 +160,8 @@ struct wsscreen_descr cgsix_defaultscreen = {
WSSCREEN_WSCOLORS /* capabilities */
};
static int cgsix_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cgsix_mmap(void *, off_t, int);
static int cgsix_ioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cgsix_mmap(void *, void *, off_t, int);
void cgsix_init_screen(struct cgsix_softc *, struct cg6_screen *,
int, long *);
@ -1182,7 +1182,8 @@ cg6_setup_palette(struct cgsix_softc *sc)
}
int
cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
cgsix_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
/* we'll probably need to add more stuff here */
struct cgsix_softc *sc = v;
@ -1240,7 +1241,7 @@ cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
cgsix_mmap(void *v, off_t offset, int prot)
cgsix_mmap(void *v, void *vs, off_t offset, int prot)
{
struct cgsix_softc *sc = v;
if(offset<sc->sc_ramsize) {

12
sys/dev/tc/cfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.49 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: cfb.c,v 1.50 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.49 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.50 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -163,8 +163,8 @@ static const struct wsscreen_list cfb_screenlist = {
sizeof(_cfb_scrlist) / sizeof(struct wsscreen_descr *), _cfb_scrlist
};
static int cfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cfbmmap(void *, off_t, int);
static int cfbioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cfbmmap(void *, void *, off_t, int);
static int cfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -359,7 +359,7 @@ cfb_common_init(struct rasops_info *ri)
}
static int
cfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
cfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -436,7 +436,7 @@ cfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
paddr_t
cfbmmap(void *v, off_t offset, int prot)
cfbmmap(void *v, void *vs, off_t offset, int prot)
{
struct cfb_softc *sc = v;

12
sys/dev/tc/mfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfb.c,v 1.46 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: mfb.c,v 1.47 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.46 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.47 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -150,8 +150,8 @@ static const struct wsscreen_list mfb_screenlist = {
sizeof(_mfb_scrlist) / sizeof(struct wsscreen_descr *), _mfb_scrlist
};
static int mfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t mfbmmap(void *, off_t, int);
static int mfbioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t mfbmmap(void *, void *, off_t, int);
static int mfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -322,7 +322,7 @@ mfb_common_init(struct rasops_info *ri)
}
static int
mfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
mfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -399,7 +399,7 @@ mfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
mfbmmap(void *v, off_t offset, int prot)
mfbmmap(void *v, void *vs, off_t offset, int prot)
{
struct mfb_softc *sc = v;

12
sys/dev/tc/sfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.70 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: sfb.c,v 1.71 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.70 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.71 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -175,8 +175,8 @@ static const struct wsscreen_list sfb_screenlist = {
sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist
};
static int sfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t sfbmmap(void *, off_t, int);
static int sfbioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t sfbmmap(void *, void *, off_t, int);
static int sfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -393,7 +393,7 @@ sfb_common_init(struct rasops_info *ri)
}
static int
sfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
sfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct sfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -483,7 +483,7 @@ sfb_screenblank(struct sfb_softc *sc)
}
static paddr_t
sfbmmap(void *v, off_t offset, int prot)
sfbmmap(void *v, void *vs, off_t offset, int prot)
{
struct sfb_softc *sc = v;

12
sys/dev/tc/sfbplus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sfbplus.c,v 1.25 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: sfbplus.c,v 1.26 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.25 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.26 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -149,8 +149,8 @@ static const struct wsscreen_list sfb_screenlist = {
sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist
};
static int sfbioctl(void *, u_long, caddr_t, int, struct proc *);
static paddr_t sfbmmap(void *, off_t, int);
static int sfbioctl(void *, void *, u_long, caddr_t, int, struct proc *);
static paddr_t sfbmmap(void *, void *, off_t, int);
static int sfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -428,7 +428,7 @@ sfbp_common_init(struct rasops_info *ri)
}
static int
sfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
sfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct proc *p)
{
struct sfbp_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -507,7 +507,7 @@ sfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
}
paddr_t
sfbmmap(void *v, off_t offset, int prot)
sfbmmap(void *v, void *vs, off_t offset, int prot)
{
struct sfbp_softc *sc = v;

8
sys/dev/tc/stic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stic.c,v 1.31 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: stic.c,v 1.32 2006/04/12 19:38:24 jmmv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.31 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.32 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -157,7 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.31 2006/03/31 17:39:33 thorpej Exp $");
tc_wmb(); \
} while (0)
static int sticioctl(void *, u_long, caddr_t, int, struct lwp *);
static int sticioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static int stic_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
static void stic_free_screen(void *, void *);
@ -558,7 +558,7 @@ stic_clear_screen(struct stic_info *si)
}
static int
sticioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
sticioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct stic_info *si;
int s;

12
sys/dev/tc/tfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tfb.c,v 1.49 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: tfb.c,v 1.50 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.49 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.50 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -202,8 +202,8 @@ static const struct wsscreen_list tfb_screenlist = {
sizeof(_tfb_scrlist) / sizeof(struct wsscreen_descr *), _tfb_scrlist
};
static int tfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t tfbmmap(void *, off_t, int);
static int tfbioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t tfbmmap(void *, void *, off_t, int);
static int tfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -393,7 +393,7 @@ tfb_cmap_init(struct tfb_softc *sc)
}
static int
tfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
tfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct tfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -474,7 +474,7 @@ tfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
tfbmmap(void *v, off_t offset, int prot)
tfbmmap(void *v, void *vs, off_t offset, int prot)
{
struct tfb_softc *sc = v;

12
sys/dev/tc/xcfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xcfb.c,v 1.41 2006/03/31 17:39:33 thorpej Exp $ */
/* $NetBSD: xcfb.c,v 1.42 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.41 2006/03/31 17:39:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.42 2006/04/12 19:38:24 jmmv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -123,8 +123,8 @@ static const struct wsscreen_list xcfb_screenlist = {
sizeof(_xcfb_scrlist) / sizeof(struct wsscreen_descr *), _xcfb_scrlist
};
static int xcfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t xcfbmmap(void *, off_t, int);
static int xcfbioctl(void *, void *, u_long, caddr_t, int, struct lwp *);
static paddr_t xcfbmmap(void *, void *, off_t, int);
static int xcfb_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@ -393,7 +393,7 @@ xcfbhwinit(caddr_t base)
}
static int
xcfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
xcfbioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct xcfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
@ -470,7 +470,7 @@ xcfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
xcfbmmap(void *v, off_t offset, int prot)
xcfbmmap(void *v, void *vs, off_t offset, int prot)
{
if (offset >= XCFB_FB_SIZE || offset < 0)

19
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.93 2006/04/05 15:18:25 drochner Exp $ */
/* $NetBSD: wsdisplay.c,v 1.94 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.93 2006/04/05 15:18:25 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.94 2006/04/12 19:38:24 jmmv Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@ -1013,8 +1013,8 @@ int
wsdisplay_param(struct device *dev, u_long cmd, struct wsdisplay_param *dp)
{
struct wsdisplay_softc *sc = (struct wsdisplay_softc *)dev;
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd,
(caddr_t)dp, 0, NULL));
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, sc->sc_focus,
cmd, (caddr_t)dp, 0, NULL));
}
int
@ -1077,8 +1077,8 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
} else if (d == WSDISPLAYIO_MODE_EMUL)
return (EINVAL);
(void)(*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
flag, l);
(void)(*sc->sc_accessops->ioctl)(sc->sc_accesscookie, scr, cmd,
data, flag, l);
return (0);
#undef d
@ -1183,7 +1183,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
}
/* check ioctls for display */
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, scr, cmd, data,
flag, l));
}
@ -1363,7 +1363,8 @@ wsdisplaymmap(dev_t dev, off_t offset, int prot)
return (-1);
/* pass mmap to display */
return ((*sc->sc_accessops->mmap)(sc->sc_accesscookie, offset, prot));
return ((*sc->sc_accessops->mmap)(sc->sc_accesscookie, scr,
offset, prot));
}
void
@ -1554,7 +1555,7 @@ wsdisplay_update_rawkbd(struct wsdisplay_softc *sc, struct wsscreen *scr)
inp = sc->sc_input;
if (inp == NULL)
return (ENXIO);
error = wsevsrc_display_ioctl(inp, WSKBDIO_SETMODE, &data, 0, 0);
error = wsevsrc_display_ioctl(inp, scr, WSKBDIO_SETMODE, &data, 0, 0);
if (!error)
sc->sc_rawkbd = raw;
splx(s);

6
sys/dev/wscons/wsdisplayvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplayvar.h,v 1.37 2006/04/07 14:30:20 drochner Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.38 2006/04/12 19:38:24 jmmv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -111,9 +111,9 @@ struct wsdisplay_char;
* with these functions, which is passed to them when they are invoked.
*/
struct wsdisplay_accessops {
int (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
int (*ioctl)(void *v, void *scr, u_long cmd, caddr_t data, int flag,
struct lwp *l);
paddr_t (*mmap)(void *v, off_t off, int prot);
paddr_t (*mmap)(void *v, void *scr, off_t off, int prot);
int (*alloc_screen)(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
void (*free_screen)(void *, void *);