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

Merge branch 'master' of https://github.com/OBattler/PCem-Experimental

Browse Source
This commit is contained in:
OBattler
2017-02-17 23:45:38 +01:00
parent f67f14d648 eccb9fdda4
commit 3935ab1074
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vid_nv_riva128.c
View File

@@ -320,7 +320,7 @@ static uint8_t riva128_pmc_read(uint32_t addr, void *p)
if(riva128->card_id == 0x03) switch(addr) if(riva128->card_id == 0x03) switch(addr)
{ {
case 0x000000: case 0x000000:
ret = 0x11; ret = 0x01;
break; break;
case 0x000001: case 0x000001:
ret = 0x01; ret = 0x01;
@@ -1828,7 +1828,8 @@ static void riva128_mmio_write_l(uint32_t addr, uint32_t val, void *p)
addr &= 0xffffff; addr &= 0xffffff;
pclog("RIVA 128 MMIO write %08X %08X %04X:%08X\n", addr, val, CS, cpu_state.pc); //DO NOT REMOVE. This fixes a monstrous log blowup in win9x's drivers when accessing PFIFO.
if(!((addr >= 0x002000) && (addr <= 0x003fff))) pclog("RIVA 128 MMIO write %08X %08X %04X:%08X\n", addr, val, CS, cpu_state.pc);
switch(addr) switch(addr)
{ {
@@ -2207,7 +2208,7 @@ static uint8_t riva128_pci_read(int func, int addr, void *p)
break; break;
case 0x08: case 0x08:
ret = 0x01; ret = 0x00;
break; /*Revision ID*/ break; /*Revision ID*/
case 0x09: case 0x09:
ret = 0; ret = 0;
@@ -2660,10 +2661,10 @@ static void *riva128_init()
riva128->pci_regs[6] = 0; riva128->pci_regs[6] = 0;
riva128->pci_regs[7] = 2; riva128->pci_regs[7] = 2;
riva128->pci_regs[0x2c] = 0x02; riva128->pci_regs[0x2c] = 0xd2;
riva128->pci_regs[0x2d] = 0x11; riva128->pci_regs[0x2d] = 0x12;
riva128->pci_regs[0x2e] = 0x16; riva128->pci_regs[0x2e] = 0x00;
riva128->pci_regs[0x2f] = 0x10; riva128->pci_regs[0x2f] = 0x03;
riva128->pci_regs[0x30] = 0x00; riva128->pci_regs[0x30] = 0x00;
riva128->pci_regs[0x32] = 0x0c; riva128->pci_regs[0x32] = 0x0c;