summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/starwars.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/starwars.cpp')
-rw-r--r--src/mame/drivers/starwars.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 616a54df7ab..6e6bfa14c52 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -48,7 +48,7 @@ WRITE8_MEMBER(starwars_state::quad_pokeyn_w)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset % 8) | control;
- m_pokey[pokey_num]->write(pokey_reg, data);
+ m_pokey[pokey_num]->write(space, pokey_reg, data);
}
/*************************************
@@ -137,20 +137,20 @@ void starwars_state::main_map(address_map &map)
map(0x4380, 0x439f).r("adc", FUNC(adc0809_device::data_r));
map(0x4400, 0x4400).r(m_mainlatch, FUNC(generic_latch_8_device::read));
map(0x4400, 0x4400).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x4401, 0x4401).r(this, FUNC(starwars_state::starwars_main_ready_flag_r));
+ map(0x4401, 0x4401).r(FUNC(starwars_state::starwars_main_ready_flag_r));
map(0x4500, 0x45ff).rw("x2212", FUNC(x2212_device::read), FUNC(x2212_device::write));
map(0x4600, 0x461f).w("avg", FUNC(avg_starwars_device::go_w));
map(0x4620, 0x463f).w("avg", FUNC(avg_starwars_device::reset_w));
map(0x4640, 0x465f).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x4660, 0x467f).w(this, FUNC(starwars_state::irq_ack_w));
+ map(0x4660, 0x467f).w(FUNC(starwars_state::irq_ack_w));
map(0x4680, 0x4687).nopr().mirror(0x0018).w("outlatch", FUNC(ls259_device::write_d7));
- map(0x46a0, 0x46bf).w(this, FUNC(starwars_state::starwars_nstore_w));
+ map(0x46a0, 0x46bf).w(FUNC(starwars_state::starwars_nstore_w));
map(0x46c0, 0x46c3).w("adc", FUNC(adc0809_device::address_offset_start_w));
- map(0x46e0, 0x46e0).w(this, FUNC(starwars_state::starwars_soundrst_w));
- map(0x4700, 0x4707).w(this, FUNC(starwars_state::starwars_math_w));
- map(0x4700, 0x4700).r(this, FUNC(starwars_state::starwars_div_reh_r));
- map(0x4701, 0x4701).r(this, FUNC(starwars_state::starwars_div_rel_r));
- map(0x4703, 0x4703).r(this, FUNC(starwars_state::starwars_prng_r)); /* pseudo random number generator */
+ map(0x46e0, 0x46e0).w(FUNC(starwars_state::starwars_soundrst_w));
+ map(0x4700, 0x4707).w(FUNC(starwars_state::starwars_math_w));
+ map(0x4700, 0x4700).r(FUNC(starwars_state::starwars_div_reh_r));
+ map(0x4701, 0x4701).r(FUNC(starwars_state::starwars_div_rel_r));
+ map(0x4703, 0x4703).r(FUNC(starwars_state::starwars_prng_r)); /* pseudo random number generator */
map(0x4800, 0x4fff).ram(); /* CPU and Math RAM */
map(0x5000, 0x5fff).ram().share("mathram"); /* CPU and Math RAM */
map(0x6000, 0x7fff).bankr("bank1"); /* banked ROM */
@@ -160,7 +160,7 @@ void starwars_state::main_map(address_map &map)
void starwars_state::esb_main_map(address_map &map)
{
main_map(map);
- map(0x8000, 0x9fff).rw(this, FUNC(starwars_state::esb_slapstic_r), FUNC(starwars_state::esb_slapstic_w));
+ map(0x8000, 0x9fff).rw(FUNC(starwars_state::esb_slapstic_r), FUNC(starwars_state::esb_slapstic_w));
map(0xa000, 0xffff).bankr("bank2");
}
@@ -177,7 +177,7 @@ void starwars_state::sound_map(address_map &map)
map(0x0800, 0x0fff).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* SIN Read */
map(0x1000, 0x107f).ram(); /* 6532 ram */
map(0x1080, 0x109f).rw(m_riot, FUNC(riot6532_device::read), FUNC(riot6532_device::write));
- map(0x1800, 0x183f).w(this, FUNC(starwars_state::quad_pokeyn_w));
+ map(0x1800, 0x183f).w(FUNC(starwars_state::quad_pokeyn_w));
map(0x2000, 0x27ff).ram(); /* program RAM */
map(0x4000, 0x7fff).rom(); /* sound roms */
map(0xb000, 0xffff).rom(); /* more sound roms */