Index: arch/acorn26/vidc/arcvideo.c =================================================================== RCS file: /cvsroot/src/sys/arch/acorn26/vidc/arcvideo.c,v retrieving revision 1.9 diff -u -p -r1.9 arcvideo.c --- arch/acorn26/vidc/arcvideo.c 11 Dec 2005 12:16:05 -0000 1.9 +++ arch/acorn26/vidc/arcvideo.c 12 Apr 2006 16:37:43 -0000 @@ -72,9 +72,9 @@ static int arcvideo_setmode(struct devic 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, } 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; Index: arch/amiga/dev/amidisplaycc.c =================================================================== RCS file: /cvsroot/src/sys/arch/amiga/dev/amidisplaycc.c,v retrieving revision 1.18 diff -u -p -r1.18 amidisplaycc.c --- arch/amiga/dev/amidisplaycc.c 11 Dec 2005 12:16:28 -0000 1.18 +++ arch/amiga/dev/amidisplaycc.c 12 Apr 2006 16:37:43 -0000 @@ -143,8 +143,8 @@ int amidisplaycc_allocattr(void *, int, /* 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 } 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 amidisplay * 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; Index: arch/arm/iomd/vidcvideo.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/iomd/vidcvideo.c,v retrieving revision 1.21 diff -u -p -r1.21 vidcvideo.c --- arch/arm/iomd/vidcvideo.c 11 Dec 2005 12:16:47 -0000 1.21 +++ arch/arm/iomd/vidcvideo.c 12 Apr 2006 16:37:44 -0000 @@ -165,8 +165,9 @@ static const struct wsscreen_list vidcvi 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; { Index: arch/arm/xscale/pxa2x0_lcd.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.c,v retrieving revision 1.12 diff -u -p -r1.12 pxa2x0_lcd.c --- arch/arm/xscale/pxa2x0_lcd.c 10 Apr 2006 03:36:03 -0000 1.12 +++ arch/arm/xscale/pxa2x0_lcd.c 12 Apr 2006 16:37:45 -0000 @@ -612,7 +612,8 @@ pxa2x0_lcd_free_screen(void *v, void *co } 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, ca } 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; /* ??? */ Index: arch/arm/xscale/pxa2x0_lcd.h =================================================================== RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.h,v retrieving revision 1.3 diff -u -p -r1.3 pxa2x0_lcd.h --- arch/arm/xscale/pxa2x0_lcd.h 11 Dec 2005 12:16:52 -0000 1.3 +++ arch/arm/xscale/pxa2x0_lcd.h 12 Apr 2006 16:37:45 -0000 @@ -138,8 +138,8 @@ int pxa2x0_lcd_setup_wsscreen(struct pxa 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 *); Index: arch/bebox/pci/pfb.c =================================================================== RCS file: /cvsroot/src/sys/arch/bebox/pci/pfb.c,v retrieving revision 1.13 diff -u -p -r1.13 pfb.c --- arch/bebox/pci/pfb.c 11 Dec 2005 12:17:04 -0000 1.13 +++ arch/bebox/pci/pfb.c 12 Apr 2006 16:37:45 -0000 @@ -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; { Index: arch/dreamcast/dev/pvr.c =================================================================== RCS file: /cvsroot/src/sys/arch/dreamcast/dev/pvr.c,v retrieving revision 1.21 diff -u -p -r1.21 pvr.c --- arch/dreamcast/dev/pvr.c 24 Dec 2005 20:06:58 -0000 1.21 +++ arch/dreamcast/dev/pvr.c 12 Apr 2006 16:37:46 -0000 @@ -212,8 +212,8 @@ const struct wsscreen_list pvr_screenlis 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 } 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 da } paddr_t -pvrmmap(void *v, off_t offset, int prot) +pvrmmap(void *v, void *vs, off_t offset, int prot) { /* Index: arch/evbarm/g42xxeb/g42xxeb_lcd.c =================================================================== RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c,v retrieving revision 1.4 diff -u -p -r1.4 g42xxeb_lcd.c --- arch/evbarm/g42xxeb/g42xxeb_lcd.c 8 Mar 2006 23:46:23 -0000 1.4 +++ arch/evbarm/g42xxeb/g42xxeb_lcd.c 12 Apr 2006 16:37:46 -0000 @@ -103,7 +103,7 @@ const struct wsscreen_list lcd_screen_li 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, #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); Index: arch/evbarm/lubbock/lubbock_lcd.c =================================================================== RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_lcd.c,v retrieving revision 1.3 diff -u -p -r1.3 lubbock_lcd.c --- arch/evbarm/lubbock/lubbock_lcd.c 23 Feb 2006 05:37:47 -0000 1.3 +++ arch/evbarm/lubbock/lubbock_lcd.c 12 Apr 2006 16:37:46 -0000 @@ -113,7 +113,7 @@ const struct wsscreen_list lcd_screen_li 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, #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); Index: arch/ews4800mips/sbd/fb_sbdio.c =================================================================== RCS file: /cvsroot/src/sys/arch/ews4800mips/sbd/fb_sbdio.c,v retrieving revision 1.1 diff -u -p -r1.1 fb_sbdio.c --- arch/ews4800mips/sbd/fb_sbdio.c 29 Dec 2005 15:20:09 -0000 1.1 +++ arch/ews4800mips/sbd/fb_sbdio.c 12 Apr 2006 16:37:46 -0000 @@ -78,8 +78,8 @@ void fb_sbdio_attach(struct device *, st 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 } 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 d } 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) Index: arch/i386/bios/vesafb.c =================================================================== RCS file: /cvsroot/src/sys/arch/i386/bios/vesafb.c,v retrieving revision 1.12 diff -u -p -r1.12 vesafb.c --- arch/i386/bios/vesafb.c 11 Apr 2006 14:18:01 -0000 1.12 +++ arch/i386/bios/vesafb.c 12 Apr 2006 16:37:47 -0000 @@ -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_ } 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; Index: arch/luna68k/dev/lunafb.c =================================================================== RCS file: /cvsroot/src/sys/arch/luna68k/dev/lunafb.c,v retrieving revision 1.13 diff -u -p -r1.13 lunafb.c --- arch/luna68k/dev/lunafb.c 11 Dec 2005 12:17:52 -0000 1.13 +++ arch/luna68k/dev/lunafb.c 12 Apr 2006 16:37:48 -0000 @@ -134,8 +134,9 @@ static const struct wsscreen_list omfb_s 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; { Index: arch/mac68k/dev/macfb.c =================================================================== RCS file: /cvsroot/src/sys/arch/mac68k/dev/macfb.c,v retrieving revision 1.13 diff -u -p -r1.13 macfb.c --- arch/mac68k/dev/macfb.c 28 Mar 2006 17:38:25 -0000 1.13 +++ arch/mac68k/dev/macfb.c 12 Apr 2006 16:37:48 -0000 @@ -90,8 +90,8 @@ const struct wsscreen_list macfb_screenl _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, stru 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 } 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; Index: arch/macppc/dev/ofb.c =================================================================== RCS file: /cvsroot/src/sys/arch/macppc/dev/ofb.c,v retrieving revision 1.47 diff -u -p -r1.47 ofb.c --- arch/macppc/dev/ofb.c 16 Feb 2006 18:48:38 -0000 1.47 +++ arch/macppc/dev/ofb.c 12 Apr 2006 16:37:48 -0000 @@ -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 d } 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; Index: arch/newsmips/apbus/xafb.c =================================================================== RCS file: /cvsroot/src/sys/arch/newsmips/apbus/xafb.c,v retrieving revision 1.12 diff -u -p -r1.12 xafb.c --- arch/newsmips/apbus/xafb.c 24 Dec 2005 20:07:24 -0000 1.12 +++ arch/newsmips/apbus/xafb.c 12 Apr 2006 16:37:49 -0000 @@ -82,8 +82,8 @@ void xafb_attach(struct device *, struct 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 } 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; Index: arch/newsmips/dev/fb.c =================================================================== RCS file: /cvsroot/src/sys/arch/newsmips/dev/fb.c,v retrieving revision 1.21 diff -u -p -r1.21 fb.c --- arch/newsmips/dev/fb.c 11 Dec 2005 12:18:24 -0000 1.21 +++ arch/newsmips/dev/fb.c 12 Apr 2006 16:37:49 -0000 @@ -62,8 +62,8 @@ void fb_attach(struct device *, struct d 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 da } 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; Index: arch/next68k/dev/nextdisplay.c =================================================================== RCS file: /cvsroot/src/sys/arch/next68k/dev/nextdisplay.c,v retrieving revision 1.18 diff -u -p -r1.18 nextdisplay.c --- arch/next68k/dev/nextdisplay.c 11 Dec 2005 12:18:25 -0000 1.18 +++ arch/next68k/dev/nextdisplay.c 12 Apr 2006 16:37:49 -0000 @@ -106,8 +106,9 @@ const struct wsscreen_list nextdisplay_s _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, c } static paddr_t -nextdisplay_mmap(void *v, off_t offset, int prot) +nextdisplay_mmap(void *v, void *vs, off_t offset, int prot) { /* XXX */ Index: arch/playstation2/ee/gsfb.c =================================================================== RCS file: /cvsroot/src/sys/arch/playstation2/ee/gsfb.c,v retrieving revision 1.15 diff -u -p -r1.15 gsfb.c --- arch/playstation2/ee/gsfb.c 4 Feb 2006 14:54:56 -0000 1.15 +++ arch/playstation2/ee/gsfb.c 12 Apr 2006 16:37:49 -0000 @@ -208,8 +208,8 @@ STATIC void _gsfb_eraserows(void *, int, 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, in } 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 */ Index: arch/pmax/ibus/pm.c =================================================================== RCS file: /cvsroot/src/sys/arch/pmax/ibus/pm.c,v retrieving revision 1.3 diff -u -p -r1.3 pm.c --- arch/pmax/ibus/pm.c 11 Dec 2005 12:18:36 -0000 1.3 +++ arch/pmax/ibus/pm.c 12 Apr 2006 16:37:50 -0000 @@ -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 da } 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; Index: arch/prep/pci/gten.c =================================================================== RCS file: /cvsroot/src/sys/arch/prep/pci/gten.c,v retrieving revision 1.12 diff -u -p -r1.12 gten.c --- arch/prep/pci/gten.c 11 Dec 2005 12:18:47 -0000 1.12 +++ arch/prep/pci/gten.c 12 Apr 2006 16:37:50 -0000 @@ -88,8 +88,8 @@ static struct wsscreen_list gten_screenl 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; { Index: arch/sgimips/gio/grtwo.c =================================================================== RCS file: /cvsroot/src/sys/arch/sgimips/gio/grtwo.c,v retrieving revision 1.6 diff -u -p -r1.6 grtwo.c --- arch/sgimips/gio/grtwo.c 11 Dec 2005 12:18:53 -0000 1.6 +++ arch/sgimips/gio/grtwo.c 12 Apr 2006 16:37:51 -0000 @@ -99,8 +99,8 @@ static void grtwo_eraserows(void *, 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, /* 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 } 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; Index: arch/sgimips/gio/newport.c =================================================================== RCS file: /cvsroot/src/sys/arch/sgimips/gio/newport.c,v retrieving revision 1.6 diff -u -p -r1.6 newport.c --- arch/sgimips/gio/newport.c 11 Dec 2005 12:18:53 -0000 1.6 +++ arch/sgimips/gio/newport.c 12 Apr 2006 16:37:51 -0000 @@ -87,8 +87,9 @@ static void newport_eraserows(void *, in 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 b /**** 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 } 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; Index: arch/sparc64/dev/ffb.c =================================================================== RCS file: /cvsroot/src/sys/arch/sparc64/dev/ffb.c,v retrieving revision 1.23 diff -u -p -r1.23 ffb.c --- arch/sparc64/dev/ffb.c 29 Mar 2006 04:16:47 -0000 1.23 +++ arch/sparc64/dev/ffb.c 12 Apr 2006 16:37:52 -0000 @@ -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 c } 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; Index: arch/vax/vsa/lcspx.c =================================================================== RCS file: /cvsroot/src/sys/arch/vax/vsa/lcspx.c,v retrieving revision 1.4 diff -u -p -r1.4 lcspx.c --- arch/vax/vsa/lcspx.c 11 Dec 2005 12:19:37 -0000 1.4 +++ arch/vax/vsa/lcspx.c 12 Apr 2006 16:37:53 -0000 @@ -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 -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 } 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; Index: arch/vax/vsa/smg.c =================================================================== RCS file: /cvsroot/src/sys/arch/vax/vsa/smg.c,v retrieving revision 1.40 diff -u -p -r1.40 smg.c --- arch/vax/vsa/smg.c 11 Dec 2005 12:19:37 -0000 1.40 +++ arch/vax/vsa/smg.c 12 Apr 2006 16:37:53 -0000 @@ -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 d } 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; Index: dev/hpc/hpcfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/hpc/hpcfb.c,v retrieving revision 1.35 diff -u -p -r1.35 hpcfb.c --- dev/hpc/hpcfb.c 29 Mar 2006 06:37:35 -0000 1.35 +++ dev/hpc/hpcfb.c 12 Apr 2006 16:37:54 -0000 @@ -182,8 +182,8 @@ int hpcfbmatch(struct device *, struct c 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 * } 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 } 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; Index: dev/ic/hd44780_subr.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/hd44780_subr.c,v retrieving revision 1.8 diff -u -p -r1.8 hd44780_subr.c --- dev/ic/hd44780_subr.c 11 Dec 2005 12:21:26 -0000 1.8 +++ dev/ic/hd44780_subr.c 12 Apr 2006 16:37:54 -0000 @@ -88,8 +88,8 @@ const struct wsdisplay_emulops hlcd_emul 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; { Index: dev/ic/igsfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/igsfb.c,v retrieving revision 1.37 diff -u -p -r1.37 igsfb.c --- dev/ic/igsfb.c 5 Apr 2006 01:13:50 -0000 1.37 +++ dev/ic/igsfb.c 12 Apr 2006 16:37:54 -0000 @@ -81,8 +81,8 @@ static const struct wsscreen_list igsfb_ * 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_devcon * 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 pr * 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; Index: dev/ic/sti.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/sti.c,v retrieving revision 1.5 diff -u -p -r1.5 sti.c --- dev/ic/sti.c 11 Dec 2005 12:21:28 -0000 1.5 +++ dev/ic/sti.c 12 Apr 2006 16:37:55 -0000 @@ -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 } 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 d } 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; Index: dev/ic/vga.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/vga.c,v retrieving revision 1.85 diff -u -p -r1.85 vga.c --- dev/ic/vga.c 5 Apr 2006 15:19:54 -0000 1.85 +++ dev/ic/vga.c 12 Apr 2006 16:37:55 -0000 @@ -266,8 +266,8 @@ const struct wsscreen_list vga_screenlis _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 } 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 d } 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; Index: dev/ic/vga_raster.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/vga_raster.c,v retrieving revision 1.20 diff -u -p -r1.20 vga_raster.c --- dev/ic/vga_raster.c 12 Dec 2005 01:14:22 -0000 1.20 +++ dev/ic/vga_raster.c 12 Apr 2006 16:37:56 -0000 @@ -301,8 +301,9 @@ const struct wsscreen_list vga_screenlis _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 } 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, ca } 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; Index: dev/isa/ega.c =================================================================== RCS file: /cvsroot/src/sys/dev/isa/ega.c,v retrieving revision 1.19 diff -u -p -r1.19 ega.c --- dev/isa/ega.c 11 Dec 2005 12:22:02 -0000 1.19 +++ dev/isa/ega.c 12 Apr 2006 16:37:57 -0000 @@ -210,8 +210,8 @@ const struct wsscreen_list ega_screenlis _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; { Index: dev/isa/pcdisplay.c =================================================================== RCS file: /cvsroot/src/sys/dev/isa/pcdisplay.c,v retrieving revision 1.28 diff -u -p -r1.28 pcdisplay.c --- dev/isa/pcdisplay.c 11 Dec 2005 12:22:03 -0000 1.28 +++ dev/isa/pcdisplay.c 12 Apr 2006 16:37:57 -0000 @@ -112,8 +112,8 @@ const struct wsscreen_list pcdisplay_scr _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; { Index: dev/pci/machfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/pci/machfb.c,v retrieving revision 1.39 diff -u -p -r1.39 machfb.c --- dev/pci/machfb.c 5 Apr 2006 15:23:06 -0000 1.39 +++ dev/pci/machfb.c 12 Apr 2006 16:37:58 -0000 @@ -383,8 +383,9 @@ static struct wsscreen_list mach64_scree _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, i */ 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_ } 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; Index: dev/pci/tga.c =================================================================== RCS file: /cvsroot/src/sys/dev/pci/tga.c,v retrieving revision 1.61 diff -u -p -r1.61 tga.c --- dev/pci/tga.c 11 Dec 2005 12:22:50 -0000 1.61 +++ dev/pci/tga.c 12 Apr 2006 16:37:59 -0000 @@ -76,8 +76,8 @@ unsigned tga_getdotclock(struct tga_devc 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; { Index: dev/pci/voodoofb.c =================================================================== RCS file: /cvsroot/src/sys/dev/pci/voodoofb.c,v retrieving revision 1.1 diff -u -p -r1.1 voodoofb.c --- dev/pci/voodoofb.c 11 Apr 2006 16:11:07 -0000 1.1 +++ dev/pci/voodoofb.c 12 Apr 2006 16:37:59 -0000 @@ -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, */ 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, cadd } 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; Index: dev/sbus/p9100.c =================================================================== RCS file: /cvsroot/src/sys/dev/sbus/p9100.c,v retrieving revision 1.30 diff -u -p -r1.30 p9100.c --- dev/sbus/p9100.c 6 Apr 2006 12:22:05 -0000 1.30 +++ dev/sbus/p9100.c 12 Apr 2006 16:38:00 -0000 @@ -219,8 +219,8 @@ static int p9100_allocattr(void *, int, 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 */ 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 } 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; Index: dev/sun/cgsix.c =================================================================== RCS file: /cvsroot/src/sys/dev/sun/cgsix.c,v retrieving revision 1.29 diff -u -p -r1.29 cgsix.c --- dev/sun/cgsix.c 12 Dec 2005 02:44:09 -0000 1.29 +++ dev/sun/cgsix.c 12 Apr 2006 16:38:00 -0000 @@ -160,8 +160,8 @@ struct wsscreen_descr cgsix_defaultscree 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 } 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(offsetsc_ramsize) { Index: dev/tc/cfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/cfb.c,v retrieving revision 1.49 diff -u -p -r1.49 cfb.c --- dev/tc/cfb.c 31 Mar 2006 17:39:33 -0000 1.49 +++ dev/tc/cfb.c 12 Apr 2006 16:38:01 -0000 @@ -163,8 +163,8 @@ static const struct wsscreen_list cfb_sc 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 da } 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; Index: dev/tc/mfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/mfb.c,v retrieving revision 1.46 diff -u -p -r1.46 mfb.c --- dev/tc/mfb.c 31 Mar 2006 17:39:33 -0000 1.46 +++ dev/tc/mfb.c 12 Apr 2006 16:38:01 -0000 @@ -150,8 +150,8 @@ static const struct wsscreen_list mfb_sc 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 da } 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; Index: dev/tc/sfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/sfb.c,v retrieving revision 1.70 diff -u -p -r1.70 sfb.c --- dev/tc/sfb.c 31 Mar 2006 17:39:33 -0000 1.70 +++ dev/tc/sfb.c 12 Apr 2006 16:38:01 -0000 @@ -175,8 +175,8 @@ static const struct wsscreen_list sfb_sc 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; Index: dev/tc/sfbplus.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/sfbplus.c,v retrieving revision 1.25 diff -u -p -r1.25 sfbplus.c --- dev/tc/sfbplus.c 31 Mar 2006 17:39:33 -0000 1.25 +++ dev/tc/sfbplus.c 12 Apr 2006 16:38:02 -0000 @@ -149,8 +149,8 @@ static const struct wsscreen_list sfb_sc 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 da } 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; Index: dev/tc/stic.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/stic.c,v retrieving revision 1.31 diff -u -p -r1.31 stic.c --- dev/tc/stic.c 31 Mar 2006 17:39:33 -0000 1.31 +++ dev/tc/stic.c 12 Apr 2006 16:38:03 -0000 @@ -157,7 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.3 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; Index: dev/tc/tfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/tfb.c,v retrieving revision 1.49 diff -u -p -r1.49 tfb.c --- dev/tc/tfb.c 31 Mar 2006 17:39:33 -0000 1.49 +++ dev/tc/tfb.c 12 Apr 2006 16:38:03 -0000 @@ -202,8 +202,8 @@ static const struct wsscreen_list tfb_sc 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 da } 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; Index: dev/tc/xcfb.c =================================================================== RCS file: /cvsroot/src/sys/dev/tc/xcfb.c,v retrieving revision 1.41 diff -u -p -r1.41 xcfb.c --- dev/tc/xcfb.c 31 Mar 2006 17:39:33 -0000 1.41 +++ dev/tc/xcfb.c 12 Apr 2006 16:38:03 -0000 @@ -123,8 +123,8 @@ static const struct wsscreen_list xcfb_s 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 d } 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) Index: dev/wscons/wsdisplay.c =================================================================== RCS file: /cvsroot/src/sys/dev/wscons/wsdisplay.c,v retrieving revision 1.93 diff -u -p -r1.93 wsdisplay.c --- dev/wscons/wsdisplay.c 5 Apr 2006 15:18:25 -0000 1.93 +++ dev/wscons/wsdisplay.c 12 Apr 2006 16:38:04 -0000 @@ -1013,7 +1013,7 @@ 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, + return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, NULL, cmd, (caddr_t)dp, 0, NULL)); } @@ -1077,8 +1077,8 @@ wsdisplay_internal_ioctl(struct wsdispla } 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 wsdispla } /* 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, i 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 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); Index: dev/wscons/wsdisplayvar.h =================================================================== RCS file: /cvsroot/src/sys/dev/wscons/wsdisplayvar.h,v retrieving revision 1.37 diff -u -p -r1.37 wsdisplayvar.h --- dev/wscons/wsdisplayvar.h 7 Apr 2006 14:30:20 -0000 1.37 +++ dev/wscons/wsdisplayvar.h 12 Apr 2006 16:38:04 -0000 @@ -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 *);