svn commit: r271684 - in head/sys: dev/vt/hw/efifb dev/vt/hw/fb powerpc/ps3

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Tue Sep 16 18:02:24 2014
New Revision: 271684
URL: http://svnweb.freebsd.org/changeset/base/271684

Log:
  vt(4): Use vt_fb_drawrect() and vt_fb_setpixel() in all vt_fb-derivative
  
  Review:		https://reviews.freebsd.org/D789
  Reviewed by:	nwhitehorn
  Approved by:	nwhitehorn
  MFC after:	2 days

Modified:
  head/sys/dev/vt/hw/efifb/efifb.c
  head/sys/dev/vt/hw/fb/vt_early_fb.c
  head/sys/dev/vt/hw/fb/vt_fb.c
  head/sys/dev/vt/hw/fb/vt_fb.h
  head/sys/powerpc/ps3/ps3_syscons.c

Modified: head/sys/dev/vt/hw/efifb/efifb.c
==============================================================================
--- head/sys/dev/vt/hw/efifb/efifb.c	Tue Sep 16 17:47:13 2014	(r271683)
+++ head/sys/dev/vt/hw/efifb/efifb.c	Tue Sep 16 18:02:24 2014	(r271684)
@@ -62,6 +62,8 @@ static struct vt_driver vt_efifb_driver 
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_fb_ioctl = vt_fb_ioctl,
 	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */

Modified: head/sys/dev/vt/hw/fb/vt_early_fb.c
==============================================================================
--- head/sys/dev/vt/hw/fb/vt_early_fb.c	Tue Sep 16 17:47:13 2014	(r271683)
+++ head/sys/dev/vt/hw/fb/vt_early_fb.c	Tue Sep 16 18:02:24 2014	(r271684)
@@ -61,6 +61,8 @@ static struct vt_driver vt_fb_early_driv
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_priority = VD_PRIORITY_GENERIC,
 };
 

Modified: head/sys/dev/vt/hw/fb/vt_fb.c
==============================================================================
--- head/sys/dev/vt/hw/fb/vt_fb.c	Tue Sep 16 17:47:13 2014	(r271683)
+++ head/sys/dev/vt/hw/fb/vt_fb.c	Tue Sep 16 18:02:24 2014	(r271684)
@@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/vt/hw/fb/vt_fb.h>
 #include <dev/vt/colors/vt_termcolors.h>
 
-static vd_drawrect_t	vt_fb_drawrect;
-static vd_setpixel_t	vt_fb_setpixel;
-
 static struct vt_driver vt_fb_driver = {
 	.vd_name = "fb",
 	.vd_init = vt_fb_init,
@@ -146,7 +143,7 @@ vt_fb_mmap(struct vt_device *vd, vm_ooff
 	return (EINVAL);
 }
 
-static void
+void
 vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 {
 	struct fb_info *info;
@@ -181,7 +178,7 @@ vt_fb_setpixel(struct vt_device *vd, int
 
 }
 
-static void
+void
 vt_fb_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2, int fill,
     term_color_t color)
 {

Modified: head/sys/dev/vt/hw/fb/vt_fb.h
==============================================================================
--- head/sys/dev/vt/hw/fb/vt_fb.h	Tue Sep 16 17:47:13 2014	(r271683)
+++ head/sys/dev/vt/hw/fb/vt_fb.h	Tue Sep 16 18:02:24 2014	(r271684)
@@ -40,6 +40,8 @@ vd_init_t		vt_fb_init;
 vd_blank_t		vt_fb_blank;
 vd_bitblt_text_t	vt_fb_bitblt_text;
 vd_bitblt_bmp_t		vt_fb_bitblt_bitmap;
+vd_drawrect_t		vt_fb_drawrect;
+vd_setpixel_t		vt_fb_setpixel;
 vd_postswitch_t		vt_fb_postswitch;
 vd_fb_ioctl_t		vt_fb_ioctl;
 vd_fb_mmap_t		vt_fb_mmap;

Modified: head/sys/powerpc/ps3/ps3_syscons.c
==============================================================================
--- head/sys/powerpc/ps3/ps3_syscons.c	Tue Sep 16 17:47:13 2014	(r271683)
+++ head/sys/powerpc/ps3/ps3_syscons.c	Tue Sep 16 18:02:24 2014	(r271684)
@@ -78,6 +78,8 @@ static struct vt_driver vt_ps3fb_driver 
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_fb_ioctl = vt_fb_ioctl,
 	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */