Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys alloc_attr -> allocattr
details: https://anonhg.NetBSD.org/src/rev/6fd9b8a4f16c
branches: trunk
changeset: 533578:6fd9b8a4f16c
user: junyoung <junyoung%NetBSD.org@localhost>
date: Thu Jul 04 14:37:10 2002 +0000
description:
alloc_attr -> allocattr
Approved by Matthias Drochner.
diffstat:
sys/arch/acorn26/vidc/arcvideo.c | 8 ++++----
sys/arch/amiga/dev/amidisplaycc.c | 10 +++++-----
sys/arch/arm/iomd/vidcvideo.c | 10 +++++-----
sys/arch/bebox/pci/pfb.c | 8 ++++----
sys/arch/dreamcast/dev/pvr.c | 8 ++++----
sys/arch/luna68k/dev/lunafb.c | 8 ++++----
sys/arch/luna68k/dev/omrasops.c | 10 +++++-----
sys/arch/mac68k/dev/macfb.c | 8 ++++----
sys/arch/macppc/dev/ofb.c | 6 +++---
sys/arch/newsmips/apbus/xafb.c | 6 +++---
sys/arch/newsmips/dev/fb.c | 6 +++---
sys/arch/next68k/dev/nextdisplay.c | 16 ++++++++--------
sys/arch/playstation2/ee/gsfb.c | 8 ++++----
sys/arch/pmax/dev/px.c | 10 +++++-----
sys/arch/prep/pci/gten.c | 6 +++---
sys/arch/vax/vsa/smg.c | 8 ++++----
sys/dev/hpc/hpcfb.c | 22 +++++++++++-----------
sys/dev/ic/igsfb.c | 6 +++---
sys/dev/ic/vga.c | 14 +++++++-------
sys/dev/isa/ega.c | 12 ++++++------
sys/dev/isa/pcdisplay.c | 10 +++++-----
sys/dev/pci/tga.c | 8 ++++----
sys/dev/rasops/rasops.c | 8 ++++----
sys/dev/rcons/rcons_subr.c | 8 ++++----
sys/dev/tc/cfb.c | 8 ++++----
sys/dev/tc/mfb.c | 8 ++++----
sys/dev/tc/sfb.c | 8 ++++----
sys/dev/tc/sfbplus.c | 8 ++++----
sys/dev/tc/stic.c | 14 +++++++-------
sys/dev/tc/tfb.c | 8 ++++----
sys/dev/tc/xcfb.c | 8 ++++----
sys/dev/wscons/wscons_raster.h | 4 ++--
sys/dev/wscons/wsdisplayvar.h | 4 ++--
sys/dev/wscons/wsemul_sun.c | 22 +++++++++++-----------
sys/dev/wscons/wsemul_vt100.c | 8 ++++----
sys/dev/wscons/wsemul_vt100_subr.c | 12 ++++++------
36 files changed, 168 insertions(+), 168 deletions(-)
diffs (truncated from 1388 to 300 lines):
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/acorn26/vidc/arcvideo.c
--- a/sys/arch/acorn26/vidc/arcvideo.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/acorn26/vidc/arcvideo.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
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 */
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/amiga/dev/amidisplaycc.c
--- a/sys/arch/amiga/dev/amidisplaycc.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/amiga/dev/amidisplaycc.c Thu Jul 04 14:37:10 2002 +0000
@@ -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_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 @@
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 @@
* 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;
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/arm/iomd/vidcvideo.c
--- a/sys/arch/arm/iomd/vidcvideo.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/arm/iomd/vidcvideo.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
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 @@
*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_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;
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/bebox/pci/pfb.c
--- a/sys/arch/bebox/pci/pfb.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/bebox/pci/pfb.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
- rcons_alloc_attr
+ rcons_allocattr
};
struct wsscreen_descr pfb_stdscreen = {
@@ -253,7 +253,7 @@
*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 @@
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;
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/dreamcast/dev/pvr.c
--- a/sys/arch/dreamcast/dev/pvr.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/dreamcast/dev/pvr.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
*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 @@
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;
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/luna68k/dev/lunafb.c
--- a/sys/arch/luna68k/dev/lunafb.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/luna68k/dev/lunafb.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
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 @@
*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);
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/luna68k/dev/omrasops.c
--- a/sys/arch/luna68k/dev/omrasops.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/luna68k/dev/omrasops.c Thu Jul 04 14:37:10 2002 +0000
@@ -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_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 @@
om_erasecols,
om_copyrows,
om_eraserows,
- om_alloc_attr
+ om_allocattr
};
#define ALL1BITS (~0U)
@@ -465,7 +465,7 @@
* 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;
diff -r 089e661e62a3 -r 6fd9b8a4f16c sys/arch/mac68k/dev/macfb.c
--- a/sys/arch/mac68k/dev/macfb.c Thu Jul 04 14:16:56 2002 +0000
+++ b/sys/arch/mac68k/dev/macfb.c Thu Jul 04 14:37:10 2002 +0000
@@ -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 @@
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
- rcons_alloc_attr
+ rcons_allocattr
};
struct wsscreen_descr macfb_stdscreen = {
@@ -330,7 +330,7 @@
*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);
Home |
Main Index |
Thread Index |
Old Index