Add a font width argument to vi_load_font_t, vi_save_font_t and vi_putm_t

and do some preparations for handling 12x22 fonts (currently lots of code
implies and/or hardcodes a font width of 8 pixels). This will be required
on sparc64 which uses a default font size of 12x22 in order to add font
loading and saving support as well as to use a syscons(4)-supplied mouse
pointer image.
This API breakage is committed now so it can be MFC'ed in time for 6.0
and later on upcoming framebuffer drivers destined for use on sparc64
and which are expected to rely on using font loading internally and on
a syscons(4)-supplied mouse pointer image can be easily MFC'ed to
RELENG_6 rather than requiring a backport.

Tested on:	i386, sparc64, make universe
MFC after:	1 week

1 files changed, 8 insertions, 6 deletions

diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 854a68549cef..9935b9e414cd 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -305,17 +305,19 @@ s3lfb_set_mode(video_adapter_t *adp, int mode)
 }
 
 static int
-s3lfb_save_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
-	       int ch, int count)
+s3lfb_save_font(video_adapter_t *adp, int page, int fontsize, int fontwidth,
+	       u_char *data, int ch, int count)
 {
-	return (*prevvidsw->save_font)(adp, page, fontsize, data, ch, count);
+	return (*prevvidsw->save_font)(adp, page, fontsize, fontwidth, data,
+		ch, count);
 }
 
 static int
-s3lfb_load_font(video_adapter_t *adp, int page, int fontsize, u_char *data,
-	       int ch, int count)
+s3lfb_load_font(video_adapter_t *adp, int page, int fontsize, int fontwidth,
+	       u_char *data, int ch, int count)
 {
-	return (*prevvidsw->load_font)(adp, page, fontsize, data, ch, count);
+	return (*prevvidsw->load_font)(adp, page, fontsize, fontwidth, data,
+		ch, count);
 }
 
 static int