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

A lot of fixes - everything now seems to work properly.

Browse Source
This commit is contained in:
OBattler
2022-02-03 03:10:06 +01:00
parent 296e25c685
commit 6f2b93923c
59 changed files with 551 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

332
src/video/vid_table.c
View File

@@ -50,15 +50,15 @@ static int was_reset = 0;
static const device_t vid_none_device = {
"None",
"vid_none",
"none",
0, 0,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
static const device_t vid_internal_device = {
"Internal Video Card",
"vid_none",
"Internal",
"internal",
0, 0,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
@@ -68,173 +68,173 @@ static const device_t vid_internal_device = {
static const VIDEO_CARD
video_cards[] = {
{ &vid_none_device },
{ &vid_internal_device },
{ &atiega_device },
{ &mach64gx_isa_device },
{ &ati28800k_device },
{ &ati18800_vga88_device },
{ &ati28800_device },
{ &compaq_ati28800_device },
{ &vid_internal_device },
{ &atiega_device },
{ &mach64gx_isa_device },
{ &ati28800k_device },
{ &ati18800_vga88_device },
{ &ati28800_device },
{ &compaq_ati28800_device },
#if defined(DEV_BRANCH) && defined(USE_XL24)
{ &ati28800_wonderxl24_device },
{ &ati28800_wonderxl24_device },
#endif
{ &ati18800_device },
{ &ati18800_device },
#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
{ &ati18800_wonder_device },
{ &ati18800_wonder_device },
#endif
{ &cga_device },
{ &sega_device },
{ &gd5401_isa_device },
{ &gd5402_isa_device },
{ &gd5420_isa_device },
{ &gd5422_isa_device },
{ &gd5426_isa_device },
{ &gd5426_diamond_speedstar_pro_a1_isa_device },
{ &gd5428_isa_device },
{ &gd5429_isa_device },
{ &gd5434_isa_device },
{ &gd5434_diamond_speedstar_64_a3_isa_device },
{ &compaq_cga_device },
{ &compaq_cga_2_device },
{ &cpqega_device },
{ &ega_device },
{ &g2_gc205_device },
{ &hercules_device },
{ &herculesplus_device },
{ &incolor_device },
{ &im1024_device },
{ &iskra_ega_device },
{ &et4000_kasan_isa_device },
{ &mda_device },
{ &genius_device },
{ &nga_device },
{ &ogc_device },
{ &oti037c_device },
{ &oti067_device },
{ &oti077_device },
{ &paradise_pvga1a_device },
{ &paradise_wd90c11_device },
{ &paradise_wd90c30_device },
{ &colorplus_device },
{ &pgc_device },
{ &radius_svga_multiview_isa_device },
{ &realtek_rtg3106_device },
{ &s3_diamond_stealth_vram_isa_device },
{ &s3_orchid_86c911_isa_device },
{ &s3_ami_86c924_isa_device },
{ &s3_metheus_86c928_isa_device },
{ &s3_phoenix_86c801_isa_device },
{ &s3_spea_mirage_86c801_isa_device },
{ &sigma_device },
{ &tvga8900b_device },
{ &tvga8900d_device },
{ &tvga9000b_device },
{ &et4000k_isa_device },
{ &et2000_device },
{ &et4000_isa_device },
{ &et4000w32_device },
{ &et4000w32i_isa_device },
{ &vga_device },
{ &v7_vga_1024i_device },
{ &wy700_device },
{ &gd5428_mca_device },
{ &et4000_mca_device },
{ &radius_svga_multiview_mca_device },
{ &mach64gx_pci_device },
{ &mach64vt2_device },
{ &et4000w32p_revc_pci_device },
{ &et4000w32p_cardex_pci_device },
{ &et4000w32p_noncardex_pci_device },
{ &gd5430_pci_device, },
{ &gd5434_pci_device },
{ &gd5436_pci_device },
{ &gd5440_pci_device },
{ &gd5446_pci_device },
{ &gd5446_stb_pci_device },
{ &gd5480_pci_device },
{ &creative_voodoo_banshee_device },
{ &et4000w32p_pci_device },
{ &s3_spea_mercury_lite_86c928_pci_device },
{ &s3_diamond_stealth64_964_pci_device },
{ &s3_elsa_winner2000_pro_x_964_pci_device },
{ &s3_mirocrystal_20sv_964_pci_device },
{ &s3_bahamas64_pci_device },
{ &s3_phoenix_vision864_pci_device },
{ &s3_diamond_stealth_se_pci_device },
{ &s3_phoenix_trio32_pci_device },
{ &s3_diamond_stealth64_pci_device },
{ &s3_9fx_pci_device },
{ &s3_phoenix_trio64_pci_device },
{ &s3_elsa_winner2000_pro_x_pci_device },
{ &s3_mirovideo_40sv_ergo_968_pci_device },
{ &s3_9fx_771_pci_device },
{ &s3_phoenix_vision968_pci_device },
{ &s3_spea_mercury_p64v_pci_device },
{ &s3_9fx_531_pci_device },
{ &s3_phoenix_vision868_pci_device },
{ &s3_phoenix_trio64vplus_pci_device },
{ &s3_trio64v2_dx_pci_device },
{ &s3_virge_325_pci_device },
{ &s3_diamond_stealth_2000_pci_device },
{ &s3_diamond_stealth_3000_pci_device },
{ &s3_stb_velocity_3d_pci_device },
{ &s3_virge_375_pci_device },
{ &s3_diamond_stealth_2000pro_pci_device },
{ &s3_virge_385_pci_device },
{ &s3_virge_357_pci_device },
{ &s3_diamond_stealth_4000_pci_device },
{ &s3_trio3d2x_pci_device },
{ &cga_device },
{ &sega_device },
{ &gd5401_isa_device },
{ &gd5402_isa_device },
{ &gd5420_isa_device },
{ &gd5422_isa_device },
{ &gd5426_isa_device },
{ &gd5426_diamond_speedstar_pro_a1_isa_device },
{ &gd5428_isa_device },
{ &gd5429_isa_device },
{ &gd5434_isa_device },
{ &gd5434_diamond_speedstar_64_a3_isa_device },
{ &compaq_cga_device },
{ &compaq_cga_2_device },
{ &cpqega_device },
{ &ega_device },
{ &g2_gc205_device },
{ &hercules_device },
{ &herculesplus_device },
{ &incolor_device },
{ &im1024_device },
{ &iskra_ega_device },
{ &et4000_kasan_isa_device },
{ &mda_device },
{ &genius_device },
{ &nga_device },
{ &ogc_device },
{ &oti037c_device },
{ &oti067_device },
{ &oti077_device },
{ &paradise_pvga1a_device },
{ &paradise_wd90c11_device },
{ &paradise_wd90c30_device },
{ &colorplus_device },
{ &pgc_device },
{ &radius_svga_multiview_isa_device },
{ &realtek_rtg3106_device },
{ &s3_diamond_stealth_vram_isa_device },
{ &s3_orchid_86c911_isa_device },
{ &s3_ami_86c924_isa_device },
{ &s3_metheus_86c928_isa_device },
{ &s3_phoenix_86c801_isa_device },
{ &s3_spea_mirage_86c801_isa_device },
{ &sigma_device },
{ &tvga8900b_device },
{ &tvga8900d_device },
{ &tvga9000b_device },
{ &et4000k_isa_device },
{ &et2000_device },
{ &et4000_isa_device },
{ &et4000w32_device },
{ &et4000w32i_isa_device },
{ &vga_device },
{ &v7_vga_1024i_device },
{ &wy700_device },
{ &gd5428_mca_device },
{ &et4000_mca_device },
{ &radius_svga_multiview_mca_device },
{ &mach64gx_pci_device },
{ &mach64vt2_device },
{ &et4000w32p_revc_pci_device },
{ &et4000w32p_cardex_pci_device },
{ &et4000w32p_noncardex_pci_device },
{ &gd5430_pci_device, },
{ &gd5434_pci_device },
{ &gd5436_pci_device },
{ &gd5440_pci_device },
{ &gd5446_pci_device },
{ &gd5446_stb_pci_device },
{ &gd5480_pci_device },
{ &creative_voodoo_banshee_device },
{ &et4000w32p_pci_device },
{ &s3_spea_mercury_lite_86c928_pci_device },
{ &s3_diamond_stealth64_964_pci_device },
{ &s3_elsa_winner2000_pro_x_964_pci_device },
{ &s3_mirocrystal_20sv_964_pci_device },
{ &s3_bahamas64_pci_device },
{ &s3_phoenix_vision864_pci_device },
{ &s3_diamond_stealth_se_pci_device },
{ &s3_phoenix_trio32_pci_device },
{ &s3_diamond_stealth64_pci_device },
{ &s3_9fx_pci_device },
{ &s3_phoenix_trio64_pci_device },
{ &s3_elsa_winner2000_pro_x_pci_device },
{ &s3_mirovideo_40sv_ergo_968_pci_device },
{ &s3_9fx_771_pci_device },
{ &s3_phoenix_vision968_pci_device },
{ &s3_spea_mercury_p64v_pci_device },
{ &s3_9fx_531_pci_device },
{ &s3_phoenix_vision868_pci_device },
{ &s3_phoenix_trio64vplus_pci_device },
{ &s3_trio64v2_dx_pci_device },
{ &s3_virge_325_pci_device },
{ &s3_diamond_stealth_2000_pci_device },
{ &s3_diamond_stealth_3000_pci_device },
{ &s3_stb_velocity_3d_pci_device },
{ &s3_virge_375_pci_device },
{ &s3_diamond_stealth_2000pro_pci_device },
{ &s3_virge_385_pci_device },
{ &s3_virge_357_pci_device },
{ &s3_diamond_stealth_4000_pci_device },
{ &s3_trio3d2x_pci_device },
#if defined(DEV_BRANCH) && defined(USE_MGA)
{ &mystique_device },
{ &mystique_220_device },
{ &mystique_device },
{ &mystique_220_device },
#endif
{ &tgui9440_pci_device },
{ &tgui9660_pci_device },
{ &tgui9680_pci_device },
{ &voodoo_banshee_device },
{ &voodoo_3_2000_device },
{ &voodoo_3_3000_device },
{ &mach64gx_vlb_device },
{ &et4000w32i_vlb_device },
{ &et4000w32p_revc_vlb_device },
{ &et4000w32p_cardex_vlb_device },
{ &et4000w32p_vlb_device },
{ &et4000w32p_noncardex_vlb_device },
{ &gd5424_vlb_device },
{ &gd5426_vlb_device },
{ &gd5428_vlb_device },
{ &gd5428_diamond_speedstar_pro_b1_vlb_device },
{ &gd5429_vlb_device },
{ &gd5430_diamond_speedstar_pro_se_a8_vlb_device },
{ &gd5434_vlb_device },
{ &s3_metheus_86c928_vlb_device },
{ &s3_mirocrystal_8s_805_vlb_device },
{ &s3_mirocrystal_10sd_805_vlb_device },
{ &s3_phoenix_86c805_vlb_device },
{ &s3_spea_mirage_86c805_vlb_device },
{ &s3_diamond_stealth64_964_vlb_device },
{ &s3_mirocrystal_20sv_964_vlb_device },
{ &s3_mirocrystal_20sd_864_vlb_device },
{ &s3_bahamas64_vlb_device },
{ &s3_phoenix_vision864_vlb_device },
{ &s3_diamond_stealth_se_vlb_device },
{ &s3_phoenix_trio32_vlb_device },
{ &s3_diamond_stealth64_vlb_device },
{ &s3_9fx_vlb_device },
{ &s3_phoenix_trio64_vlb_device },
{ &s3_spea_mirage_p64_vlb_device },
{ &s3_phoenix_vision968_vlb_device },
{ &s3_phoenix_vision868_vlb_device },
{ &ht216_32_standalone_device },
{ &tgui9400cxi_device },
{ &tgui9440_vlb_device },
{ &s3_virge_357_agp_device },
{ &s3_diamond_stealth_4000_agp_device },
{ &s3_trio3d2x_agp_device },
{ &velocity_100_agp_device },
{ &voodoo_3_2000_agp_device },
{ &voodoo_3_3000_agp_device },
{ NULL }
{ &tgui9440_pci_device },
{ &tgui9660_pci_device },
{ &tgui9680_pci_device },
{ &voodoo_banshee_device },
{ &voodoo_3_2000_device },
{ &voodoo_3_3000_device },
{ &mach64gx_vlb_device },
{ &et4000w32i_vlb_device },
{ &et4000w32p_revc_vlb_device },
{ &et4000w32p_cardex_vlb_device },
{ &et4000w32p_vlb_device },
{ &et4000w32p_noncardex_vlb_device },
{ &gd5424_vlb_device },
{ &gd5426_vlb_device },
{ &gd5428_vlb_device },
{ &gd5428_diamond_speedstar_pro_b1_vlb_device },
{ &gd5429_vlb_device },
{ &gd5430_diamond_speedstar_pro_se_a8_vlb_device },
{ &gd5434_vlb_device },
{ &s3_metheus_86c928_vlb_device },
{ &s3_mirocrystal_8s_805_vlb_device },
{ &s3_mirocrystal_10sd_805_vlb_device },
{ &s3_phoenix_86c805_vlb_device },
{ &s3_spea_mirage_86c805_vlb_device },
{ &s3_diamond_stealth64_964_vlb_device },
{ &s3_mirocrystal_20sv_964_vlb_device },
{ &s3_mirocrystal_20sd_864_vlb_device },
{ &s3_bahamas64_vlb_device },
{ &s3_phoenix_vision864_vlb_device },
{ &s3_diamond_stealth_se_vlb_device },
{ &s3_phoenix_trio32_vlb_device },
{ &s3_diamond_stealth64_vlb_device },
{ &s3_9fx_vlb_device },
{ &s3_phoenix_trio64_vlb_device },
{ &s3_spea_mirage_p64_vlb_device },
{ &s3_phoenix_vision968_vlb_device },
{ &s3_phoenix_vision868_vlb_device },
{ &ht216_32_standalone_device },
{ &tgui9400cxi_device },
{ &tgui9440_vlb_device },
{ &s3_virge_357_agp_device },
{ &s3_diamond_stealth_4000_agp_device },
{ &s3_trio3d2x_agp_device },
{ &velocity_100_agp_device },
{ &voodoo_3_2000_agp_device },
{ &voodoo_3_3000_agp_device },
{ NULL }
};
@@ -357,7 +357,7 @@ video_card_has_config(int card)
char *
video_get_internal_name(int card)
{
return((char *) video_cards[card].device->internal_name);
return device_get_internal_name(video_cards[card].device);
}
@@ -366,7 +366,7 @@ video_get_video_from_internal_name(char *s)
{
int c = 0;
while (strcmp(video_cards[c].device->internal_name, "") != 0) {
while (video_cards[c].device != NULL) {
if (!strcmp((char *) video_cards[c].device->internal_name, s))
return(c);
c++;