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

The Stealth64 now correctly uses the Vision864 chip.

Browse Source
This commit is contained in:
OBattler
2016-08-03 20:41:50 +02:00
parent 77274db6ac
commit e3f8e57269
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ibm.h
View File

@@ -397,7 +397,7 @@ enum
GFX_OTI077, /*Oak OTI-077*/ GFX_OTI077, /*Oak OTI-077*/
GFX_ET4000W32CS, /*Tseng ET4000/W32p (Cardex) (ICS RAMDAC) */ GFX_ET4000W32CS, /*Tseng ET4000/W32p (Cardex) (ICS RAMDAC) */
GFX_VGAWONDERXL24, /*Compaq ATI VGA Wonder XL24 (28800-6)*/ GFX_VGAWONDERXL24, /*Compaq ATI VGA Wonder XL24 (28800-6)*/
GFX_STEALTH64, /*S3 764/Trio64 (Diamond Stealth 64)*/ GFX_STEALTH64, /*S3 Vision864 (Diamond Stealth 64)*/
GFX_MAX GFX_MAX
}; };

24
src/vid_s3.c
View File

@@ -2297,15 +2297,15 @@ int s3_phoenix_trio64_available()
void *s3_diamond_stealth64_init() void *s3_diamond_stealth64_init()
{ {
s3_t *s3 = s3_init("roms/STEALT64.BIN", S3_TRIO64); s3_t *s3 = s3_init("roms/STEALT64.BIN", S3_VISION864);
svga_t *svga = &s3->svga; svga_t *svga = &s3->svga;
s3->id = 0xe1; /*Trio64*/ s3->id = 0xc1; /*Vision864P*/
s3->id_ext = s3->id_ext_pci = 0x11; s3->id_ext = s3->id_ext_pci = 0xc1;
s3->packed_mmio = 1; s3->packed_mmio = 0;
s3->getclock = s3_trio64_getclock; s3->getclock = sdac_getclock;
s3->getclock_p = s3; s3->getclock_p = &s3->ramdac;
return s3; return s3;
} }
@@ -2529,6 +2529,14 @@ static device_config_t s3_diamond_stealth64_config[] =
.description = "4 MB", .description = "4 MB",
.value = 4 .value = 4
}, },
{
.description = "6 MB",
.value = 6
},
{
.description = "8 MB",
.value = 8
},
{ {
.description = "" .description = ""
} }
@@ -2638,7 +2646,7 @@ device_t s3_phoenix_trio64_device =
device_t s3_diamond_stealth64_device = device_t s3_diamond_stealth64_device =
{ {
"Phoenix S3 Trio64 (Diamond Stealth64)", "S3 Vision864 (Diamond Stealth64)",
0, 0,
s3_diamond_stealth64_init, s3_diamond_stealth64_init,
s3_close, s3_close,

2
src/video.c
View File

@@ -59,7 +59,7 @@ static VIDEO_CARD video_cards[] =
{"CGA", &cga_device, GFX_CGA}, {"CGA", &cga_device, GFX_CGA},
{"Cirrus Logic CL-GD5429", &gd5429_device, GFX_CL_GD5429}, {"Cirrus Logic CL-GD5429", &gd5429_device, GFX_CL_GD5429},
{"Diamond Stealth 32 (Tseng ET4000/w32p)", &et4000w32p_device, GFX_ET4000W32}, {"Diamond Stealth 32 (Tseng ET4000/w32p)", &et4000w32p_device, GFX_ET4000W32},
{"Diamond Stealth 64 DRAM (S3 Trio64)", &s3_diamond_stealth64_device,GFX_STEALTH64}, {"Diamond Stealth 64 DRAM (S3 Vision864)", &s3_diamond_stealth64_device,GFX_STEALTH64},
{"Diamond Stealth 3D 2000 (S3 ViRGE)", &s3_virge_device, GFX_VIRGE}, {"Diamond Stealth 3D 2000 (S3 ViRGE)", &s3_virge_device, GFX_VIRGE},
{"EGA", &ega_device, GFX_EGA}, {"EGA", &ega_device, GFX_EGA},
{"Chips & Technologies SuperEGA", &sega_device, GFX_SUPER_EGA}, {"Chips & Technologies SuperEGA", &sega_device, GFX_SUPER_EGA},