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

improve code for instantiating slot devices for validation - still doesn't find regions properly, need to work out why

Browse Source
This commit is contained in:
Vas Crabb 2017-06-11 00:09:00 +10:00
parent 09430f9537
commit 622ddb1657
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/mconfig.cpp
View File

@ -74,7 +74,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
machine_config_constructor additions = option->machine_config();
if (additions != nullptr)
(*additions)(const_cast<machine_config &>(*this), new_dev, new_dev);
(*additions)(*this, new_dev, new_dev);
const input_device_default *input_device_defaults = option->input_device_defaults();
if (input_device_defaults)

16
src/emu/validity.cpp
View File

@ -1840,7 +1840,18 @@ void validity_checker::validate_devices()
{
if (option.second->selectable())
{
device_t *const card = m_current_config->device_add(&slot->device(), "_dummy", option.second->devtype(), 0);
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);
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)
(*additions)(*m_current_config, card, card);
for (device_t &card_dev : device_iterator(*card))
card_dev.config_complete();
for (device_t &card_dev : device_iterator(*card))
{
m_current_device = &card_dev;
@ -1848,7 +1859,8 @@ void validity_checker::validate_devices()
card_dev.validity_check(*this);
m_current_device = nullptr;
}
m_current_config->device_remove(&slot->device(), "_dummy");
m_current_config->device_remove(&slot->device(), card_tag.c_str());
}
}
}