Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing Mystique vsync interrupt. Helps with some Mystique Win9x drivers.

Browse source
This commit is contained in:
SarahW 2020-03-30 20:59:40 +01:00
commit a017de3c57
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/vid_mga.c
View file

@ -611,6 +611,7 @@ enum
#define DMA_MODE_VECTOR 2 #define DMA_MODE_VECTOR 2
#define STATUS_SOFTRAPEN (1 << 0) #define STATUS_SOFTRAPEN (1 << 0)
#define STATUS_VSYNCPEN (1 << 4)
#define STATUS_VLINEPEN (1 << 5) #define STATUS_VLINEPEN (1 << 5)
#define STATUS_DWGENGSTS (1 << 16) #define STATUS_DWGENGSTS (1 << 16)
#define STATUS_ENDPRDMASTS (1 << 17) #define STATUS_ENDPRDMASTS (1 << 17)
@ -711,6 +712,12 @@ void mystique_out(uint16_t addr, uint8_t val, void *p)
svga->fullchange = changeframecount; svga->fullchange = changeframecount;
svga_recalctimings(svga); svga_recalctimings(svga);
} }
if (svga->crtcreg == 0x11)
{
if (!(val & 0x10))
mystique->status &= ~STATUS_VSYNCPEN;
mystique_update_irqs(mystique);
}
} }
break; break;
@ -800,6 +807,18 @@ static int mystique_line_compare(svga_t *svga)
return 0; return 0;
} }
static void mystique_vsync_callback(svga_t *svga)
{
mystique_t *mystique = (mystique_t *)svga->p;
if (svga->crtc[0x11] & 0x10)
{
mystique->status |= STATUS_VSYNCPEN;
mystique_update_irqs(mystique);
}
}
void mystique_recalctimings(svga_t *svga) void mystique_recalctimings(svga_t *svga)
{ {
mystique_t *mystique = (mystique_t *)svga->p; mystique_t *mystique = (mystique_t *)svga->p;
@ -976,10 +995,13 @@ static void mystique_recalc_mapping(mystique_t *mystique)
static void mystique_update_irqs(mystique_t *mystique) static void mystique_update_irqs(mystique_t *mystique)
{ {
svga_t *svga = &mystique->svga;
int irq = 0; int irq = 0;
if ((mystique->status & mystique->ien) & STATUS_SOFTRAPEN) if ((mystique->status & mystique->ien) & STATUS_SOFTRAPEN)
irq = 1; irq = 1;
if ((mystique->status & STATUS_VSYNCPEN) && (svga->crtc[0x11] & 0x30) == 0x10)
irq = 1;
if (irq) if (irq)
pci_set_irq(mystique->card, PCI_INTA); pci_set_irq(mystique->card, PCI_INTA);
@ -5298,6 +5320,8 @@ void *mystique_init()
mystique->status = STATUS_ENDPRDMASTS; mystique->status = STATUS_ENDPRDMASTS;
mystique->svga.vsync_callback = mystique_vsync_callback;
return mystique; return mystique;
} }

3
src/vid_svga.c
View file

@ -697,6 +697,9 @@ void svga_poll(void *p)
// if (svga_interlace && oddeven) ma=maback=ma+(svga_rowoffset<<2); // if (svga_interlace && oddeven) ma=maback=ma+(svga_rowoffset<<2);
// pclog("Addr %08X vson %03X vsoff %01X %02X %02X %02X %i %i\n",ma,svga_vsyncstart,crtc[0x11]&0xF,crtc[0xD],crtc[0xC],crtc[0x33], svga_interlace, oddeven); // pclog("Addr %08X vson %03X vsoff %01X %02X %02X %02X %i %i\n",ma,svga_vsyncstart,crtc[0x11]&0xF,crtc[0xD],crtc[0xC],crtc[0x33], svga_interlace, oddeven);
if (svga->vsync_callback)
svga->vsync_callback(svga);
} }
if (svga->vc == svga->vtotal) if (svga->vc == svga->vtotal)
{ {

3
src/vid_svga.h
View file

@ -129,6 +129,9 @@ typedef struct svga_t
vertical line interrupt*/ vertical line interrupt*/
int (*line_compare)(struct svga_t *svga); int (*line_compare)(struct svga_t *svga);
/*Called at the start of vertical sync*/
void (*vsync_callback)(struct svga_t *svga);
/*If set then another device is driving the monitor output and the SVGA /*If set then another device is driving the monitor output and the SVGA
card should not attempt to display anything */ card should not attempt to display anything */
int override; int override;