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

alloc_attr -> allocattr 

Approved by Matthias Drochner.
This commit is contained in:
junyoung 2002-07-04 14:37:10 +00:00
parent 2cdb2f419e
commit 3d826105dc
36 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: arcvideo.c,v 1.2 2002/03/24 23:37:45 bjh21 Exp $ */
/* $NetBSD: arcvideo.c,v 1.3 2002/07/04 14:43:47 junyoung Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@ -38,7 +38,7 @@
#include <sys/param.h>
__RCSID("$NetBSD: arcvideo.c,v 1.2 2002/03/24 23:37:45 bjh21 Exp $");
__RCSID("$NetBSD: arcvideo.c,v 1.3 2002/07/04 14:43:47 junyoung Exp $");
#include <sys/device.h>
#include <sys/errno.h>
@ -363,9 +363,9 @@ arccons_init(void)
if (crow < 0) crow = 0;
if (crow > ri->ri_rows) crow = ri->ri_rows;
if ((arccons_ri.ri_ops.alloc_attr)(&arccons_ri, 0, 0, 0, &defattr) !=
if ((arccons_ri.ri_ops.allocattr)(&arccons_ri, 0, 0, 0, &defattr) !=
0)
panic("alloc_attr failed");
panic("allocattr failed");
wsdisplay_cnattach(&arcscreen, &arccons_ri, 0, crow, defattr);
/* That should be all */

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

