29c29
< * $Id: vga_isa.c,v 1.1 1999/01/09 02:44:41 yokota Exp $
---
> * $Id: vga_isa.c,v 1.1 1999/01/23 16:53:30 dfr Exp $
239c239
< (*sw->diag)(sc->adp, bootverbose);
---
> (*vidsw[sc->adp->va_index]->diag)(sc->adp, bootverbose);
303c303
< 0, 0, 0, 7, 0, 0, NULL },
---
> 0, 0, 0, 7, 0, },
307c307
< 0, 0, 0, 3, 0, 0, NULL },
---
> 0, 0, 0, 3, 0, },
311c311
< 0, 0, 0, 3, 0, 0, NULL },
---
> 0, 0, 0, 3, 0, },
315c315
< 0, 0, 0, 7, 0, 0, NULL },
---
> 0, 0, 0, 7, 0, },
319c319
< 0, 0, 0, 3, 0, 0, NULL },
---
> 0, 0, 0, 3, 0, },
323c323
< 0, 0, 0, 3, 0, 0, NULL },
---
> 0, 0, 0, 3, 0, },
492a493
> static void update_adapter_info(video_adapter_t *adp, video_info_t *info);
834a836,860
> static void
> update_adapter_info(video_adapter_t *adp, video_info_t *info)
> {
> adp->va_flags &= ~V_ADP_COLOR;
> adp->va_flags |=
> (info->vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
> adp->va_crtc_addr =
> (adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
> adp->va_window = BIOS_PADDRTOVADDR(info->vi_window);
> adp->va_window_size = info->vi_window_size;
> adp->va_window_gran = info->vi_window_gran;
> if (info->vi_buffer_size == 0) {
> adp->va_buffer = 0;
> adp->va_buffer_size = 0;
> } else {
> adp->va_buffer = BIOS_PADDRTOVADDR(info->vi_buffer);
> adp->va_buffer_size = info->vi_buffer_size;
> }
> if (info->vi_flags & V_INFO_GRAPHICS)
> adp->va_line_width = info->vi_width/8;
> else
> adp->va_line_width = info->vi_width;
> bcopy(info, &adp->va_info, sizeof(adp->va_info));
> }
>
980,983d1005
< #if 0
< biosadapter[V_ADP_PRIMARY].va_index = V_ADP_PRIMARY;
< biosadapter[V_ADP_SECONDARY].va_index = V_ADP_SECONDARY;
< #endif
1148,1159c1170
< biosadapter[V_ADP_PRIMARY].va_mode_flags = info.vi_flags;
< biosadapter[V_ADP_PRIMARY].va_window = BIOS_PADDRTOVADDR(info.vi_window);
< biosadapter[V_ADP_PRIMARY].va_window_size = info.vi_window_size;
< biosadapter[V_ADP_PRIMARY].va_window_gran = info.vi_window_gran;
< if (info.vi_buffer_size == 0) {
< biosadapter[V_ADP_PRIMARY].va_buffer = 0;
< biosadapter[V_ADP_PRIMARY].va_buffer_size = 0;
< } else {
< biosadapter[V_ADP_PRIMARY].va_buffer
< = BIOS_PADDRTOVADDR(info.vi_buffer);
< biosadapter[V_ADP_PRIMARY].va_buffer_size = info.vi_buffer_size;
< }
---
> update_adapter_info(&biosadapter[V_ADP_PRIMARY], &info);
1164,1176c1175
< biosadapter[V_ADP_SECONDARY].va_mode_flags = info.vi_flags;
< biosadapter[V_ADP_SECONDARY].va_window =
< BIOS_PADDRTOVADDR(info.vi_window);
< biosadapter[V_ADP_SECONDARY].va_window_size = info.vi_window_size;
< biosadapter[V_ADP_SECONDARY].va_window_gran = info.vi_window_gran;
< if (info.vi_buffer_size == 0) {
< biosadapter[V_ADP_SECONDARY].va_buffer = 0;
< biosadapter[V_ADP_SECONDARY].va_buffer_size = 0;
< } else {
< biosadapter[V_ADP_SECONDARY].va_buffer =
< BIOS_PADDRTOVADDR(info.vi_buffer);
< biosadapter[V_ADP_SECONDARY].va_buffer_size = info.vi_buffer_size;
< }
---
> update_adapter_info(&biosadapter[V_ADP_SECONDARY], &info);
1432,1447c1431
< adp->va_mode_flags = info.vi_flags;
< adp->va_flags &= ~V_ADP_COLOR;
< adp->va_flags |=
< (info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
< adp->va_crtc_addr =
< (adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
< adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
< adp->va_window_size = info.vi_window_size;
< adp->va_window_gran = info.vi_window_gran;
< if (info.vi_buffer_size == 0) {
< adp->va_buffer = 0;
< adp->va_buffer_size = 0;
< } else {
< adp->va_buffer = BIOS_PADDRTOVADDR(info.vi_buffer);
< adp->va_buffer_size = info.vi_buffer_size;
< }
---
> update_adapter_info(adp, &info);
2013d1996
< video_info_t info;
2020,2021c2003
< (*vidsw[adp->va_index]->get_info)(adp, adp->va_mode, &info);
< if (info.vi_flags & V_INFO_GRAPHICS)
---
> if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
2031,2032c2013,2014
< *row = off / info.vi_width;
< *col = off % info.vi_width;
---
> *row = off / adp->va_info.vi_width;
> *col = off % adp->va_info.vi_width;
2047d2028
< video_info_t info;
2057,2058c2038
< (*vidsw[adp->va_index]->get_info)(adp, adp->va_mode, &info);
< if (info.vi_flags & V_INFO_GRAPHICS)
---
> if (adp->va_info.vi_flags & V_INFO_GRAPHICS)
2060c2040
< off = row*info.vi_width + col;
---
> off = row*adp->va_info.vi_width + col;