summaryrefslogtreecommitdiffstats
path: root/sys/arch/sgi/dev/gbe.c
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-05-25 06:45:25 +0000
committerjsg <jsg@openbsd.org>2020-05-25 06:45:25 +0000
commitfc223b232cff7e51a9474209d53006b4ae5898e7 (patch)
treed686bcf653c8636db97661bfec3b878368cb166d /sys/arch/sgi/dev/gbe.c
parentKill unused cdev_pc_init(). (diff)
downloadwireguard-openbsd-fc223b232cff7e51a9474209d53006b4ae5898e7.tar.xz
wireguard-openbsd-fc223b232cff7e51a9474209d53006b4ae5898e7.zip
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/sgi/dev/gbe.c')
-rw-r--r--sys/arch/sgi/dev/gbe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sgi/dev/gbe.c b/sys/arch/sgi/dev/gbe.c
index fb862387e9c..437a7c5508b 100644
--- a/sys/arch/sgi/dev/gbe.c
+++ b/sys/arch/sgi/dev/gbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gbe.c,v 1.21 2013/10/21 10:36:16 miod Exp $ */
+/* $OpenBSD: gbe.c,v 1.22 2020/05/25 06:45:25 jsg Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Joel Sing <jsing@openbsd.org>
@@ -401,7 +401,7 @@ gbe_attach(struct device *parent, struct device *self, void *aux)
/* Attach as console if necessary. */
if (strncmp(bios_console, "video", 5) == 0) {
- screen->ri.ri_ops.alloc_attr(&screen->ri, 0, 0, 0, &attr);
+ screen->ri.ri_ops.pack_attr(&screen->ri, 0, 0, 0, &attr);
wsdisplay_cnattach(&gbe_stdscreen, &screen->ri, 0, 0, attr);
gsc->console = 1;
}
@@ -964,7 +964,7 @@ gbe_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
*curyp = 0;
/* Correct screen attributes. */
- screen->ri.ri_ops.alloc_attr(&screen->ri, 0, 0, 0, attrp);
+ screen->ri.ri_ops.pack_attr(&screen->ri, 0, 0, 0, attrp);
return (0);
}
@@ -1402,7 +1402,7 @@ gbe_cnattach(bus_space_tag_t iot, bus_addr_t addr)
/*
* Attach wsdisplay.
*/
- gbe_consdata.ri.ri_ops.alloc_attr(&gbe_consdata.ri, 0, 0, 0, &attr);
+ gbe_consdata.ri.ri_ops.pack_attr(&gbe_consdata.ri, 0, 0, 0, &attr);
wsdisplay_cnattach(&gbe_stdscreen, &gbe_consdata.ri, 0, 0, attr);
gbe_console = 1;