29c29
< * $Id$
---
> * $Id: vesa.c,v 1.1 1998/09/15 18:16:38 sos Exp $
136c136,137
< static int translate_flags(u_int16_t vflags);
---
> static int vesa_map_gen_mode_num(int type, int color, int mode);
> static int vesa_translate_flags(u_int16_t vflags);
138c139
< static void clear_modes(video_info_t *info, int color);
---
> static void vesa_clear_modes(video_info_t *info, int color);
284a286
> /* map a generic video mode to a known mode */
286c288
< translate_flags(u_int16_t vflags)
---
> vesa_map_gen_mode_num(int type, int color, int mode)
287a290,310
> static struct {
> int from;
> int to;
> } mode_map[] = {
> { M_TEXT_132x25, M_VESA_C132x25 },
> { M_TEXT_132x43, M_VESA_C132x43 },
> { M_TEXT_132x50, M_VESA_C132x50 },
> { M_TEXT_132x60, M_VESA_C132x60 },
> };
> int i;
>
> for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) {
> if (mode_map[i].from == mode)
> return mode_map[i].to;
> }
> return mode;
> }
>
> static int
> vesa_translate_flags(u_int16_t vflags)
> {
376,377c399,400
< vesa_vmode[modes].vi_flags = translate_flags(vmode.v_modeattr)
< | V_INFO_VESA;
---
> vesa_vmode[modes].vi_flags
> = vesa_translate_flags(vmode.v_modeattr) | V_INFO_VESA;
389c412
< clear_modes(video_info_t *info, int color)
---
> vesa_clear_modes(video_info_t *info, int color)
434a458,460
>
> mode = vesa_map_gen_mode_num(vesa_adp->va_type,
> vesa_adp->va_flags & V_ADP_COLOR, mode);
492a519,520
> mode = vesa_map_gen_mode_num(vesa_adp->va_type,
> vesa_adp->va_flags & V_ADP_COLOR, mode);
699a728,732
> #ifndef VESA_MODULE
> /* call the previous handler first */
> (*prevvidsw.diag)(level);
> #endif
>
809,811c842,844
< clear_modes(vesa_vmode,
< (vesa_adp->va_flags & V_ADP_COLOR) ?
< V_INFO_COLOR : 0);
---
> vesa_clear_modes(vesa_vmode,
> (vesa_adp->va_flags & V_ADP_COLOR) ?
> V_INFO_COLOR : 0);