summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/diexec.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-06-28 06:40:44 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-06-28 06:40:44 +0000
commit41b9dbb9ace490ee8ab0bd87d35a50e9b693d538 (patch)
tree945b176affb6ad7958b2016777241736ff6f294d /src/emu/diexec.c
parentf9a3aaf5c82bae95ba12b517beaf3fe5d4d1a93a (diff)
Made the machine_config a proper object. Added detokenize method to
this object which can be called multiple times to append new devices after the initial machine configuration is set up. Updated member variables to match new naming convention. Changed the running_machine to take a constructed machine_config object in the constructor, instead of creating one itself, for consistency. Also added machine->total_colors() as a shortcut to machine->config->m_total_colors.
Diffstat (limited to 'src/emu/diexec.c')
-rw-r--r--src/emu/diexec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/diexec.c b/src/emu/diexec.c
index 03d40e2a96c..16ee47f37c4 100644
--- a/src/emu/diexec.c
+++ b/src/emu/diexec.c
@@ -217,7 +217,7 @@ bool device_config_execute_interface::interface_validity_check(const game_driver
mame_printf_error("%s: %s device '%s' has a new VBLANK interrupt handler with >1 interrupts!\n", driver.source_file, driver.name, devconfig->tag());
error = true;
}
- else if (m_vblank_interrupt_screen != NULL && m_machine_config.devicelist.find(m_vblank_interrupt_screen) == NULL)
+ else if (m_vblank_interrupt_screen != NULL && m_machine_config.m_devicelist.find(m_vblank_interrupt_screen) == NULL)
{
mame_printf_error("%s: %s device '%s' VBLANK interrupt with a non-existant screen tag (%s)!\n", driver.source_file, driver.name, devconfig->tag(), m_vblank_interrupt_screen);
error = true;
@@ -536,7 +536,7 @@ void device_execute_interface::execute_set_input(int linenum, int state)
void device_execute_interface::interface_pre_start()
{
// fill in the initial states
- int index = m_machine.devicelist.index(&m_device);
+ int index = m_machine.m_devicelist.index(&m_device);
m_suspend = SUSPEND_REASON_RESET;
m_profiler = index + PROFILER_DEVICE_FIRST;
m_inttrigger = index + TRIGGER_INT;
@@ -699,7 +699,7 @@ void device_execute_interface::static_on_vblank(screen_device &screen, void *par
if (vblank_state)
{
device_execute_interface *exec = NULL;
- for (bool gotone = screen.machine->devicelist.first(exec); gotone; gotone = exec->next(exec))
+ for (bool gotone = screen.machine->m_devicelist.first(exec); gotone; gotone = exec->next(exec))
exec->on_vblank_start(screen);
}
}