diff options
| -rw-r--r-- | sys/i386/isa/vga_isa.c | 8 | ||||
| -rw-r--r-- | sys/isa/vga_isa.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/i386/isa/vga_isa.c b/sys/i386/isa/vga_isa.c index 5ec67a83b3c9..8164a73e76d9 100644 --- a/sys/i386/isa/vga_isa.c +++ b/sys/i386/isa/vga_isa.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: vga_isa.c,v 1.1.2.1 1999/02/07 03:03:26 yokota Exp $ + * $Id: vga_isa.c,v 1.1.2.2 1999/03/15 00:20:56 yokota Exp $ */ #include "vga.h" @@ -454,7 +454,7 @@ static video_info_t bios_vmode[] = { GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, { M_VGA_CG320, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8, 8, 8, 1, GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, - { M_VGA_MODEX, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8, 8, 8, 1, + { M_VGA_MODEX, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8, 8, 8, 4, GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, #endif /* VGA_NO_MODE_CHANGE */ @@ -849,7 +849,9 @@ update_adapter_info(video_adapter_t *adp, video_info_t *info) adp->va_buffer = BIOS_PADDRTOVADDR(info->vi_buffer); adp->va_buffer_size = info->vi_buffer_size; } - if (info->vi_flags & V_INFO_GRAPHICS) { + if (info->vi_mode == M_VGA_MODEX) { + adp->va_line_width = info->vi_width/2; + } else if (info->vi_flags & V_INFO_GRAPHICS) { switch (info->vi_depth/info->vi_planes) { case 1: adp->va_line_width = info->vi_width/8; diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c index e6cb95d6caf9..06469ab56381 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: vga_isa.c,v 1.5.2.1 1999/05/07 09:02:03 dfr Exp $ */ #include "vga.h" @@ -457,7 +457,7 @@ static video_info_t bios_vmode[] = { GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, { M_VGA_CG320, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 200, 8, 8, 8, 1, GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, - { M_VGA_MODEX, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8, 8, 8, 1, + { M_VGA_MODEX, V_INFO_COLOR | V_INFO_GRAPHICS, 320, 240, 8, 8, 8, 4, GRAPHICS_BUF_BASE, GRAPHICS_BUF_SIZE, GRAPHICS_BUF_SIZE, 0, 0 }, #endif /* VGA_NO_MODE_CHANGE */ @@ -851,7 +851,9 @@ update_adapter_info(video_adapter_t *adp, video_info_t *info) adp->va_buffer = BIOS_PADDRTOVADDR(info->vi_buffer); adp->va_buffer_size = info->vi_buffer_size; } - if (info->vi_flags & V_INFO_GRAPHICS) { + if (info->vi_mode == M_VGA_MODEX) { + adp->va_line_width = info->vi_width/2; + } else if (info->vi_flags & V_INFO_GRAPHICS) { switch (info->vi_depth/info->vi_planes) { case 1: adp->va_line_width = info->vi_width/8; |