diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-05-25 06:45:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-05-25 06:45:27 +0000 |
| commit | 3e39b250169e8ef15507000e9603f0a5558e90da (patch) | |
| tree | bc7d06cc23253bebf59e60d5313c9eab983e0364 /sys/arch/luna88k/dev | |
| parent | 1d7dc5e6a2e9035f5991e4762929b6cf6ec25621 (diff) | |
rename wsdisplay alloc_attr() to pack_attr()
Suggested by John Carmack. miod agrees a rename would make sense and
explained it was initially thought drivers may need to allocate storage
but in practice they don't need more than 32 bits for an attribute.
ok mpi@
Diffstat (limited to 'sys/arch/luna88k/dev')
| -rw-r--r-- | sys/arch/luna88k/dev/lunafb.c | 6 | ||||
| -rw-r--r-- | sys/arch/luna88k/dev/omrasops.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c index 80d39488b9c..4ec577993f5 100644 --- a/sys/arch/luna88k/dev/lunafb.c +++ b/sys/arch/luna88k/dev/lunafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lunafb.c,v 1.25 2017/11/03 06:54:06 aoyama Exp $ */ +/* $OpenBSD: lunafb.c,v 1.26 2020/05/25 06:45:25 jsg Exp $ */ /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */ /*- @@ -221,7 +221,7 @@ omfb_cnattach(void) long defattr; omfb_getdevconfig(OMFB_FB_WADDR, dc); - ri->ri_ops.alloc_attr(ri, 0, 0, 0, &defattr); + ri->ri_ops.pack_attr(ri, 0, 0, 0, &defattr); wsdisplay_cnattach(&omfb_stdscreen, ri, 0, 0, defattr); omfb_console = 1; return (0); @@ -480,7 +480,7 @@ omfb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, *cookiep = ri; *curxp = 0; *curyp = 0; - ri->ri_ops.alloc_attr(ri, 0, 0, 0, attrp); + ri->ri_ops.pack_attr(ri, 0, 0, 0, attrp); sc->nscreens++; return (0); } diff --git a/sys/arch/luna88k/dev/omrasops.c b/sys/arch/luna88k/dev/omrasops.c index 5c7cb6f2b15..70328f2df3e 100644 --- a/sys/arch/luna88k/dev/omrasops.c +++ b/sys/arch/luna88k/dev/omrasops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omrasops.c,v 1.14 2017/03/20 19:37:54 miod Exp $ */ +/* $OpenBSD: omrasops.c,v 1.15 2020/05/25 06:45:25 jsg Exp $ */ /* $NetBSD: omrasops.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */ /*- @@ -74,7 +74,7 @@ int om4_windowmove(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t); /* MI function in src/sys/dev/rasops/rasops.c */ -int rasops_alloc_cattr(void *, int, int, int, long *); +int rasops_pack_cattr(void *, int, int, int, long *); static int (*om_windowmove)(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t); @@ -534,8 +534,8 @@ setup_omrasops4(struct rasops_info *ri) = WSSCREEN_HILIT | WSSCREEN_WSCOLORS | WSSCREEN_REVERSE; /* * Since we set ri->ri_depth == 1, rasops_init() set - * rasops_alloc_mattr for us. But we use the color version, - * rasops_alloc_cattr, on 4bpp/8bpp frame buffer. + * rasops_pack_mattr for us. But we use the color version, + * rasops_pack_cattr, on 4bpp/8bpp frame buffer. */ - ri->ri_ops.alloc_attr = rasops_alloc_cattr; + ri->ri_ops.pack_attr = rasops_pack_cattr; } |