80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1837 from 86Box/tc1995

Browse Source 
Changes list 4:
This commit is contained in:
Miran Grča
2021-11-18 23:36:32 +01:00
committed by GitHub
parent 86a74f03d0 89233d0fbb
commit 5d6dbc8f0d
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/video/vid_s3_virge.c
View File

@@ -788,6 +788,7 @@ static void s3_virge_recalctimings(svga_t *svga)
svga->clock = (cpuclock * (float)(1ull << 32)) / freq; svga->clock = (cpuclock * (float)(1ull << 32)) / freq;
} }
if ((svga->crtc[0x67] & 0xc) != 0xc) /*VGA mode*/ if ((svga->crtc[0x67] & 0xc) != 0xc) /*VGA mode*/
{ {
svga->ma_latch |= (virge->ma_ext << 16); svga->ma_latch |= (virge->ma_ext << 16);
@@ -982,7 +983,7 @@ s3_virge_mmio_read(uint32_t addr, void *p)
virge_t *virge = (virge_t *)p; virge_t *virge = (virge_t *)p;
uint8_t ret = 0xff; uint8_t ret = 0xff;
s3_virge_log("MMIO ReadB addr = %04x\n", addr & 0xffff); s3_virge_log("[%04X:%08X]: MMIO ReadB addr = %04x\n", CS, cpu_state.pc, addr & 0xffff);
switch (addr & 0xffff) switch (addr & 0xffff)
{ {
@@ -1028,10 +1029,21 @@ static uint16_t
s3_virge_mmio_read_w(uint32_t addr, void *p) s3_virge_mmio_read_w(uint32_t addr, void *p)
{ {
virge_t *virge = (virge_t *)p; virge_t *virge = (virge_t *)p;
uint32_t ret = 0xffff;
s3_virge_log("MMIO ReadW addr = %04x\n", addr & 0xfffc); s3_virge_log("[%04X:%08X]: MMIO ReadW addr = %04x\n", CS, cpu_state.pc, addr & 0xfffe);
switch (addr & 0xfffe) { switch (addr & 0xfffe) {
case 0x8504:
if (!virge->fifo_slot)
virge->subsys_stat |= INT_FIFO_EMP;
ret |= virge->subsys_stat;
if (virge->fifo_slot)
virge->fifo_slot--;
ret |= 0x30; /*A bit of a workaround at the moment.*/
s3_virge_update_irqs(virge);
return ret;
case 0x859c: case 0x859c:
return virge->cmd_dma; return virge->cmd_dma;
@@ -1050,6 +1062,8 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
VIRGEDMAHeader *dmahdr = &virge->dmahdr; VIRGEDMAHeader *dmahdr = &virge->dmahdr;
uint32_t ret = 0xffffffff; uint32_t ret = 0xffffffff;
s3_virge_log("[%04X:%08X]: MMIO ReadL addr = %04x\n", CS, cpu_state.pc, addr & 0xfffc);
switch (addr & 0xfffc) { switch (addr & 0xfffc) {
case 0x8180: case 0x8180:
ret = virge->streams.pri_ctrl; ret = virge->streams.pri_ctrl;
@@ -1267,8 +1281,9 @@ static void s3_virge_mmio_write(uint32_t addr, uint8_t val, void *p)
static void static void
s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p) s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p)
{ {
virge_t *virge = (virge_t *)p; virge_t *virge = (virge_t *)p;
s3_virge_log("MMIO WriteW addr = %04x, val = %04x\n", addr & 0xfffe, val); s3_virge_log("[%04X:%08X]: MMIO WriteW addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffe, val);
if ((addr & 0xfffe) < 0x8000) { if ((addr & 0xfffe) < 0x8000) {
if (virge->s3d.cmd_set & CMD_SET_MS) if (virge->s3d.cmd_set & CMD_SET_MS)
s3_virge_bitblt(virge, 16, ((val >> 8) | (val << 8)) << 16); s3_virge_bitblt(virge, 16, ((val >> 8) | (val << 8)) << 16);