claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4190 from 86Box/tc1995

Browse Source 
Video related changes:
This commit is contained in:
Miran Grča
2024-02-22 13:36:52 +01:00
committed by GitHub
parent 2fe92a2f26 46fbb3bb9e
commit b728172edc
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/vid_8514a.c
View File

@@ -4454,7 +4454,7 @@ ibm8514_init(const device_t *info)
} }
#endif #endif
timer_add(&svga->timer8514, ibm8514_poll, svga, 0); timer_add(&svga->timer8514, ibm8514_poll, svga, 1);
return svga; return svga;
} }

2
src/video/vid_ati_mach8.c
View File

@@ -6057,7 +6057,7 @@ mach8_init(const device_t *info)
} else } else
ati_eeprom_load_mach8(&mach->eeprom, "mach8.nvr"); ati_eeprom_load_mach8(&mach->eeprom, "mach8.nvr");
timer_add(&svga->timer8514, ibm8514_poll, svga, 0); timer_add(&svga->timer8514, ibm8514_poll, svga, 1);
return mach; return mach;
} }

14
src/video/vid_et4000.c
View File

@@ -650,22 +650,22 @@ et4000_recalctimings(svga_t *svga)
svga->ma_latch |= (svga->crtc[0x33] & 3) << 16; svga->ma_latch |= (svga->crtc[0x33] & 3) << 16;
svga->hblankstart = (((svga->crtc[0x3f] & 0x10) >> 4) << 8) + svga->crtc[2]; svga->hblankstart = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
if (svga->crtc[0x35] & 1) if (svga->crtc[0x35] & 1)
svga->vblankstart += 0x400; svga->vblankstart |= 0x400;
if (svga->crtc[0x35] & 2) if (svga->crtc[0x35] & 2)
svga->vtotal += 0x400; svga->vtotal |= 0x400;
if (svga->crtc[0x35] & 4) if (svga->crtc[0x35] & 4)
svga->dispend += 0x400; svga->dispend |= 0x400;
if (svga->crtc[0x35] & 8) if (svga->crtc[0x35] & 8)
svga->vsyncstart += 0x400; svga->vsyncstart |= 0x400;
if (svga->crtc[0x35] & 0x10) if (svga->crtc[0x35] & 0x10)
svga->split += 0x400; svga->split |= 0x400;
if (!svga->rowoffset) if (!svga->rowoffset)
svga->rowoffset = 0x100; svga->rowoffset = 0x100;
if (svga->crtc[0x3f] & 1) if (svga->crtc[0x3f] & 1)
svga->htotal += 256; svga->htotal |= 0x100;
if (svga->attrregs[0x16] & 0x20) { if (svga->attrregs[0x16] & 0x20) {
svga->hdisp <<= 1; svga->hdisp <<= 1;
svga->dots_per_clock <<= 1; svga->dots_per_clock <<= 1;

19
src/video/vid_et4000w32.c
View File

@@ -432,22 +432,22 @@ et4000w32p_recalctimings(svga_t *svga)
svga->ma_latch |= (svga->crtc[0x33] & 0x7) << 16; svga->ma_latch |= (svga->crtc[0x33] & 0x7) << 16;
svga->hblankstart = (((svga->crtc[0x3f] & 0x10) >> 4) << 8) + svga->crtc[2]; svga->hblankstart = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
if (svga->crtc[0x35] & 0x01) if (svga->crtc[0x35] & 0x01)
svga->vblankstart += 0x400; svga->vblankstart |= 0x400;
if (svga->crtc[0x35] & 0x02) if (svga->crtc[0x35] & 0x02)
svga->vtotal += 0x400; svga->vtotal |= 0x400;
if (svga->crtc[0x35] & 0x04) if (svga->crtc[0x35] & 0x04)
svga->dispend += 0x400; svga->dispend |= 0x400;
if (svga->crtc[0x35] & 0x08) if (svga->crtc[0x35] & 0x08)
svga->vsyncstart += 0x400; svga->vsyncstart |= 0x400;
if (svga->crtc[0x35] & 0x10) if (svga->crtc[0x35] & 0x10)
svga->split += 0x400; svga->split |= 0x400;
if (svga->crtc[0x3F] & 0x80) if (svga->crtc[0x3F] & 0x80)
svga->rowoffset += 0x100; svga->rowoffset |= 0x100;
if (svga->crtc[0x3F] & 0x01) if (svga->crtc[0x3F] & 0x01)
svga->htotal += 256; svga->htotal |= 0x100;
if (svga->attrregs[0x16] & 0x20) { if (svga->attrregs[0x16] & 0x20) {
svga->hdisp <<= 1; svga->hdisp <<= 1;
svga->dots_per_clock <<= 1; svga->dots_per_clock <<= 1;
@@ -535,9 +535,6 @@ et4000w32p_recalctimings(svga_t *svga)
} else { } else {
switch (svga->gdcreg[5] & 0x60) { switch (svga->gdcreg[5] & 0x60) {
case 0x00: case 0x00:
if (et4000->rev == 5)
svga->ma_latch++;
if (svga->seqregs[1] & 8) /* Low res (320) */ if (svga->seqregs[1] & 8) /* Low res (320) */
svga->render = svga_render_4bpp_lowres; svga->render = svga_render_4bpp_lowres;
else else

6
src/video/vid_svga.c
View File

@@ -899,7 +899,7 @@ svga_recalctimings(svga_t *svga)
if (ibm8514_active && (svga->dev8514 != NULL)) { if (ibm8514_active && (svga->dev8514 != NULL)) {
if (dev->on[0] || dev->on[1]) { if (dev->on[0] || dev->on[1]) {
disptime8514 = dev->htotal; disptime8514 = dev->h_total ? dev->h_total : TIMER_USEC;
_dispontime8514 = dev->hdisped; _dispontime8514 = dev->hdisped;
} }
} }
@@ -934,10 +934,10 @@ svga_recalctimings(svga_t *svga)
dev->dispofftime = TIMER_USEC; dev->dispofftime = TIMER_USEC;
timer_disable(&svga->timer); timer_disable(&svga->timer);
timer_enable(&svga->timer8514); timer_set_delay_u64(&svga->timer8514, TIMER_USEC);
} else { } else {
timer_disable(&svga->timer8514); timer_disable(&svga->timer8514);
timer_enable(&svga->timer); timer_set_delay_u64(&svga->timer, TIMER_USEC);
} }
} }