From 4c29f34571d3855e6a141f86648f5e2660fc58d2 Mon Sep 17 00:00:00 2001 From: TC1995 Date: Sat, 18 Jan 2020 21:35:26 +0100 Subject: [PATCH] Fixed compile failure. --- src/video/vid_mga.c | 8 ++++---- src/video/vid_svga.c | 4 +++- src/video/vid_svga.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index 6af87d538..5da087e12 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -831,8 +831,8 @@ mystique_recalctimings(svga_t *svga) svga->bpp = 8; mem_mapping_set_handler(&mystique->lfb_mapping, - svga_readb_linear, svga_readw_linear, svga_readl_linear, - svga_writeb_linear, svga_writew_linear, svga_writel_linear); + svga_read_linear, svga_readw_linear, svga_readl_linear, + svga_write_linear, svga_writew_linear, svga_writel_linear); } } @@ -4706,8 +4706,8 @@ mystique_init(const device_t *info) mem_mapping_disable(&mystique->ctrl_mapping); mem_mapping_add(&mystique->lfb_mapping, 0, 0, - svga_readb_linear, svga_readw_linear, svga_readl_linear, - svga_writeb_linear, svga_writew_linear, svga_writel_linear, + svga_read_linear, svga_readw_linear, svga_readl_linear, + svga_write_linear, svga_writew_linear, svga_writel_linear, NULL, 0, mystique); mem_mapping_disable(&mystique->lfb_mapping); diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c index 8978135f9..8a5aeca5a 100644 --- a/src/video/vid_svga.c +++ b/src/video/vid_svga.c @@ -516,6 +516,8 @@ svga_recalctimings(svga_t *svga) svga->linedbl = svga->crtc[9] & 0x80; svga->rowcount = svga->crtc[9] & 31; + svga->char_width = (svga->seqregs[1] & 1) ? 8 : 9; + if (enable_overscan) { overscan_y = (svga->rowcount + 1) << 1; @@ -540,7 +542,7 @@ svga_recalctimings(svga_t *svga) if (svga->vblankstart < svga->dispend) svga->dispend = svga->vblankstart; - crtcconst = (svga->seqregs[1] & 1) ? (svga->clock * 8.0) : (svga->clock * 9.0); + crtcconst = svga->clock * svga->char_width; disptime = svga->htotal; _dispontime = svga->hdisp_time; diff --git a/src/video/vid_svga.h b/src/video/vid_svga.h index 895313a29..be4db180e 100644 --- a/src/video/vid_svga.h +++ b/src/video/vid_svga.h @@ -53,7 +53,7 @@ typedef struct svga_t hdisp, hdisp_old, htotal, hdisp_time, rowoffset, dispon, hdisp_on, vc, sc, linepos, vslines, linecountff, oddeven, - con, cursoron, blink, scrollcache, + con, cursoron, blink, scrollcache, char_width, firstline, lastline, firstline_draw, lastline_draw, displine, fullchange, x_add, y_add, pan, vram_display_mask, vidclock,