From 148e466b807bb547a49891c6d691f98854157aeb Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 30 Dec 2023 01:27:04 +0600 Subject: [PATCH] Implement BAR swap for Matrox Mystique 220 Revision ID now properly indicates a Mystique 220 card --- src/video/vid_mga.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index 6e85cfe5e..66a7dca71 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -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)