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, 8 insertions, 8 deletions

diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 3cdf980..3953137 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -54,7 +54,7 @@
 #define SET_ORIGIN(adp, o) do {				\
 	int oo = o;					\
 	if (oo != last_origin)				\
-	    set_origin(adp, last_origin = oo);		\
+	    vidd_set_win_org(adp, last_origin = oo);	\
 	} while (0)
 
 static u_char		*vid;
@@ -71,7 +71,7 @@ rain_update(video_adapter_t *adp)
 	for (i = MAX; i > 1; i--)
 		rain_pal[BLUE(i)] = rain_pal[BLUE(i - 1)];
 	rain_pal[BLUE(1)] = t;
-	load_palette(adp, rain_pal);
+	vidd_load_palette(adp, rain_pal);
 }
 
 static int
@@ -85,9 +85,9 @@ rain_saver(video_adapter_t *adp, int blank)
 		/* switch to graphics mode */
 		if (blanked <= 0) {
 			pl = splhigh();
-			set_video_mode(adp, scrmode);
-			load_palette(adp, rain_pal);
-			set_border(adp, 0);
+			vidd_set_mode(adp, scrmode);
+			vidd_load_palette(adp, rain_pal);
+			vidd_set_border(adp, 0);
 			blanked++;
 			vid = (u_char *)adp->va_window;
 			banksize = adp->va_window_size;
@@ -141,11 +141,11 @@ rain_init(video_adapter_t *adp)
 	video_info_t info;
 	int i;
 	
-	if (!get_mode_info(adp, M_VGA_CG320, &info)) {
+	if (!vidd_get_info(adp, M_VGA_CG320, &info)) {
 		scrmode = M_VGA_CG320;
-	} else if (!get_mode_info(adp, M_PC98_PEGC640x480, &info)) {
+	} else if (!vidd_get_info(adp, M_PC98_PEGC640x480, &info)) {
 		scrmode = M_PC98_PEGC640x480;
-	} else if (!get_mode_info(adp, M_PC98_PEGC640x400, &info)) {
+	} else if (!vidd_get_info(adp, M_PC98_PEGC640x400, &info)) {
 		scrmode = M_PC98_PEGC640x400;
 	} else {
 		log(LOG_NOTICE,