summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/witch.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-03-27 01:19:26 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-03-27 01:19:26 +0000
commit4b3aa02618def3caec417d71713ab6deb3c965d0 (patch)
tree547277cbe133e3dfec570f7ad6bfee5cc0f64153 /src/mame/drivers/witch.c
parentd89c4e7b8b522148ceb2d9a655211d74bac8eb84 (diff)
Added device_t::memory() to fetch a reference to the memory interface,
or assert if not present. Split address_space::install_[legacy_]handler into install_[legacy_]read_handler, install_[legacy_]write_handler, and install_[legacy_]readwrite_handler. Added variants of address_space handler installers which don't take mirror or mask parameters, since this is by far the most common case. Deprecated API cleanup. Simple search & replace: cpu_suspend ==> device_suspend cpu_resume ==> device_resume cpu_yield ==> device_yield cpu_spin ==> device_spin cpu_spinuntil_trigger ==> device_spin_until_trigger cpu_spinuntil_time ==> device_spin_until_time cpu_spinuntil_int ==> device_spin_until_interrupt cpu_eat_cycles ==> device_eat_cycles cpu_adjust_icount ==> device_adjust_icount cpu_triggerint ==> device_triggerint cpu_set_input_line ==> device_set_input_line cpu_set_input_line_vector ==> device_set_input_line_vector cpu_set_input_line_and_vector ==> device_set_input_line_and_vector cpu_set_irq_callback ==> device_set_irq_callback More complex changes: device_memory(device) ==> device->memory() device_get_space(device, spacenum) ==> device->memory().space(spacenum) cpu_get_address_space(cpu, spacenum) ==> cpu->memory().space(spacenum) cputag_get_address_space(mach, tag, spacenum) ==> mach->device("tag")->memory().space(spacenum) cputag_get_clock(mach, tag) ==> mach->device("tag")->unscaled_clock() cputag_set_clock(mach, tag, hz) ==> mach->device("tag")->set_unscaled_clock(hz) Some regex'es for the more prevalent cases above: S: cpu_get_address_space( *)\(( *)([^,]+)( *), * R: \3->memory().space\1\(\2 S: cputag_get_address_space( *)\(( *)([^,]+)( *),( *)([^,]+)( *), * R: \3->device\1\(\2\6\7\)->memory().space\1\(\2 S: cputag_get_clock( *)\(( *)([^,]+)( *),( *)([^ )]+) *\) R: \3->device\1\(\2\6\7\)->unscaled_clock\(\)
Diffstat (limited to 'src/mame/drivers/witch.c')
-rw-r--r--src/mame/drivers/witch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index adf9eb643bc..5a3ea5e4683 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -386,7 +386,7 @@ static WRITE8_HANDLER(write_a00x)
break;
case 0x08: //A008
- cpu_set_input_line(space->cpu,0,CLEAR_LINE);
+ device_set_input_line(space->cpu,0,CLEAR_LINE);
break;
}
}
@@ -773,12 +773,12 @@ static SCREEN_UPDATE(witch)
static INTERRUPT_GEN( witch_main_interrupt )
{
- cpu_set_input_line(device,0,ASSERT_LINE);
+ device_set_input_line(device,0,ASSERT_LINE);
}
static INTERRUPT_GEN( witch_sub_interrupt )
{
- cpu_set_input_line(device,0,ASSERT_LINE);
+ device_set_input_line(device,0,ASSERT_LINE);
}
static MACHINE_CONFIG_START( witch, witch_state )
@@ -868,7 +868,7 @@ static DRIVER_INIT(witch)
UINT8 *ROM = (UINT8 *)machine->region("maincpu")->base();
memory_set_bankptr(machine, "bank1", &ROM[0x10000+UNBANKED_SIZE]);
- memory_install_read8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x);
+ memory_install_read8_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x);
state->bank = -1;
}