summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-07-10 19:34:33 +1000
committer Vas Crabb <vas@vastheman.com>2017-07-10 19:35:07 +1000
commit536b2153d995430def817091867b3cfde71e688a (patch)
treeebfaa23525e5a041a3160ed284944efc3b209ab4 /src/emu/machine.cpp
parenta857db7582d91ede98433fb63b357b917ef92f73 (diff)
make device_memory_interface slightly less of a special case, use a typedef to avoid nested templates everywhere (nw)
Diffstat (limited to 'src/emu/machine.cpp')
-rw-r--r--src/emu/machine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index a2f8ba48752..a700345a64a 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -139,6 +139,7 @@ running_machine::running_machine(const machine_config &_config, machine_manager
memset(&m_base_time, 0, sizeof(m_base_time));
m_dummy_space.set_machine(*this);
+ m_dummy_space.config_complete();
// set the machine on all devices
device_iterator iter(root_device());
@@ -238,7 +239,6 @@ void running_machine::start()
// needs rom bases), and finally initialize CPUs (which needs
// complete address spaces). These operations must proceed in this
// order
- m_memory.configure();
m_rom_load = make_unique_clear<rom_load_manager>(*this);
m_memory.initialize();
@@ -1304,9 +1304,9 @@ void dummy_space_device::device_start()
// any address spaces owned by this device
//-------------------------------------------------
-std::vector<std::pair<int, const address_space_config *>> dummy_space_device::memory_space_config() const
+device_memory_interface::space_config_vector dummy_space_device::memory_space_config() const
{
- return std::vector<std::pair<int, const address_space_config *>> {
+ return space_config_vector {
std::make_pair(0, &m_space_config)
};
}