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

Merge pull request #2059 from 86Box/tc1995

Browse Source 
Fixed the ISA bus detection of the Mach64GX.
This commit is contained in:
Miran Grča
2022-02-07 20:12:01 +01:00
committed by GitHub
parent 8bbcfd126f 8d28e3623c
commit 1fa9db221b
2 changed files with 593 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/vid_ati_mach64.c
View File

@@ -385,7 +385,7 @@ void mach64_out(uint16_t addr, uint8_t val, void *p)
case 0x1cf: case 0x1cf:
mach64->regs[mach64->index & 0x3f] = val; mach64->regs[mach64->index & 0x3f] = val;
if ((mach64->index & 0x3f) == 0x36) if ((mach64->index & 0x3f) == 0x36)
mach64_recalctimings(svga); svga_recalctimings(svga);
break; break;
case 0x3C6: case 0x3C7: case 0x3C8: case 0x3C9: case 0x3C6: case 0x3C7: case 0x3C8: case 0x3C9:
@@ -3393,8 +3393,10 @@ static void *mach64gx_init(const device_t *info)
mach64->config_stat0 = (5 << 9) | (3 << 3); /*ATI-68860, 256Kx16 DRAM*/ mach64->config_stat0 = (5 << 9) | (3 << 3); /*ATI-68860, 256Kx16 DRAM*/
if (info->flags & DEVICE_PCI) if (info->flags & DEVICE_PCI)
mach64->config_stat0 |= 0; /*PCI, 256Kx16 DRAM*/ mach64->config_stat0 |= 0; /*PCI, 256Kx16 DRAM*/
else if ((info->flags & DEVICE_VLB) || (info->flags & DEVICE_ISA)) else if (info->flags & DEVICE_VLB)
mach64->config_stat0 |= 1; /*VLB, 256Kx16 DRAM*/ mach64->config_stat0 |= 1; /*VLB, 256Kx16 DRAM*/
else if (info->flags & DEVICE_ISA)
mach64->config_stat0 |= 7; /*ISA 16-bit, 256k16 DRAM*/
ati_eeprom_load(&mach64->eeprom, "mach64.nvr", 1); ati_eeprom_load(&mach64->eeprom, "mach64.nvr", 1);

1259
src/video/vid_s3_virge.c
View File

File diff suppressed because it is too large Load Diff