Retire various intertwined bits of fbd(4) and vt_fb, in particular the

pixel modification indirection. No actual drivers use it and those that
might (e.g. creatorfb) use custom implementations of vd_bitbltchr().

1 files changed, 0 insertions, 21 deletions

diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index d1f12dd..a88e305 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -115,19 +115,6 @@ struct fb_info;
 
 typedef int fb_enter_t(void *priv);
 typedef int fb_leave_t(void *priv);
-typedef int fb_write_t(void *priv, int offset, void *data, int size);
-typedef int fb_read_t(void *priv, int offset, void *data, int size);
-
-/* XXX: should use priv instead of fb_info too. */
-typedef void fb_copy_t(struct fb_info *sc, uint32_t offset_to, uint32_t offset_from,
-    uint32_t size);
-typedef void fb_wr1_t(struct fb_info *sc, uint32_t offset, uint8_t value);
-typedef void fb_wr2_t(struct fb_info *sc, uint32_t offset, uint16_t value);
-typedef void fb_wr4_t(struct fb_info *sc, uint32_t offset, uint32_t value);
-
-typedef int fb_ioctl_t(struct cdev *, u_long, caddr_t, int, struct thread *);
-typedef int fb_mmap_t(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
-    int prot, vm_memattr_t *memattr);
 
 struct fb_info {
 	/* Raw copy of fbtype. Do not change. */
@@ -138,16 +125,8 @@ struct fb_info {
 	int		fb_cmsize;	/* size of color map (entries) */
 	int		fb_size;	/* total size in bytes */
 
-	/* Methods. */
-	fb_write_t	*fb_write;	/* if NULL, direct mem write. */
-	fb_read_t	*fb_read;	/* if NULL, direct mem read. */
-
 	struct cdev 	*fb_cdev;
 
-	fb_wr1_t	*wr1;
-	fb_wr2_t	*wr2;
-	fb_wr4_t	*wr4;
-	fb_copy_t	*copy;
 	fb_enter_t	*enter;
 	fb_leave_t	*leave;