Add load_font and list_font accessops to all rasops-based wsdisplay drivers.

Trivial except for tga(4) and gpx(4/vax) which need a bit more care setting
up a new font.

8 files changed, 41 insertions, 9 deletions

diff --git a/sys/arch/hp300/dev/diofb.c b/sys/arch/hp300/dev/diofb.c
index 6cf5b4cd093..f452fc6c6bc 100644
--- a/sys/arch/hp300/dev/diofb.c
+++ b/sys/arch/hp300/dev/diofb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diofb.c,v 1.19 2013/09/28 21:10:58 miod Exp $	*/
+/*	$OpenBSD: diofb.c,v 1.20 2013/10/21 10:36:11 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -485,7 +485,7 @@ diofb_show_screen(void *v, void *cookie, int waitok,
 }
 
 paddr_t
-diofb_mmap(void * v, off_t offset, int prot)
+diofb_mmap(void *v, off_t offset, int prot)
 {
 	struct diofb *fb = v;
 
@@ -526,3 +526,21 @@ diofb_getcmap(struct diofb *fb, struct wsdisplay_cmap *cm)
 
 	return (0);
 }
+
+int
+diofb_load_font(void *v, void *emulcookie, struct wsdisplay_font *font)
+{
+	struct diofb *fb = v;
+	struct rasops_info *ri = &fb->ri;
+
+	return rasops_load_font(ri, emulcookie, font);
+}
+
+int
+diofb_list_font(void *v, struct wsdisplay_font *font)
+{
+	struct diofb *fb = v;
+	struct rasops_info *ri = &fb->ri;
+
+	return rasops_list_font(ri, font);
+}
diff --git a/sys/arch/hp300/dev/diofbvar.h b/sys/arch/hp300/dev/diofbvar.h
index 013fe7f33fb..8f1471450b5 100644
--- a/sys/arch/hp300/dev/diofbvar.h
+++ b/sys/arch/hp300/dev/diofbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diofbvar.h,v 1.10 2006/08/11 18:33:13 miod Exp $	*/
+/*	$OpenBSD: diofbvar.h,v 1.11 2013/10/21 10:36:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -123,6 +123,8 @@ void	diofb_free_screen(void *, void *);
 paddr_t	diofb_mmap(void *, off_t, int);
 int	diofb_show_screen(void *, void *, int, void (*)(void *, int, int),
 	    void *);
+int	diofb_load_font(void *, void *, struct wsdisplay_font *);
+int	diofb_list_font(void *, struct wsdisplay_font *);
 
 int	diofb_mono_windowmove(struct diofb *, u_int16_t, u_int16_t, u_int16_t,
 	    u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t);
diff --git a/sys/arch/hp300/dev/dvbox.c b/sys/arch/hp300/dev/dvbox.c
index f4ec5c4250a..44d24c6cd87 100644
--- a/sys/arch/hp300/dev/dvbox.c
+++ b/sys/arch/hp300/dev/dvbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvbox.c,v 1.14 2013/10/20 20:07:22 miod Exp $	*/
+/*	$OpenBSD: dvbox.c,v 1.15 2013/10/21 10:36:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -131,6 +131,8 @@ struct	wsdisplay_accessops	dvbox_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = dvbox_burner
 };
 
diff --git a/sys/arch/hp300/dev/gbox.c b/sys/arch/hp300/dev/gbox.c
index 8ed94cb7751..7ec25558432 100644
--- a/sys/arch/hp300/dev/gbox.c
+++ b/sys/arch/hp300/dev/gbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gbox.c,v 1.16 2013/10/20 20:07:22 miod Exp $	*/
+/*	$OpenBSD: gbox.c,v 1.17 2013/10/21 10:36:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -135,6 +135,8 @@ struct	wsdisplay_accessops	gbox_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = gbox_burner
 };
 
diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c
index 42dabf6a72a..70fe53af6d7 100644
--- a/sys/arch/hp300/dev/hyper.c
+++ b/sys/arch/hp300/dev/hyper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hyper.c,v 1.16 2013/10/20 20:07:22 miod Exp $	*/
+/*	$OpenBSD: hyper.c,v 1.17 2013/10/21 10:36:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -122,6 +122,8 @@ struct	wsdisplay_accessops hyper_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = hyper_burner
 };
 
diff --git a/sys/arch/hp300/dev/rbox.c b/sys/arch/hp300/dev/rbox.c
index 91e7ca353a7..610248573f7 100644
--- a/sys/arch/hp300/dev/rbox.c
+++ b/sys/arch/hp300/dev/rbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbox.c,v 1.15 2013/10/20 20:07:23 miod Exp $	*/
+/*	$OpenBSD: rbox.c,v 1.16 2013/10/21 10:36:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -131,6 +131,8 @@ struct	wsdisplay_accessops	rbox_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = rbox_burner
 };
 
diff --git a/sys/arch/hp300/dev/topcat.c b/sys/arch/hp300/dev/topcat.c
index 46d7607dfee..ce23ed7724c 100644
--- a/sys/arch/hp300/dev/topcat.c
+++ b/sys/arch/hp300/dev/topcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: topcat.c,v 1.17 2013/10/20 20:07:23 miod Exp $	*/
+/*	$OpenBSD: topcat.c,v 1.18 2013/10/21 10:36:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -134,6 +134,8 @@ struct	wsdisplay_accessops	topcat_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = topcat_burner
 };
 
diff --git a/sys/arch/hp300/dev/tvrx.c b/sys/arch/hp300/dev/tvrx.c
index 5403d792fd6..e441225b104 100644
--- a/sys/arch/hp300/dev/tvrx.c
+++ b/sys/arch/hp300/dev/tvrx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvrx.c,v 1.3 2013/10/20 20:07:23 miod Exp $	*/
+/*	$OpenBSD: tvrx.c,v 1.4 2013/10/21 10:36:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2006, 2011, Miodrag Vallat.
@@ -140,6 +140,8 @@ struct	wsdisplay_accessops	tvrx_accessops = {
 	.alloc_screen = diofb_alloc_screen,
 	.free_screen = diofb_free_screen,
 	.show_screen = diofb_show_screen,
+	.load_font = diofb_load_font,
+	.list_font = diofb_list_font,
 	.burn_screen = tvrx_burner
 };