diff options
Diffstat (limited to 'src/mame/drivers/igs011.cpp')
-rw-r--r-- | src/mame/drivers/igs011.cpp | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index b19a09763c8..432e8e12bcd 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -246,8 +246,6 @@ private: DECLARE_WRITE16_MEMBER(vbowl_link_3_w); uint16_t igs_dips_r(int NUM); DECLARE_WRITE16_MEMBER(lhb_okibank_w); - DECLARE_READ16_MEMBER(ics2115_word_r); - DECLARE_WRITE16_MEMBER(ics2115_word_w); DECLARE_WRITE_LINE_MEMBER(sound_irq); TIMER_DEVICE_CALLBACK_MEMBER(lev5_timer_irq_cb); TIMER_DEVICE_CALLBACK_MEMBER(lhb_timer_irq_cb); @@ -2840,35 +2838,6 @@ void igs011_state::nkishusp_mem(address_map &map) } - -/* trap15's note: - * TODO: change this horrible device-> chain to be proper. - */ -READ16_MEMBER(igs011_state::ics2115_word_r) -{ - switch(offset) - { - case 0: return m_ics->read(space, (offs_t)0); - case 1: return m_ics->read(space, (offs_t)1); - case 2: return (m_ics->read(space, (offs_t)3) << 8) | m_ics->read(space, (offs_t)2); - } - return 0xff; -} - -WRITE16_MEMBER(igs011_state::ics2115_word_w) -{ - switch(offset) - { - case 1: - if (ACCESSING_BITS_0_7) m_ics->write(space, 1,data); - break; - case 2: - if (ACCESSING_BITS_0_7) m_ics->write(space, 2,data); - if (ACCESSING_BITS_8_15) m_ics->write(space, 3,data>>8); - break; - } -} - READ16_MEMBER(igs011_state::vbowl_unk_r) { return 0xffff; @@ -2937,7 +2906,7 @@ void igs011_state::vbowl_mem(address_map &map) map(0x400000, 0x400fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); map(0x401000, 0x401fff).rw(m_palette, FUNC(palette_device::read8_ext), FUNC(palette_device::write8_ext)).umask16(0x00ff).share("palette_ext"); map(0x520000, 0x520001).portr("COIN"); - map(0x600000, 0x600007).rw(FUNC(igs011_state::ics2115_word_r), FUNC(igs011_state::ics2115_word_w)); + map(0x600000, 0x600007).rw(m_ics, FUNC(ics2115_device::word_r), FUNC(ics2115_device::word_w)); map(0x700000, 0x700003).ram().share("vbowl_trackball"); map(0x700004, 0x700005).w(FUNC(igs011_state::vbowl_pen_hi_w)); map(0x800000, 0x800003).w(FUNC(igs011_state::vbowl_igs003_w)); @@ -4263,7 +4232,7 @@ void igs011_state::lhb2(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(igs011_state::irq6_line_hold)); TIMER(config, "timer_irq").configure_periodic(FUNC(igs011_state::lev5_timer_irq_cb), attotime::from_hz(240)); // lev5 frequency drives the music tempo -// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_igs011_hi) +// GFXDECODE(config, "gfxdecode", m_palette, gfx_igs011_hi); YM2413(config, "ymsnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 2.0); } @@ -4278,7 +4247,7 @@ void igs011_state::nkishusp(machine_config &config) // VSync 60.0052Hz, HSync 15.620kHz -// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_igs011_hi) +// GFXDECODE(config, "gfxdecode", m_palette, gfx_igs011_hi); YM2413(config, "ymsnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 2.0); } |