Conflict resolution.
This commit is contained in:
OBattler
@@ -38,7 +38,7 @@
|
||||
#include <86box/vid_mda.h>
|
||||
#include <86box/vid_xga_device.h>
|
||||
|
||||
typedef struct {
|
||||
typedef struct video_card_t {
|
||||
const device_t *device;
|
||||
int flags;
|
||||
} VIDEO_CARD;
|
||||
@@ -77,197 +77,199 @@ static const device_t vid_internal_device = {
|
||||
static const VIDEO_CARD
|
||||
video_cards[] = {
|
||||
// clang-format off
|
||||
{ &vid_none_device },
|
||||
{ &vid_internal_device },
|
||||
{ &atiega_device },
|
||||
{ &mach8_isa_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach32_isa_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach64gx_isa_device },
|
||||
{ &ati28800k_device },
|
||||
{ &ati18800_vga88_device },
|
||||
{ &ati28800_device },
|
||||
{ &compaq_ati28800_device },
|
||||
{ &vid_none_device },
|
||||
{ &vid_internal_device },
|
||||
{ &atiega800p_device },
|
||||
{ &mach8_isa_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach32_isa_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &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_boca_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, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &herculesplus_device, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &incolor_device },
|
||||
{ &inmos_isa_device, VIDEO_FLAG_TYPE_XGA },
|
||||
{ &im1024_device },
|
||||
{ &iskra_ega_device },
|
||||
{ &et4000_kasan_isa_device },
|
||||
{ &mda_device, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &genius_device },
|
||||
{ &nga_device },
|
||||
{ &ogc_device },
|
||||
{ &oti037c_device },
|
||||
{ &oti067_device },
|
||||
{ &oti077_device },
|
||||
{ ¶dise_pvga1a_device },
|
||||
{ ¶dise_wd90c11_device },
|
||||
{ ¶dise_wd90c30_device },
|
||||
{ &colorplus_device },
|
||||
{ &pgc_device },
|
||||
{ &cga_pravetz_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 },
|
||||
{ &nec_sv9000_device },
|
||||
{ &et4000k_isa_device },
|
||||
{ &et2000_device },
|
||||
{ &et3000_isa_device },
|
||||
{ &et4000_tc6058af_isa_device },
|
||||
{ &et4000_isa_device },
|
||||
{ &et4000w32_device },
|
||||
{ &et4000w32i_isa_device },
|
||||
{ &vga_device },
|
||||
{ &v7_vga_1024i_device },
|
||||
{ &wy700_device },
|
||||
{ &gd5426_mca_device },
|
||||
{ &gd5428_mca_device },
|
||||
{ &et4000_mca_device },
|
||||
{ &radius_svga_multiview_mca_device },
|
||||
{ &mach32_pci_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach64gx_pci_device },
|
||||
{ &mach64vt2_device },
|
||||
{ &et4000w32p_videomagic_revb_pci_device },
|
||||
{ &et4000w32p_revc_pci_device },
|
||||
{ &et4000w32p_cardex_pci_device },
|
||||
{ &et4000w32p_noncardex_pci_device },
|
||||
{ &et4000w32p_pci_device },
|
||||
{ &gd5430_pci_device, },
|
||||
{ &gd5434_pci_device },
|
||||
{ &gd5436_pci_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5440_pci_device },
|
||||
{ &gd5446_pci_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5446_stb_pci_device,VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5480_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)
|
||||
{ &millennium_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &mystique_device },
|
||||
{ &mystique_220_device },
|
||||
#endif
|
||||
{ &tgui9440_pci_device },
|
||||
{ &tgui9660_pci_device },
|
||||
{ &tgui9680_pci_device },
|
||||
{ &voodoo_banshee_device },
|
||||
{ &creative_voodoo_banshee_device },
|
||||
{ &voodoo_3_1000_device },
|
||||
{ &voodoo_3_2000_device },
|
||||
{ &voodoo_3_3000_device },
|
||||
{ &mach32_vlb_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach64gx_vlb_device },
|
||||
{ &et4000w32i_vlb_device },
|
||||
{ &et4000w32p_videomagic_revb_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 },
|
||||
{ &gd5430_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 },
|
||||
{ &velocity_200_agp_device },
|
||||
{ &voodoo_3_1000_agp_device },
|
||||
{ &voodoo_3_2000_agp_device },
|
||||
{ &voodoo_3_3000_agp_device },
|
||||
{ &voodoo_3_3500_agp_ntsc_device },
|
||||
{ &voodoo_3_3500_agp_pal_device },
|
||||
{ &compaq_voodoo_3_3500_agp_device },
|
||||
{ &voodoo_3_3500_se_agp_device },
|
||||
{ &voodoo_3_3500_si_agp_device },
|
||||
{ NULL }
|
||||
{ &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_boca_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, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &herculesplus_device, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &incolor_device },
|
||||
{ &inmos_isa_device, VIDEO_FLAG_TYPE_XGA },
|
||||
{ &im1024_device },
|
||||
{ &iskra_ega_device },
|
||||
{ &et4000_kasan_isa_device },
|
||||
{ &mda_device, VIDEO_FLAG_TYPE_MDA },
|
||||
{ &genius_device },
|
||||
{ &nga_device },
|
||||
{ &ogc_device },
|
||||
{ &oti037c_device },
|
||||
{ &oti067_device },
|
||||
{ &oti077_device },
|
||||
{ ¶dise_pvga1a_device },
|
||||
{ ¶dise_wd90c11_device },
|
||||
{ ¶dise_wd90c30_device },
|
||||
{ &colorplus_device },
|
||||
{ &pgc_device },
|
||||
{ &cga_pravetz_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 },
|
||||
{ &nec_sv9000_device },
|
||||
{ &et4000k_isa_device },
|
||||
{ &et2000_device },
|
||||
{ &et3000_isa_device },
|
||||
{ &et4000_tc6058af_isa_device },
|
||||
{ &et4000_isa_device },
|
||||
{ &et4000w32_device },
|
||||
{ &et4000w32i_isa_device },
|
||||
{ &vga_device },
|
||||
{ &v7_vga_1024i_device },
|
||||
{ &wy700_device },
|
||||
{ &mach32_mca_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &gd5426_mca_device },
|
||||
{ &gd5428_mca_device },
|
||||
{ &et4000_mca_device },
|
||||
{ &radius_svga_multiview_mca_device },
|
||||
{ &mach32_pci_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach64gx_pci_device },
|
||||
{ &mach64vt2_device },
|
||||
{ &et4000w32p_videomagic_revb_pci_device },
|
||||
{ &et4000w32p_revc_pci_device },
|
||||
{ &et4000w32p_cardex_pci_device },
|
||||
{ &et4000w32p_noncardex_pci_device },
|
||||
{ &et4000w32p_pci_device },
|
||||
{ &gd5430_pci_device, },
|
||||
{ &gd5434_pci_device },
|
||||
{ &gd5436_pci_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5440_pci_device },
|
||||
{ &gd5446_pci_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5446_stb_pci_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &gd5480_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_cardex_trio64vplus_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 },
|
||||
{ &millennium_device },
|
||||
{ &millennium_ii_device },
|
||||
{ &mystique_device },
|
||||
{ &mystique_220_device },
|
||||
{ &tgui9440_pci_device },
|
||||
{ &tgui9660_pci_device },
|
||||
{ &tgui9680_pci_device },
|
||||
{ &voodoo_banshee_device },
|
||||
{ &creative_voodoo_banshee_device },
|
||||
{ &voodoo_3_1000_device },
|
||||
{ &voodoo_3_2000_device },
|
||||
{ &voodoo_3_3000_device },
|
||||
{ &mach32_vlb_device, VIDEO_FLAG_TYPE_8514 },
|
||||
{ &mach64gx_vlb_device },
|
||||
{ &et4000w32i_vlb_device },
|
||||
{ &et4000w32p_videomagic_revb_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 },
|
||||
{ &gd5430_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 },
|
||||
{ &productiva_g100_device, VIDEO_FLAG_TYPE_SPECIAL },
|
||||
{ &velocity_100_agp_device },
|
||||
{ &velocity_200_agp_device },
|
||||
{ &voodoo_3_1000_agp_device },
|
||||
{ &voodoo_3_2000_agp_device },
|
||||
{ &voodoo_3_3000_agp_device },
|
||||
{ &voodoo_3_3500_agp_ntsc_device },
|
||||
{ &voodoo_3_3500_agp_pal_device },
|
||||
{ &compaq_voodoo_3_3500_agp_device },
|
||||
{ &voodoo_3_3500_se_agp_device },
|
||||
{ &voodoo_3_3500_si_agp_device },
|
||||
{ NULL }
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
@@ -344,8 +346,16 @@ video_reset(int card)
|
||||
monitor_index_global = 0;
|
||||
loadfont("roms/video/mda/mda.rom", 0);
|
||||
|
||||
if ((card != VID_NONE) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY) &&
|
||||
(gfxcard[1] > VID_INTERNAL) && device_is_valid(video_card_getdevice(gfxcard[1]), machine)) {
|
||||
video_monitor_init(1);
|
||||
monitor_index_global = 1;
|
||||
device_add(video_cards[gfxcard[1]].device);
|
||||
monitor_index_global = 0;
|
||||
}
|
||||
|
||||
/* Do not initialize internal cards here. */
|
||||
if (!(card == VID_NONE) && !(card == VID_INTERNAL) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY)) {
|
||||
if ((card > VID_INTERNAL) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY)) {
|
||||
vid_table_log("VIDEO: initializing '%s'\n", video_cards[card].device->name);
|
||||
|
||||
video_prepare();
|
||||
@@ -354,21 +364,40 @@ video_reset(int card)
|
||||
device_add(video_cards[card].device);
|
||||
}
|
||||
|
||||
if (!(card == VID_NONE)
|
||||
&& !machine_has_flags(machine, MACHINE_VIDEO_ONLY)
|
||||
&& gfxcard[1] != 0
|
||||
&& device_is_valid(video_card_getdevice(gfxcard[1]), machine)) {
|
||||
video_monitor_init(1);
|
||||
monitor_index_global = 1;
|
||||
device_add(video_cards[gfxcard[1]].device);
|
||||
monitor_index_global = 0;
|
||||
}
|
||||
was_reset = 1;
|
||||
}
|
||||
|
||||
void
|
||||
video_post_reset(void)
|
||||
{
|
||||
int ibm8514_has_vga = 0;
|
||||
if (gfxcard[0] == VID_INTERNAL)
|
||||
ibm8514_has_vga = (video_get_type_monitor(0) == VIDEO_FLAG_TYPE_8514);
|
||||
else if (gfxcard[0] != VID_NONE)
|
||||
ibm8514_has_vga = (video_card_get_flags(gfxcard[0]) == VIDEO_FLAG_TYPE_8514);
|
||||
else
|
||||
ibm8514_has_vga = 0;
|
||||
|
||||
if (ibm8514_has_vga)
|
||||
ibm8514_active = 1;
|
||||
|
||||
if (ibm8514_standalone_enabled)
|
||||
ibm8514_device_add();
|
||||
|
||||
if (xga_standalone_enabled)
|
||||
xga_device_add();
|
||||
|
||||
/* Reset the graphics card (or do nothing if it was already done
|
||||
by the machine's init function). */
|
||||
video_reset(gfxcard[0]);
|
||||
}
|
||||
|
||||
void
|
||||
video_voodoo_init(void)
|
||||
{
|
||||
/* Enable the Voodoo if configured. */
|
||||
if (voodoo_enabled)
|
||||
device_add(&voodoo_device);
|
||||
|
||||
was_reset = 1;
|
||||
}
|
||||
|
||||
int
|
||||
@@ -401,7 +430,7 @@ video_card_has_config(int card)
|
||||
return (device_has_config(video_cards[card].device) ? 1 : 0);
|
||||
}
|
||||
|
||||
char *
|
||||
const char *
|
||||
video_get_internal_name(int card)
|
||||
{
|
||||
return device_get_internal_name(video_cards[card].device);
|
||||
|
||||
Reference in New Issue
Block a user