From 7c2335d6aa57c834e14043df641877121ed4e1e8 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Thu, 16 Feb 2017 20:17:16 -0600 Subject: [PATCH 1/3] Fix Windows 9x nVidia driver installation --- src/vid_nv_riva128.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c index 656797b17..c44ca6246 100644 --- a/src/vid_nv_riva128.c +++ b/src/vid_nv_riva128.c @@ -320,7 +320,7 @@ static uint8_t riva128_pmc_read(uint32_t addr, void *p) if(riva128->card_id == 0x03) switch(addr) { case 0x000000: - ret = 0x11; + ret = 0x01; break; case 0x000001: ret = 0x01; @@ -2660,10 +2660,10 @@ static void *riva128_init() riva128->pci_regs[6] = 0; riva128->pci_regs[7] = 2; - riva128->pci_regs[0x2c] = 0x02; - riva128->pci_regs[0x2d] = 0x11; - riva128->pci_regs[0x2e] = 0x16; - riva128->pci_regs[0x2f] = 0x10; + riva128->pci_regs[0x2c] = 0xd2; + riva128->pci_regs[0x2d] = 0x12; + riva128->pci_regs[0x2e] = 0x00; + riva128->pci_regs[0x2f] = 0x03; riva128->pci_regs[0x30] = 0x00; riva128->pci_regs[0x32] = 0x0c; From c4eb534269742899d909e6ffc6470ea65ede9060 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Thu, 16 Feb 2017 20:22:57 -0600 Subject: [PATCH 2/3] Fix a monstrous log blowup in nVidia drivers --- src/vid_nv_riva128.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c index c44ca6246..3eeff57f6 100644 --- a/src/vid_nv_riva128.c +++ b/src/vid_nv_riva128.c @@ -1828,7 +1828,8 @@ static void riva128_mmio_write_l(uint32_t addr, uint32_t val, void *p) 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) { From 5b7ca99060cf48155a11499a44d14177d0301ed0 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Thu, 16 Feb 2017 20:41:41 -0600 Subject: [PATCH 3/3] Fix Windows 9x installation AGAIN --- src/vid_nv_riva128.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c index 3eeff57f6..1fce70ad9 100644 --- a/src/vid_nv_riva128.c +++ b/src/vid_nv_riva128.c @@ -2208,7 +2208,7 @@ static uint8_t riva128_pci_read(int func, int addr, void *p) break; case 0x08: - ret = 0x01; + ret = 0x00; break; /*Revision ID*/ case 0x09: ret = 0;