@ -1,4 +1,4 @@
/* $NetBSD: amidisplaycc.c,v 1.6 2002/03/17 19:40:27 atatat Exp $ */
/* $NetBSD: amidisplaycc.c,v 1.7 2002/07/04 14:43:48 junyoung Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.6 2002/03/17 19:40:27 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.7 2002/07/04 14:43:48 junyoung Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@ -146,7 +146,7 @@ void amidisplaycc_copycols(void *, int, int, int, int);
void amidisplaycc_erasecols(void *, int, int, int, long);
void amidisplaycc_copyrows(void *, int, int, int);
void amidisplaycc_eraserows(void *, int, int, long);
int amidisplaycc_alloc_attr(void *, int, int, int, long *);
int amidisplaycc_allocattr(void *, int, int, int, long *);
/* end of emulops for wscons */
@ -185,7 +185,7 @@ const struct wsdisplay_emulops amidisplaycc_emulops = {
amidisplaycc_erasecols,
amidisplaycc_copyrows,
amidisplaycc_eraserows,
amidisplaycc_alloc_attr
amidisplaycc_allocattr
};
/* add some of our own data to the wsscreen_descr */
@ -987,7 +987,7 @@ amidisplaycc_eraserows(void *screen, int row, int nrows, long attr)
* background color, and flags.
*/
int
amidisplaycc_alloc_attr(void *screen, int fg, int bg, int flags, long *attrp)
amidisplaycc_allocattr(void *screen, int fg, int bg, int flags, long *attrp)
{
adccscr_t * scr;
int maxcolor;

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

@ -1,4 +1,4 @@
/* $NetBSD: vidcvideo.c,v 1.12 2002/06/19 22:42:02 bjh21 Exp $ */
/* $NetBSD: vidcvideo.c,v 1.13 2002/07/04 14:43:48 junyoung 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.12 2002/06/19 22:42:02 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.13 2002/07/04 14:43:48 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -359,7 +359,7 @@ vidcvideo_attach(parent, self, aux)
printf(" : non console (no kbd yet) ");
vidcvideo_getdevconfig(videomemory.vidm_vbase, sc->sc_dc);
vidcvideo_config_wscons(sc->sc_dc);
(*sc->sc_dc->rinfo.ri_ops.alloc_attr)(&sc->sc_dc->rinfo, 0, 0, 0, &defattr);
(*sc->sc_dc->rinfo.ri_ops.allocattr)(&sc->sc_dc->rinfo, 0, 0, 0, &defattr);
};
sc->nscreens = 1;
} else {
@ -527,7 +527,7 @@ vidcvideo_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*curyp = 0;
vidcvideo_getdevconfig(videomemory.vidm_vbase, dc);
vidcvideo_config_wscons(dc);
(*dc->rinfo.ri_ops.alloc_attr)(&dc->rinfo, 0, 0, 0, &defattr);
(*dc->rinfo.ri_ops.allocattr)(&dc->rinfo, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
@ -572,7 +572,7 @@ vidcvideo_cnattach(addr)
vidcvideo_init();
vidcvideo_getdevconfig(addr, dcp);
vidcvideo_config_wscons(dcp);
(*dcp->rinfo.ri_ops.alloc_attr)(&dcp->rinfo, 0, 0, 0, &defattr);
(*dcp->rinfo.ri_ops.allocattr)(&dcp->rinfo, 0, 0, 0, &defattr);
wsdisplay_cnattach(&vidcvideo_stdscreen, &dcp->rinfo, 0, 0, defattr);
vidcvideo_is_console = 1;

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

@ -1,4 +1,4 @@
/* $NetBSD: pfb.c,v 1.8 2002/03/17 19:40:36 atatat Exp $ */
/* $NetBSD: pfb.c,v 1.9 2002/07/04 14:43:49 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -70,7 +70,7 @@ struct wsdisplay_emulops pfb_emulops = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
rcons_alloc_attr
rcons_allocattr
};
struct wsscreen_descr pfb_stdscreen = {
@ -253,7 +253,7 @@ pfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = &sc->sc_dc->dc_rcons; /* one and only for now */
*curxp = 0;
*curyp = 0;
rcons_alloc_attr(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
rcons_allocattr(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return 0;
@ -292,7 +292,7 @@ pfb_cnattach(addr)
long defattr;
pfb_common_init(addr, dc);
rcons_alloc_attr(&dc->dc_rcons, 0, 0, 0, &defattr);
rcons_allocattr(&dc->dc_rcons, 0, 0, 0, &defattr);
wsdisplay_cnattach(&pfb_stdscreen, &dc->dc_rcons, 0, 0, defattr);
pfb_is_console = 1;

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

@ -1,4 +1,4 @@
/* $NetBSD: pvr.c,v 1.12 2002/05/03 04:42:08 thorpej Exp $ */
/* $NetBSD: pvr.c,v 1.13 2002/07/04 14:43:49 junyoung 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.12 2002/05/03 04:42:08 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.13 2002/07/04 14:43:49 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -421,7 +421,7 @@ pvr_alloc_screen(void *v, const struct wsscreen_descr *type,
*cookiep = &sc->sc_dc->rinfo; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*sc->sc_dc->rinfo.ri_ops.alloc_attr)(&sc->sc_dc->rinfo, 0, 0, 0,
(*sc->sc_dc->rinfo.ri_ops.allocattr)(&sc->sc_dc->rinfo, 0, 0, 0,
&defattr);
*attrp = defattr;
sc->nscreens++;
@ -596,7 +596,7 @@ pvrcninit(struct consdev *cndev)
long defattr;
pvr_getdevconfig(dcp);
(*dcp->rinfo.ri_ops.alloc_attr)(&dcp->rinfo, 0, 0, 0, &defattr);
(*dcp->rinfo.ri_ops.allocattr)(&dcp->rinfo, 0, 0, 0, &defattr);
wsdisplay_cnattach(&pvr_stdscreen, &dcp->rinfo, 0, 0, defattr);
pvr_is_console = 1;

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

@ -1,4 +1,4 @@
/* $NetBSD: lunafb.c,v 1.7 2002/03/17 19:40:42 atatat Exp $ */
/* $NetBSD: lunafb.c,v 1.8 2002/07/04 14:43:49 junyoung 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.7 2002/03/17 19:40:42 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.8 2002/07/04 14:43:49 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -224,7 +224,7 @@ omfb_cnattach()
long defattr;
omfb_getdevconfig(OMFB_FB_WADDR, dc);
(*omfb_emulops.alloc_attr)(&dc->dc_rcons, 0, 0, 0, &defattr);
(*omfb_emulops.allocattr)(&dc->dc_rcons, 0, 0, 0, &defattr);
wsdisplay_cnattach(&omfb_stdscreen, &dc->dc_rcons, 0, 0, defattr);
omfb_console = 1;
return (0);
@ -471,7 +471,7 @@ omfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = &sc->sc_dc->dc_rcons; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*omfb_emulops.alloc_attr)(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
(*omfb_emulops.allocattr)(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);

10
sys/arch/luna68k/dev/omrasops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: omrasops.c,v 1.2 2002/05/30 21:09:54 thorpej Exp $ */
/* $NetBSD: omrasops.c,v 1.3 2002/07/04 14:43:49 junyoung 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: omrasops.c,v 1.2 2002/05/30 21:09:54 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.3 2002/07/04 14:43:49 junyoung Exp $");
/*
* Designed speficically for 'm68k bitorder';
@ -68,7 +68,7 @@ static void om_copycols __P((void *, int, int, int, int));
static void om_copyrows __P((void *, int, int, int num));
static void om_erasecols __P((void *, int, int, int, long));
static void om_eraserows __P((void *, int, int, long));
static int om_alloc_attr __P((void *, int, int, int, long *));
static int om_allocattr __P((void *, int, int, int, long *));
struct wsdisplay_emulops omfb_emulops = {
om_cursor,
@ -78,7 +78,7 @@ struct wsdisplay_emulops omfb_emulops = {
om_erasecols,
om_copyrows,
om_eraserows,
om_alloc_attr
om_allocattr
};
#define ALL1BITS (~0U)
@ -465,7 +465,7 @@ om_cursor(cookie, on, row, col)
* Allocate attribute. We just pack these into an integer.
*/
static int
om_alloc_attr(id, fg, bg, flags, attrp)
om_allocattr(id, fg, bg, flags, attrp)
void *id;
int fg, bg, flags;
long *attrp;

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

@ -1,4 +1,4 @@
/* $NetBSD: macfb.c,v 1.6 2002/03/17 19:40:43 atatat Exp $ */
/* $NetBSD: macfb.c,v 1.7 2002/07/04 14:43:50 junyoung Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@ -70,7 +70,7 @@ const struct wsdisplay_emulops macfb_emulops = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
rcons_alloc_attr
rcons_allocattr
};
struct wsscreen_descr macfb_stdscreen = {
@ -330,7 +330,7 @@ macfb_alloc_screen(v, type, cookiep, curxp, curyp, defattrp)
*cookiep = &sc->sc_dc->dc_rcons; /* one and only for now */
*curxp = 0;
*curyp = 0;
rcons_alloc_attr(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
rcons_allocattr(&sc->sc_dc->dc_rcons, 0, 0, 0, &defattr);
*defattrp = defattr;
sc->nscreens++;
return (0);
@ -382,7 +382,7 @@ macfb_cnattach(addr)
/* set up the display */
macfb_init(&macfb_console_dc);
rcons_alloc_attr(&dc->dc_rcons, 0, 0, 0, &defattr);
rcons_allocattr(&dc->dc_rcons, 0, 0, 0, &defattr);
wsdisplay_cnattach(&macfb_stdscreen, &dc->dc_rcons,
0, 0, defattr);

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

@ -1,4 +1,4 @@
/* $NetBSD: ofb.c,v 1.27 2002/06/24 21:08:37 nathanw Exp $ */
/* $NetBSD: ofb.c,v 1.28 2002/07/04 14:43:50 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -408,7 +408,7 @@ ofb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return 0;
@ -469,7 +469,7 @@ ofb_cnattach()
crow = 0;
}
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&ofb_stdscreen, ri, 0, crow, defattr);
return 0;

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

@ -1,4 +1,4 @@
/* $NetBSD: xafb.c,v 1.2 2002/03/17 19:40:46 atatat Exp $ */
/* $NetBSD: xafb.c,v 1.3 2002/07/04 14:43:50 junyoung Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@ -315,7 +315,7 @@ xafb_alloc_screen(v, scrdesc, cookiep, ccolp, crowp, attrp)
*cookiep = ri;
*ccolp = *crowp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->sc_nscreens++;
@ -363,7 +363,7 @@ xafb_cnattach()
crow = 0; /* XXX current cursor pos */
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&xafb_stdscreen, &dc->dc_ri, 0, crow, defattr);
return 0;

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

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.11 2002/05/31 21:40:49 thorpej Exp $ */
/* $NetBSD: fb.c,v 1.12 2002/07/04 14:43:50 junyoung Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@ -304,7 +304,7 @@ fb_alloc_screen(v, scrdesc, cookiep, ccolp, crowp, attrp)
*cookiep = ri;
*ccolp = *crowp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->sc_nscreens++;
@ -348,7 +348,7 @@ fb_cnattach()
dc->dc_fbbase = NWB253_VRAM;
fb_common_init(dc);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&fb_stdscreen, ri, 0, ri->ri_rows - 1, defattr);
}

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

@ -1,4 +1,4 @@
/* $NetBSD: nextdisplay.c,v 1.7 2002/03/17 19:40:46 atatat Exp $ */
/* $NetBSD: nextdisplay.c,v 1.8 2002/07/04 14:43:51 junyoung Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@ -67,7 +67,7 @@ const struct wsdisplay_emulops nextdisplay_mono_emulops = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
rcons_alloc_attr
rcons_allocattr
};
struct wsscreen_descr nextdisplay_mono = {
@ -343,10 +343,10 @@ nextdisplay_alloc_screen(v, type, cookiep, curxp, curyp, defattrp)
*cookiep = &sc->sc_dc->dc_rcons; /* one and only for now */
*curxp = 0;
*curyp = 0;
rcons_alloc_attr(&sc->sc_dc->dc_rcons, 0, 0,
(strcmp(type->name, "color") == 0)
? 0
: WSATTR_REVERSE, &defattr);
rcons_allocattr(&sc->sc_dc->dc_rcons, 0, 0,
(strcmp(type->name, "color") == 0)
? 0
: WSATTR_REVERSE, &defattr);
*defattrp = defattr;
sc->nscreens++;
#if 0
@ -408,8 +408,8 @@ nextdisplay_cnattach(void)
/* set up the display */
nextdisplay_init(&nextdisplay_console_dc, iscolor);
rcons_alloc_attr(&dc->dc_rcons, 0, 0,
iscolor ? 0 : WSATTR_REVERSE, &defattr);
rcons_allocattr(&dc->dc_rcons, 0, 0,
iscolor ? 0 : WSATTR_REVERSE, &defattr);
wsdisplay_cnattach(iscolor ? &nextdisplay_color : &nextdisplay_mono,
&dc->dc_rcons, 0, 0, defattr);

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

@ -1,4 +1,4 @@
/* $NetBSD: gsfb.c,v 1.3 2002/03/17 19:40:48 atatat Exp $ */
/* $NetBSD: gsfb.c,v 1.4 2002/07/04 14:43:51 junyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -203,7 +203,7 @@ STATIC void _gsfb_copycols(void *, int, int, int, int);
STATIC void _gsfb_erasecols(void *, int, int, int, long);
STATIC void _gsfb_copyrows(void *, int, int, int);
STATIC void _gsfb_eraserows(void *, int, int, long);
STATIC int _gsfb_alloc_attr(void *, int, 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 proc *);
@ -231,7 +231,7 @@ const struct wsdisplay_emulops _gsfb_emulops = {
.erasecols = _gsfb_erasecols,
.copyrows = _gsfb_copyrows,
.eraserows = _gsfb_eraserows,
.alloc_attr = _gsfb_alloc_attr
.allocattr = _gsfb_allocattr
};
const struct wsscreen_descr _gsfb_std_screen = {
@ -496,7 +496,7 @@ _gsfb_eraserows(void *cookie, int row, int nrow, long attr)
}
int
_gsfb_alloc_attr(void *cookie, int fg, int bg, int flags, long *attr)
_gsfb_allocattr(void *cookie, int fg, int bg, int flags, long *attr)
{
if ((flags & WSATTR_BLINK) != 0)

10
sys/arch/pmax/dev/px.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: px.c,v 1.38 2002/03/13 15:05:20 ad Exp $ */
/* $NetBSD: px.c,v 1.39 2002/07/04 14:43:51 junyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.38 2002/03/13 15:05:20 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.39 2002/07/04 14:43:51 junyoung Exp $");
/*
* px.c: driver for the DEC TURBOchannel 2D and 3D accelerated framebuffers
@ -143,7 +143,7 @@ static void px_copycols __P((void *, int, int, int, int));
static void px_copyrows __P((void *, int, int, int num));
static void px_erasecols __P((void *, int, int, int num, long));
static void px_eraserows __P((void *, int, int, long));
static int px_alloc_attr __P((void *, int, int, int, long *));
static int px_allocattr __P((void *, int, int, int, long *));
static int px_mapchar __P((void *, int, unsigned int *));
static struct wsdisplay_emulops px_emulops = {
@ -154,7 +154,7 @@ static struct wsdisplay_emulops px_emulops = {
px_erasecols,
px_copyrows,
px_eraserows,
px_alloc_attr
px_allocattr
};
/* Colormap for wscons, matching WSCOL_*. Upper 8 are high-intensity */
@ -1246,7 +1246,7 @@ px_rect(pxi, x, y, w, h, color)
* Allocate attribute. We just pack these into an integer.
*/
static int
px_alloc_attr(cookie, fg, bg, flags, attr)
px_allocattr(cookie, fg, bg, flags, attr)
void *cookie;
int fg, bg, flags;
long *attr;

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

@ -1,4 +1,4 @@
/* $NetBSD: gten.c,v 1.4 2002/03/17 19:40:49 atatat Exp $ */
/* $NetBSD: gten.c,v 1.5 2002/07/04 14:43:52 junyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -313,7 +313,7 @@ gten_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
gt->gt_nscreens++;
return 0;
@ -381,7 +381,7 @@ gten_cnattach(pci_chipset_tag_t pc, bus_space_tag_t memt)
gten_common_init(ri);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&gten_stdscreen, ri, 0, 0, defattr);
gten_console_pcitag = tag;

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

@ -1,4 +1,4 @@
/* $NetBSD: smg.c,v 1.30 2002/06/10 20:52:11 ragge Exp $ */
/* $NetBSD: smg.c,v 1.31 2002/07/04 14:43:52 junyoung Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -127,7 +127,7 @@ static void smg_copycols(void *, int, int, int,int);
static void smg_erasecols(void *, int, int, int, long);
static void smg_copyrows(void *, int, int, int);
static void smg_eraserows(void *, int, int, long);
static int smg_alloc_attr(void *, int, int, int, long *);
static int smg_allocattr(void *, int, int, int, long *);
const struct wsdisplay_emulops smg_emulops = {
smg_cursor,
@ -137,7 +137,7 @@ const struct wsdisplay_emulops smg_emulops = {
smg_erasecols,
smg_copyrows,
smg_eraserows,
smg_alloc_attr
smg_allocattr
};
const struct wsscreen_descr smg_stdscreen = {
@ -401,7 +401,7 @@ smg_eraserows(void *id, int startrow, int nrows, long fillattr)
}
static int
smg_alloc_attr(void *id, int fg, int bg, int flags, long *attrp)
smg_allocattr(void *id, int fg, int bg, int flags, long *attrp)
{
*attrp = flags;
return 0;

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

@ -1,4 +1,4 @@
/* $NetBSD: hpcfb.c,v 1.20 2002/05/10 22:01:13 uwe Exp $ */
/* $NetBSD: hpcfb.c,v 1.21 2002/07/04 14:37:10 junyoung Exp $ */
/*-
* Copyright (c) 1999
@ -43,13 +43,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.20 2002/05/10 22:01:13 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.21 2002/07/04 14:37:10 junyoung 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.20 2002/05/10 22:01:13 uwe Exp $";
"$NetBSD: hpcfb.c,v 1.21 2002/07/04 14:37:10 junyoung Exp $";
#include <sys/param.h>
#include <sys/systm.h>
@ -215,7 +215,7 @@ void hpcfb_erasecols(void *, int, int, int, long);
void hpcfb_redraw(void *, int, int, int);
void hpcfb_copyrows(void *, int, int, int);
void hpcfb_eraserows(void *, int, int, long);
int hpcfb_alloc_attr(void *, int, int, int, long *);
int hpcfb_allocattr(void *, int, int, int, long *);
void hpcfb_cursor_raw(void *, int, int, int);
#ifdef HPCFB_JUMP
@ -232,7 +232,7 @@ struct wsdisplay_emulops hpcfb_emulops = {
hpcfb_erasecols,
hpcfb_copyrows,
hpcfb_eraserows,
hpcfb_alloc_attr
hpcfb_allocattr
};
/*
@ -430,8 +430,8 @@ hpcfb_cnattach(struct hpcfb_fbconf *fbconf)
hpcfb_console_wsscreen.nrows = hpcfb_console_dc.dc_rows;
hpcfb_console_wsscreen.ncols = hpcfb_console_dc.dc_cols;
hpcfb_console_wsscreen.capabilities = hpcfb_console_dc.dc_rinfo.ri_caps;
hpcfb_alloc_attr(&hpcfb_console_dc,
WSCOL_WHITE, WSCOL_BLACK, 0, &defattr);
hpcfb_allocattr(&hpcfb_console_dc,
WSCOL_WHITE, WSCOL_BLACK, 0, &defattr);
wsdisplay_cnattach(&hpcfb_console_wsscreen, &hpcfb_console_dc,
0, 0, defattr);
hpcfbconsole = 1;
@ -756,7 +756,7 @@ hpcfb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
*curxp = 0;
*curyp = 0;
*cookiep = dc;
hpcfb_alloc_attr(*cookiep, WSCOL_WHITE, WSCOL_BLACK, 0, attrp);
hpcfb_allocattr(*cookiep, WSCOL_WHITE, WSCOL_BLACK, 0, attrp);
DPRINTF(("%s(%d): hpcfb_alloc_screen(): 0x%p\n",
__FILE__, __LINE__, dc));
@ -1515,13 +1515,13 @@ hpcfb_eraserows(void *cookie, int row, int nrow, long attr)
}
/*
* alloc_attr
* allocattr
*/
int
hpcfb_alloc_attr(void *cookie, int fg, int bg, int flags, long *attrp)
hpcfb_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
{
struct hpcfb_devconfig *dc = (struct hpcfb_devconfig *)cookie;
struct rasops_info *ri = &dc->dc_rinfo;
return (rasops_emul.alloc_attr(ri, fg, bg, flags, attrp));
return (rasops_emul.allocattr(ri, fg, bg, flags, attrp));
}

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

@ -1,4 +1,4 @@
/* $NetBSD: igsfb.c,v 1.2 2002/04/05 03:29:05 uwe Exp $ */
/* $NetBSD: igsfb.c,v 1.3 2002/07/04 14:37:11 junyoung Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@ -31,7 +31,7 @@
* Integraphics Systems IGA 1682 and (untested) CyberPro 2k.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.2 2002/04/05 03:29:05 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.3 2002/07/04 14:37:11 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -282,7 +282,7 @@ igsfb_common_attach(sc, isconsole)
*/
if (isconsole) {
long defattr;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&igsfb_stdscreen, ri, 0, 0, defattr);
}

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

@ -1,4 +1,4 @@
/* $NetBSD: vga.c,v 1.58 2002/07/01 16:56:09 drochner Exp $ */
/* $NetBSD: vga.c,v 1.59 2002/07/04 14:37:11 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.58 2002/07/01 16:56:09 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.59 2002/07/04 14:37:11 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -111,7 +111,7 @@ void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
static void vga_setfont(struct vga_config *, struct vgascreen *);
static int vga_mapchar(void *, int, unsigned int *);
static int vga_alloc_attr(void *, int, int, int, long *);
static int vga_allocattr(void *, int, int, int, long *);
static void vga_copyrows(void *, int, int, int);
const struct wsdisplay_emulops vga_emulops = {
@ -122,7 +122,7 @@ const struct wsdisplay_emulops vga_emulops = {
pcdisplay_erasecols,
vga_copyrows,
pcdisplay_eraserows,
vga_alloc_attr
vga_allocattr
};
/*
@ -525,11 +525,11 @@ vga_init_screen(struct vga_config *vc, struct vgascreen *scr,
/*
* DEC firmware uses a blue background.
*/
res = vga_alloc_attr(scr, WSCOL_WHITE, WSCOL_BLUE,
res = vga_allocattr(scr, WSCOL_WHITE, WSCOL_BLUE,
WSATTR_WSCOLORS, attrp);
else
#endif
res = vga_alloc_attr(scr, 0, 0, 0, attrp);
res = vga_allocattr(scr, 0, 0, 0, attrp);
#ifdef DIAGNOSTIC
if (res)
panic("vga_init_screen: attribute botch");
@ -1053,7 +1053,7 @@ vga_load_font(void *v, void *cookie, struct wsdisplay_font *data)
}
static int
vga_alloc_attr(void *id, int fg, int bg, int flags, long *attrp)
vga_allocattr(void *id, int fg, int bg, int flags, long *attrp)
{
struct vgascreen *scr = id;
struct vga_config *vc = scr->cfg;

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

@ -1,4 +1,4 @@
/* $NetBSD: ega.c,v 1.9 2002/03/17 19:40:59 atatat Exp $ */
/* $NetBSD: ega.c,v 1.10 2002/07/04 14:37:11 junyoung Exp $ */
/*
* Copyright (c) 1999
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.9 2002/03/17 19:40:59 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.10 2002/07/04 14:37:11 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -119,7 +119,7 @@ void ega_init_screen __P((struct ega_config *, struct egascreen *,
static void ega_init __P((struct ega_config *,
bus_space_tag_t, bus_space_tag_t, int));
static void ega_setfont __P((struct ega_config *, struct egascreen *));
static int ega_alloc_attr __P((void *, int, int, int, long *));
static int ega_allocattr __P((void *, int, int, int, long *));
void ega_copyrows __P((void *, int, int, int));
struct cfattach ega_ca = {
@ -134,7 +134,7 @@ const struct wsdisplay_emulops ega_emulops = {
pcdisplay_erasecols,
ega_copyrows,
pcdisplay_eraserows,
ega_alloc_attr
ega_allocattr
};
/*
@ -388,7 +388,7 @@ ega_init_screen(vc, scr, type, existing, attrp)
scr->pcs.vc_ccol = cpos % type->ncols;
pcdisplay_cursor_init(&scr->pcs, existing);
res = ega_alloc_attr(scr, 0, 0, 0, attrp);
res = ega_allocattr(scr, 0, 0, 0, attrp);
#ifdef DIAGNOSTIC
if (res)
panic("ega_init_screen: attribute botch");
@ -849,7 +849,7 @@ ega_load_font(v, cookie, data)
}
static int
ega_alloc_attr(id, fg, bg, flags, attrp)
ega_allocattr(id, fg, bg, flags, attrp)
void *id;
int fg, bg;
int flags;

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

@ -1,4 +1,4 @@
/* $NetBSD: pcdisplay.c,v 1.17 2002/03/17 19:40:59 atatat Exp $ */
/* $NetBSD: pcdisplay.c,v 1.18 2002/07/04 14:37:11 junyoung Exp $ */
/*
* Copyright (c) 1998
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.17 2002/03/17 19:40:59 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.18 2002/07/04 14:37:11 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -86,7 +86,7 @@ static int pcdisplay_probe_mono __P((bus_space_tag_t, bus_space_tag_t));
static void pcdisplay_init __P((struct pcdisplay_config *,
bus_space_tag_t, bus_space_tag_t,
int));
static int pcdisplay_alloc_attr __P((void *, int, int, int, long *));
static int pcdisplay_allocattr __P((void *, int, int, int, long *));
struct cfattach pcdisplay_ca = {
sizeof(struct pcdisplay_softc), pcdisplay_match, pcdisplay_attach,
@ -100,7 +100,7 @@ const struct wsdisplay_emulops pcdisplay_emulops = {
pcdisplay_erasecols,
pcdisplay_copyrows,
pcdisplay_eraserows,
pcdisplay_alloc_attr
pcdisplay_allocattr
};
const struct wsscreen_descr pcdisplay_scr = {
@ -456,7 +456,7 @@ pcdisplay_show_screen(v, cookie, waitok, cb, cbarg)
}
static int
pcdisplay_alloc_attr(id, fg, bg, flags, attrp)
pcdisplay_allocattr(id, fg, bg, flags, attrp)
void *id;
int fg, bg;
int flags;

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

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.41 2002/03/17 19:41:00 atatat Exp $ */
/* $NetBSD: tga.c,v 1.42 2002/07/04 14:37:11 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.41 2002/03/17 19:41:00 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.42 2002/07/04 14:37:11 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -703,7 +703,7 @@ tga_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = &sc->sc_dc->dc_rinfo; /* one and only for now */
*curxp = 0;
*curyp = 0;
sc->sc_dc->dc_rinfo.ri_ops.alloc_attr(&sc->sc_dc->dc_rinfo,
sc->sc_dc->dc_rinfo.ri_ops.allocattr(&sc->sc_dc->dc_rinfo,
0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
@ -775,7 +775,7 @@ tga_cnattach(iot, memt, pc, bus, device, function)
tga_bt463_rd);
}
}
dcp->dc_rinfo.ri_ops.alloc_attr(&dcp->dc_rinfo, 0, 0, 0, &defattr);
dcp->dc_rinfo.ri_ops.allocattr(&dcp->dc_rinfo, 0, 0, 0, &defattr);
wsdisplay_cnattach(&tga_stdscreen, &dcp->dc_rinfo, 0, 0, defattr);
return(0);

8
sys/dev/rasops/rasops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rasops.c,v 1.39 2002/03/13 15:05:15 ad Exp $ */
/* $NetBSD: rasops.c,v 1.40 2002/07/04 14:37:12 junyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.39 2002/03/13 15:05:15 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.40 2002/07/04 14:37:12 junyoung Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@ -260,10 +260,10 @@ rasops_reconfig(ri, wantrows, wantcols)
ri->ri_do_cursor = rasops_do_cursor;
if (ri->ri_depth < 8 || (ri->ri_flg & RI_FORCEMONO) != 0) {
ri->ri_ops.alloc_attr = rasops_alloc_mattr;
ri->ri_ops.allocattr = rasops_alloc_mattr;
ri->ri_caps = WSSCREEN_UNDERLINE | WSSCREEN_REVERSE;
} else {
ri->ri_ops.alloc_attr = rasops_alloc_cattr;
ri->ri_ops.allocattr = rasops_alloc_cattr;
ri->ri_caps = WSSCREEN_UNDERLINE | WSSCREEN_HILIT |
WSSCREEN_WSCOLORS | WSSCREEN_REVERSE;
}

8
sys/dev/rcons/rcons_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcons_subr.c,v 1.10 2001/11/15 09:48:15 lukem Exp $ */
/* $NetBSD: rcons_subr.c,v 1.11 2002/07/04 14:37:12 junyoung Exp $ */
/*
* Copyright (c) 1991, 1993
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.10 2001/11/15 09:48:15 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.11 2002/07/04 14:37:12 junyoung Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@ -92,7 +92,7 @@ rcons_init_ops(rc)
rc->rc_supwsflg = 0;
for (i = 1; i < 256; i <<= 1)
if (rc->rc_ops->alloc_attr(rc->rc_cookie, 0, 0, i, &tmp) == 0)
if (rc->rc_ops->allocattr(rc->rc_cookie, 0, 0, i, &tmp) == 0)
rc->rc_supwsflg |= i;
/* Allocate kernel output attribute */
@ -531,7 +531,7 @@ rcons_setcolor(rc, fg, bg)
flg = (rc->rc_wsflg | WSATTR_WSCOLORS) & rc->rc_supwsflg;
rc->rc_bgcolor = bg;
rc->rc_fgcolor = fg;
rc->rc_ops->alloc_attr(rc->rc_cookie, fg, bg, flg, &rc->rc_attr);
rc->rc_ops->allocattr(rc->rc_cookie, fg, bg, flg, &rc->rc_attr);
}

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

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.32 2002/03/17 19:41:02 atatat Exp $ */
/* $NetBSD: cfb.c,v 1.33 2002/07/04 14:37:13 junyoung 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.32 2002/03/17 19:41:02 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.33 2002/07/04 14:37:13 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -453,7 +453,7 @@ cfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);
@ -494,7 +494,7 @@ cfb_cnattach(addr)
ri = &cfb_console_ri;
ri->ri_hw = (void *)addr;
cfb_common_init(ri);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&cfb_stdscreen, ri, 0, 0, defattr);
cfb_consaddr = addr;
return(0);

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

@ -1,4 +1,4 @@
/* $NetBSD: mfb.c,v 1.32 2002/03/17 19:41:02 atatat Exp $ */
/* $NetBSD: mfb.c,v 1.33 2002/07/04 14:37:13 junyoung 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.32 2002/03/17 19:41:02 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.33 2002/07/04 14:37:13 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -432,7 +432,7 @@ mfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);
@ -473,7 +473,7 @@ mfb_cnattach(addr)
ri = &mfb_console_ri;
ri->ri_hw = (void *)addr;
mfb_common_init(ri);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&mfb_stdscreen, ri, 0, 0, defattr);
mfb_consaddr = addr;
return (0);

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

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.51 2002/03/17 19:41:02 atatat Exp $ */
/* $NetBSD: sfb.c,v 1.52 2002/07/04 14:37:13 junyoung 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.51 2002/03/17 19:41:02 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.52 2002/07/04 14:37:13 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -480,7 +480,7 @@ sfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);
@ -521,7 +521,7 @@ sfb_cnattach(addr)
ri = &sfb_console_ri;
ri->ri_hw = (void *)addr;
sfb_common_init(ri);
(*ri->ri_ops.alloc_attr)(&ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(&ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&sfb_stdscreen, ri, 0, 0, defattr);
sfb_consaddr = addr;
return (0);

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

@ -1,4 +1,4 @@
/* $NetBSD: sfbplus.c,v 1.14 2002/03/17 19:41:03 atatat Exp $ */
/* $NetBSD: sfbplus.c,v 1.15 2002/07/04 14:37:13 junyoung 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.14 2002/03/17 19:41:03 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.15 2002/07/04 14:37:13 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -524,7 +524,7 @@ sfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);
@ -565,7 +565,7 @@ sfbp_cnattach(addr)
ri = &sfbp_console_ri;
ri->ri_hw = (void *)addr;
sfbp_common_init(ri);
(*ri->ri_ops.alloc_attr)(&ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(&ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&sfbp_stdscreen, ri, 0, 0, defattr);
sfbp_consaddr = addr;
return (0);

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

@ -1,4 +1,4 @@
/* $NetBSD: stic.c,v 1.17 2002/03/17 19:41:03 atatat Exp $ */
/* $NetBSD: stic.c,v 1.18 2002/07/04 14:37:13 junyoung 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.17 2002/03/17 19:41:03 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.18 2002/07/04 14:37:13 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -187,7 +187,7 @@ void stic_erasecols(void *, int, int, int, long);
void stic_eraserows(void *, int, int, long);
int stic_mapchar(void *, int, u_int *);
void stic_putchar(void *, int, int, u_int, long);
int stic_alloc_attr(void *, int, int, int, long *);
int stic_allocattr(void *, int, int, int, long *);
/* Colormap for wscons, matching WSCOL_*. Upper 8 are high-intensity. */
static const u_int8_t stic_cmap[16*3] = {
@ -269,7 +269,7 @@ static const struct wsdisplay_emulops stic_emulops = {
stic_erasecols,
stic_copyrows,
stic_eraserows,
stic_alloc_attr
stic_allocattr
};
static struct wsscreen_descr stic_stdscreen = {
@ -471,7 +471,7 @@ stic_cnattach(struct stic_info *si)
si->si_flags |= SI_CURENB_CHANGED;
stic_flush(si);
stic_alloc_attr(ss, 0, 0, 0, &defattr);
stic_allocattr(ss, 0, 0, 0, &defattr);
stic_eraserows(ss, 0, si->si_consh, 0);
wsdisplay_cnattach(&stic_stdscreen, ss, 0, 0, defattr);
}
@ -666,7 +666,7 @@ stic_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
*curxp = 0;
*curyp = 0;
stic_alloc_attr(ss, 0, 0, 0, attrp);
stic_allocattr(ss, 0, 0, 0, attrp);
return (0);
}
@ -779,7 +779,7 @@ stic_do_switch(void *cookie)
}
int
stic_alloc_attr(void *cookie, int fg, int bg, int flags, long *attr)
stic_allocattr(void *cookie, int fg, int bg, int flags, long *attr)
{
long tmp;

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

@ -1,4 +1,4 @@
/* $NetBSD: tfb.c,v 1.34 2002/03/17 19:41:03 atatat Exp $ */
/* $NetBSD: tfb.c,v 1.35 2002/07/04 14:37:14 junyoung 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.34 2002/03/17 19:41:03 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.35 2002/07/04 14:37:14 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -514,7 +514,7 @@ tfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);
@ -555,7 +555,7 @@ tfb_cnattach(addr)
ri = &tfb_console_ri;
ri->ri_hw = (void *)addr;
tfb_common_init(ri);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&tfb_stdscreen, ri, 0, 0, defattr);
tfb_consaddr = addr;
return (0);

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

@ -1,4 +1,4 @@
/* $NetBSD: xcfb.c,v 1.27 2002/03/17 19:41:03 atatat Exp $ */
/* $NetBSD: xcfb.c,v 1.28 2002/07/04 14:37:14 junyoung 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.27 2002/03/17 19:41:03 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.28 2002/07/04 14:37:14 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -325,7 +325,7 @@ xcfb_cnattach()
ri = &xcfb_console_ri;
ri->ri_hw = (void *)ioasic_base;
xcfb_common_init(ri);
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
wsdisplay_cnattach(&xcfb_stdscreen, ri, 0, 0, defattr);
xcfb_consaddr = MIPS_PHYS_TO_KSEG1(XINE_PHYS_CFB_START);
return (0);
@ -490,7 +490,7 @@ xcfb_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
*cookiep = ri; /* one and only for now */
*curxp = 0;
*curyp = 0;
(*ri->ri_ops.alloc_attr)(ri, 0, 0, 0, &defattr);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
*attrp = defattr;
sc->nscreens++;
return (0);

4
sys/dev/wscons/wscons_raster.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wscons_raster.h,v 1.6 2001/10/13 15:56:15 augustss Exp $ */
/* $NetBSD: wscons_raster.h,v 1.7 2002/07/04 14:37:14 junyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@ -91,6 +91,6 @@ void rcons_copycols(void *, int, int, int, int);
void rcons_erasecols(void *, int, int, int, long);
void rcons_copyrows(void *, int, int, int);
void rcons_eraserows(void *, int, int, long);
int rcons_alloc_attr(void *, int, int, int, long *);
int rcons_allocattr(void *, int, int, int, long *);
#endif /* _DEV_PSEUDO_RCONS_H_ */

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

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplayvar.h,v 1.21 2002/06/26 23:05:37 christos Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.22 2002/07/04 14:37:14 junyoung Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -56,7 +56,7 @@ struct wsdisplay_emulops {
void (*erasecols)(void *c, int row, int startcol, int ncols, long);
void (*copyrows)(void *c, int srcrow, int dstrow, int nrows);
void (*eraserows)(void *c, int row, int nrows, long);
int (*alloc_attr)(void *c, int fg, int bg, int flags, long *);
int (*allocattr)(void *c, int fg, int bg, int flags, long *);
/* fg / bg values. Made identical to ANSI terminal color codes. */
#define WSCOL_BLACK 0
#define WSCOL_RED 1

22
sys/dev/wscons/wsemul_sun.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsemul_sun.c,v 1.14 2001/10/14 21:49:00 veego Exp $ */
/* $NetBSD: wsemul_sun.c,v 1.15 2002/07/04 14:37:14 junyoung Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -33,7 +33,7 @@
/* XXX DESCRIPTION/SOURCE OF INFORMATION */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.14 2001/10/14 21:49:00 veego Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.15 2002/07/04 14:37:14 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,12 +143,12 @@ wsemul_sun_cnattach(const struct wsscreen_descr *type, void *cookie,
#define WS_KERNEL_MONOATTR 0
#endif
if (type->capabilities & WSSCREEN_WSCOLORS)
res = (*edp->emulops->alloc_attr)(cookie,
res = (*edp->emulops->allocattr)(cookie,
WS_KERNEL_FG, WS_KERNEL_BG,
WS_KERNEL_COLATTR | WSATTR_WSCOLORS,
&edp->kernattr);
else
res = (*edp->emulops->alloc_attr)(cookie, 0, 0,
res = (*edp->emulops->allocattr)(cookie, 0, 0,
WS_KERNEL_MONOATTR,
&edp->kernattr);
if (res)
@ -201,14 +201,14 @@ wsemul_sun_attach(int console, const struct wsscreen_descr *type,
/* XXX This assumes that the default attribute is wob. */
if ((!(edp->scrcapabilities & WSSCREEN_WSCOLORS) ||
(*edp->emulops->alloc_attr)(edp->emulcookie,
WSCOL_BLACK, WSCOL_WHITE,
WSATTR_WSCOLORS,
&edp->bowattr)) &&
(*edp->emulops->allocattr)(edp->emulcookie,
WSCOL_BLACK, WSCOL_WHITE,
WSATTR_WSCOLORS,
&edp->bowattr)) &&
(!(edp->scrcapabilities & WSSCREEN_REVERSE) ||
(*edp->emulops->alloc_attr)(edp->emulcookie, 0, 0,
WSATTR_REVERSE,
&edp->bowattr)))
(*edp->emulops->allocattr)(edp->emulcookie, 0, 0,
WSATTR_REVERSE,
&edp->bowattr)))
edp->bowattr = edp->defattr;
edp->curattr = edp->defattr;

8
sys/dev/wscons/wsemul_vt100.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsemul_vt100.c,v 1.17 2002/01/12 16:41:02 tsutsui Exp $ */
/* $NetBSD: wsemul_vt100.c,v 1.18 2002/07/04 14:37:14 junyoung Exp $ */
/*
* Copyright (c) 1998
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.17 2002/01/12 16:41:02 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.18 2002/07/04 14:37:14 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -168,12 +168,12 @@ wsemul_vt100_cnattach(const struct wsscreen_descr *type, void *cookie,
#define WS_KERNEL_MONOATTR 0
#endif
if (type->capabilities & WSSCREEN_WSCOLORS)
res = (*edp->emulops->alloc_attr)(cookie,
res = (*edp->emulops->allocattr)(cookie,
WS_KERNEL_FG, WS_KERNEL_BG,
WS_KERNEL_COLATTR | WSATTR_WSCOLORS,
&edp->kernattr);
else
res = (*edp->emulops->alloc_attr)(cookie, 0, 0,
res = (*edp->emulops->allocattr)(cookie, 0, 0,
WS_KERNEL_MONOATTR,
&edp->kernattr);
if (res)

12
sys/dev/wscons/wsemul_vt100_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsemul_vt100_subr.c,v 1.10 2001/11/13 06:17:47 lukem Exp $ */
/* $NetBSD: wsemul_vt100_subr.c,v 1.11 2002/07/04 14:37:15 junyoung Exp $ */
/*
* Copyright (c) 1998
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.10 2001/11/13 06:17:47 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.11 2002/07/04 14:37:15 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -633,8 +633,8 @@ vt100_selectattribute(struct wsemul_vt100_emuldata *edp,
printf("colors ignored (impossible)\n");
#endif
}
error = (*edp->emulops->alloc_attr)(edp->emulcookie, fgcol, bgcol,
flags & WSATTR_WSCOLORS, bkgdattr);
error = (*edp->emulops->allocattr)(edp->emulcookie, fgcol, bgcol,
flags & WSATTR_WSCOLORS, bkgdattr);
if (error)
return (error);
@ -685,8 +685,8 @@ vt100_selectattribute(struct wsemul_vt100_emuldata *edp,
#endif
}
}
error = (*edp->emulops->alloc_attr)(edp->emulcookie, fgcol, bgcol,
flags, attr);
error = (*edp->emulops->allocattr)(edp->emulcookie, fgcol, bgcol,
flags, attr);
if (error)
return (error);