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

Fix conflict.

Browse Source
This commit is contained in:
OBattler
2020-12-19 16:25:44 +01:00
parent 7733bc826d d0470ac227
commit 2dc7b95496
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/vid_s3.c
View File

@@ -2681,7 +2681,8 @@ s3_updatemapping(s3_t *s3)
s3->linear_base &= 0xfc000000; s3->linear_base &= 0xfc000000;
else if (s3->chip == S3_VISION968) else if (s3->chip == S3_VISION968)
s3->linear_base &= 0xfe000000; s3->linear_base &= 0xfe000000;
mem_mapping_set_addr(&s3->linear_mapping, s3->linear_base, s3->linear_size); pclog("Linear mapping enabled at %08x, size = %08x\n", s3->linear_base, s3->linear_size);
mem_mapping_set_addr(&s3->linear_mapping, s3->linear_base, s3->linear_size);
} }
} else { } else {
pclog("Linear mapping disabled\n"); pclog("Linear mapping disabled\n");