Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix the missing default subslot devices on slot card validation

Browse Source
This commit is contained in:
Vas Crabb 2017-06-11 00:51:47 +10:00
parent 867aea06f5
commit 5e9030939e
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/emu/validity.cpp
View File

@ -1841,14 +1841,33 @@ void validity_checker::validate_devices()
if (option.second->selectable())
{
std::string const card_tag(util::string_format("_%s", option.second->name()));
device_t *const card = m_current_config->device_add(&slot->device(), card_tag.c_str(), option.second->devtype(), 0);
device_t *const card = m_current_config->device_add(&slot->device(), card_tag.c_str(), option.second->devtype(), option.second->clock());
const char *const def_bios = option.second->default_bios();
if (def_bios)
device_t::static_set_default_bios_tag(*card, def_bios);
machine_config_constructor const additions = option.second->machine_config();
if (additions != nullptr)
if (additions)
(*additions)(*m_current_config, card, card);
for (device_slot_interface &subslot : slot_interface_iterator(*card))
{
if (subslot.default_option() && *subslot.default_option())
{
device_slot_option const *const suboption = subslot.option(subslot.default_option());
if (suboption)
{
device_t *const sub_card = m_current_config->device_add(&subslot.device(), suboption->name(), suboption->devtype(), suboption->clock());
const char *const sub_bios = suboption->default_bios();
if (sub_bios)
device_t::static_set_default_bios_tag(*sub_card, sub_bios);
machine_config_constructor const sub_additions = suboption->machine_config();
if (sub_additions)
(*sub_additions)(*m_current_config, sub_card, sub_card);
}
}
}
for (device_t &card_dev : device_iterator(*card))
card_dev.config_complete();
validate_roms(*card);

2
src/frontend/mame/info.cpp
View File

@ -1630,7 +1630,7 @@ void info_xml_creator::output_slots(machine_config &config, device_t &device, co
{
if (devtypes || (listed && option.second->selectable()))
{
device_t *const dev = config.device_add(&slot.device(), "_dummy", option.second->devtype(), 0);
device_t *const dev = config.device_add(&slot.device(), "_dummy", option.second->devtype(), option.second->clock());
if (!dev->configured())
dev->config_complete();