Replace explicit calls to video methods with their respective variants

implemented with macros. This patch improves code readability. Reasoning
behind vidd_* is a sort of "video discipline".

List of macros is supposed to be complete--all methods of video_switch
ought to have their respective macros from now on.

Functionally, this code should be no-op. My intention is to leave current
behaviour of touched code as is.

No objections:	rwatson
Silence on:	freebsd-current@
Approved by:	cognet

1 files changed, 4 insertions, 5 deletions

diff --git a/sys/i386/xbox/xboxfb.c b/sys/i386/xbox/xboxfb.c
index fa9decb..906ced5 100644
--- a/sys/i386/xbox/xboxfb.c
+++ b/sys/i386/xbox/xboxfb.c
@@ -360,13 +360,13 @@ xbr_draw(scr_stat* scp, int from, int count, int flip)
 
 	if (!flip) {
 		/* Normal printing */
-		(*vidsw[scp->sc->adapter]->puts)(adp, from, (uint16_t*)sc_vtb_pointer(&scp->vtb, from), count);
+		vidd_puts(adp, from, (uint16_t*)sc_vtb_pointer(&scp->vtb, from), count);
 	} else {	
 		/* This is for selections and such: invert the color attribute */
 		for (i = count; i-- > 0; ++from) {
 			c = sc_vtb_getc(&scp->vtb, from);
 			a = sc_vtb_geta(&scp->vtb, from) >> 8;
-			(*vidsw[scp->sc->adapter]->putc)(adp, from, c, (a >> 4) | ((a & 0xf) << 4));
+			vidd_putc(adp, from, c, (a >> 4) | ((a & 0xf) << 4));
 		}
 	}
 }
@@ -414,7 +414,7 @@ xbr_set_mouse(scr_stat* scp)
 static void
 xbr_draw_mouse(scr_stat* scp, int x, int y, int on)
 {
-	(*vidsw[scp->sc->adapter]->putm)(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8);
+	vidd_putm(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8);
 
 }
 
@@ -624,8 +624,7 @@ xboxfb_puts(video_adapter_t *adp, vm_offset_t off, u_int16_t *s, int len)
 	int i;
 
 	for (i = 0; i < len; i++) {
-		(*vidsw[adp->va_index]->putc)(adp, off + i, s[i] & 0xff,
-		    (s[i] & 0xff00) >> 8);
+		vidd_putc(adp, off + i, s[i] & 0xff, (s[i] & 0xff00) >> 8);
 	}
 	return (0);
 }