31c31
< "$Id: vidcontrol.c,v 1.26 1999/01/12 23:05:45 mjacob Exp $";
---
> "$Id: vidcontrol.c,v 1.27 1999/01/25 08:48:49 dfr Exp $";
265d264
< #ifdef SW_TEXT_80x25
276d274
< #endif
281a280,286
> #ifdef SW_VGA_C90x25
> { "VGA_90x25", SW_VGA_C90x25 },
> { "VGA_90x30", SW_VGA_C90x30 },
> { "VGA_90x43", SW_VGA_C90x43 },
> { "VGA_90x50", SW_VGA_C90x50 },
> { "VGA_90x60", SW_VGA_C90x60 },
> #endif
292a298,299
> int cur_mode;
> int ioerr;
295a303,304
> if (ioctl(0, CONS_GET, &cur_mode) < 0)
> err(1, "cannot get the current video mode");
311,312c320,327
< if (ioctl(0, KDRASTER, size))
< warn("cannot activate raster display");
---
> if (ioctl(0, KDRASTER, size)) {
> ioerr = errno;
> if (cur_mode >= M_VESA_BASE)
> ioctl(0, _IO('V', cur_mode), NULL);
> else
> ioctl(0, _IO('S', cur_mode), NULL);
> warnc(ioerr, "cannot activate raster display");
> }
420a436
> { KD_TGA, "TGA" },
448a465,471
> printf(" frame buffer window:0x%x, buffer size:0x%x\n",
> ad.va_window, ad.va_buffer_size);
> printf(" window size:0x%x, origin:0x%x\n",
> ad.va_window_size, ad.va_window_orig);
> printf(" display start address (%d, %d), scan line width:%d\n",
> ad.va_disp_start.x, ad.va_disp_start.y, ad.va_line_width);
> printf(" reserved:0x%x\n", ad.va_unused0);
466a490,491
> if (info.vi_mode != mode)
> continue;
487c512
< printf(" 0x%08x %2dk\n",
---
> printf(" 0x%08x %dk\n",