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

Merge pull request #3962 from Cacodemon345/mga-millennium-ii

Browse Source 
MGA: Properly report Matrox Mystique 220 in PCI revision ID
This commit is contained in:
Miran Grča
2023-12-29 20:40:11 +01:00
committed by GitHub
parent e9bce21ee7 148e466b80
commit cb2e4ac11c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/vid_mga.c
View File

@@ -5676,9 +5676,9 @@ mystique_pci_read(UNUSED(int func), int addr, void *priv)
mystique_t *mystique = (mystique_t *) priv;
uint8_t ret = 0x00;
if (mystique->type >= MGA_2164W)
if (mystique->type >= MGA_1164SG)
{
/* Millennium II and later Matrox cards swap MGABASE1 and 2. */
/* Mystique 220, Millennium II and later Matrox cards swap MGABASE1 and 2. */
if (addr >= 0x10 && addr <= 0x13)
addr += 0x4;
else if (addr >= 0x14 && addr <= 0x17)
@@ -5718,7 +5718,7 @@ mystique_pci_read(UNUSED(int func), int addr, void *priv)
break; /*Fast DEVSEL timing*/
case 0x08:
ret = 0;
ret = (mystique->type == MGA_1164SG) ? 3 : 0;
break; /*Revision ID*/
case 0x09:
ret = 0;
@@ -5837,9 +5837,9 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) priv;
if (mystique->type >= MGA_2164W)
if (mystique->type >= MGA_1164SG)
{
/* Millennium II and later Matrox cards swap MGABASE1 and 2. */
/* Mystique 220, Millennium II and later Matrox cards swap MGABASE1 and 2. */
if (addr >= 0x10 && addr <= 0x13)
addr += 0x4;
else if (addr >= 0x14 && addr <= 0x17)