claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes needed to fix the two Laser XT boards.

Browse Source
This commit is contained in:
OBattler
2018-01-25 22:36:24 +01:00
parent cfe2912aec
commit cf6023aed2
6 changed files with 132 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_table.c
View File

@@ -8,7 +8,7 @@
*
* Define all known video cards.
*
* Version: @(#)vid_table.c 1.0.11 2018/01/25
* Version: @(#)vid_table.c 1.0.12 2018/01/25
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -83,7 +83,7 @@ video_cards[] = {
{ "Internal", "internal",
NULL, GFX_INTERNAL },
{"[ISA] ATI Graphics Pro Turbo (Mach64 GX)", "mach64gx_isa",
&mach64gx_isa_device, GFX_MACH64GX_VLB },
&mach64gx_isa_device, GFX_MACH64GX_ISA },
{ "[ISA] ATI VGA Charger (ATI-28800-5)", "ati28800",
&ati28800_device, GFX_VGACHARGER },
{ "[ISA] ATI VGA Wonder XL24 (ATI-28800-6)", "ati28800w",

20
src/video/video.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the video controller module.
*
* Version: @(#)video.h 1.0.9 2018/01/25
* Version: @(#)video.h 1.0.10 2018/01/25
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -107,13 +107,19 @@ enum {
GFX_MAX
};
#define MDA ((gfxcard>=GFX_MDA) && \
(gfxcard<=GFX_INCOLOR) && \
(romset<ROM_TANDY || romset>=ROM_IBMAT))
#define MDA ( (gfxcard >= GFX_MDA) && \
(gfxcard < GFX_EGA) && \
((romset < ROM_TANDY) || \
(romset >= ROM_AMI286)))
#define VGA ((gfxcard>=GFX_VGA) && \
(romset!=ROM_PC1640 && romset!=ROM_PC1512 && \
romset!=ROM_TANDY && romset!=ROM_PC200 && romset!=ROM_T3100E))
#define EGA ((gfxcard >= GFX_EGA) && \
(gfxcard < GFX_VGA))
#define VGA ((gfxcard >= GFX_VGA))
#define EGA_VGA ( (EGA || VGA) && \
((romset < ROM_TANDY) || \
(romset >= ROM_AMI286)))
enum {
FULLSCR_SCALE_FULL = 0,