Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Video cards defines replaced with enumerator. Patch from SA1988.

Browse source
This commit is contained in:
TomW 2014-07-09 19:21:16 +01:00
commit adc0ef008b
2 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/ibm.h
View file

@ -318,7 +318,6 @@ enum
}; };
extern int romspresent[ROM_MAX]; extern int romspresent[ROM_MAX];
extern int gfx_present[19];
//#define ROM_IBMPCJR 5 /*Not working! ROMs are corrupt*/ //#define ROM_IBMPCJR 5 /*Not working! ROMs are corrupt*/
#define is386 (romset>=ROM_IBMAT386) #define is386 (romset>=ROM_IBMAT386)
@ -327,26 +326,31 @@ extern int gfx_present[19];
int hasfpu; int hasfpu;
int romset; int romset;
#define GFX_CGA 0 enum
#define GFX_MDA 1 {
#define GFX_HERCULES 2 GFX_CGA = 0,
#define GFX_EGA 3 /*Using IBM EGA BIOS*/ GFX_MDA,
//#define GFX_OTI067 3 /*Using BIOS from Acer 386SX/25N - edit - only works with Acer BIOS! Stupid integrated systems*/ GFX_HERCULES,
#define GFX_TVGA 4 /*Using Trident 8900D BIOS*/ GFX_EGA, /*Using IBM EGA BIOS*/
#define GFX_ET4000 5 /*Tseng ET4000*/ GFX_TVGA, /*Using Trident TVGA8900D BIOS*/
#define GFX_ET4000W32 6 /*Tseng ET4000/W32p (Diamond Stealth 32)*/ GFX_ET4000, /*Tseng ET4000*/
#define GFX_BAHAMAS64 7 /*S3 Vision864 (Paradise Bahamas 64)*/ GFX_ET4000W32, /*Tseng ET4000/W32p (Diamond Stealth 32)*/
#define GFX_N9_9FX 8 /*S3 764/Trio64 (Number Nine 9FX)*/ GFX_BAHAMAS64, /*S3 Vision864 (Paradise Bahamas 64)*/
#define GFX_STEALTH64 9 /*S3 Vision964 (Diamond Stealth 64 VRAM PCI)*/ GFX_N9_9FX, /*S3 764/Trio64 (Number Nine 9FX)*/
#define GFX_VIRGE 10 /*S3 Virge*/ GFX_VIRGE, /*S3 Virge*/
#define GFX_TGUI9440 11 /*Trident TGUI9440*/ GFX_TGUI9440, /*Trident TGUI9440*/
#define GFX_VGA 12 /*IBM VGA*/ GFX_VGA, /*IBM VGA*/
#define GFX_VGAEDGE16 13 /*ATI VGA Edge-16 (18800-1)*/ GFX_VGAEDGE16, /*ATI VGA Edge-16 (18800-1)*/
#define GFX_VGACHARGER 14 /*ATI VGA Charger (28800-5)*/ GFX_VGACHARGER, /*ATI VGA Charger (28800-5)*/
#define GFX_OTI067 15 /*Oak OTI-067*/ GFX_OTI067, /*Oak OTI-067*/
#define GFX_MACH64GX 16 /*ATI Graphics Pro Turbo (Mach64)*/ GFX_MACH64GX, /*ATI Graphics Pro Turbo (Mach64)*/
#define GFX_CL_GD5429 17 /*Cirrus Logic CL-GD5429*/ GFX_CL_GD5429, /*Cirrus Logic CL-GD5429*/
#define GFX_VIRGEDX 18 /*S3 Virge/DX*/ GFX_VIRGEDX, /*S3 Virge/DX*/
GFX_MAX
};
extern int gfx_present[GFX_MAX];
int gfxcard; int gfxcard;

6
src/win.c
View file

@ -53,7 +53,7 @@ static struct
#define TIMER_1SEC 1 #define TIMER_1SEC 1
int winsizex=640,winsizey=480; int winsizex=640,winsizey=480;
int gfx_present[19]; int gfx_present[GFX_MAX];
#undef cs #undef cs
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
@ -339,13 +339,13 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
} }
for (c = 0; c < 19; c++) for (c = 0; c < GFX_MAX; c++)
gfx_present[c] = video_card_available(video_old_to_new(c)); gfx_present[c] = video_card_available(video_old_to_new(c));
if (!video_card_available(video_old_to_new(gfxcard))) if (!video_card_available(video_old_to_new(gfxcard)))
{ {
if (romset!=-1) MessageBox(hwnd,"Configured video BIOS not available.\nDefaulting to available romset.","PCem error",MB_OK); if (romset!=-1) MessageBox(hwnd,"Configured video BIOS not available.\nDefaulting to available romset.","PCem error",MB_OK);
for (c = 18; c >= 0; c--) for (c = GFX_MAX-1; c >= 0; c--)
{ {
if (gfx_present[c]) if (gfx_present[c])
{ {