diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index c869ca8be03..0fd9536d9c5 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -633,17 +633,6 @@ READ8_MEMBER(dkong_state::dkong_in2_r) return r; } -READ8_MEMBER(dkong_state::s2650_mirror_r) -{ - return space.read_byte(0x1000 + offset); -} - - -WRITE8_MEMBER(dkong_state::s2650_mirror_w) -{ - space.write_byte(0x1000 + offset, data); -} - READ8_MEMBER(dkong_state::epos_decrypt_rom) { @@ -892,28 +881,25 @@ void dkong_state::epos_readport(address_map &map) void dkong_state::s2650_map(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1000, 0x13ff).ram().share("sprite_ram"); /* 0x7000 */ - map(0x1400, 0x1400).mirror(0x007f).portr("IN0").w("ls175.3d", FUNC(latch8_device::write)); - map(0x1480, 0x1480).portr("IN1"); - map(0x1500, 0x1500).mirror(0x007f).r(FUNC(dkong_state::dkong_in2_r)); /* IN2 */ - map(0x1500, 0x1507).w(m_dev_6h, FUNC(latch8_device::bit0_w)); /* Sound signals */ - map(0x1580, 0x1580).portr("DSW0").w(FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ - map(0x1582, 0x1582).w(FUNC(dkong_state::dkong_flipscreen_w)); - map(0x1583, 0x1583).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ - map(0x1584, 0x1584).noprw(); /* Possibly still interrupt enable */ - map(0x1585, 0x1585).w(FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ - map(0x1586, 0x1587).w(FUNC(dkong_state::dkong_palettebank_w)); - map(0x1600, 0x17ff).ram(); /* 0x6400 spriteram location */ - map(0x1800, 0x1bff).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); /* 0x7400 */ - map(0x1C00, 0x1f7f).ram(); /* 0x6000 */ - map(0x1f80, 0x1f8f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); /* P8257 control registers */ + map(0x1000, 0x13ff).mirror(0x6000).ram().share("sprite_ram"); /* 0x7000 */ + map(0x1400, 0x1400).mirror(0x607f).portr("IN0").w("ls175.3d", FUNC(latch8_device::write)); + map(0x1480, 0x1480).mirror(0x6000).portr("IN1"); + map(0x1500, 0x1500).mirror(0x607f).r(FUNC(dkong_state::dkong_in2_r)); /* IN2 */ + map(0x1500, 0x1507).mirror(0x6000).w(m_dev_6h, FUNC(latch8_device::bit0_w)); /* Sound signals */ + map(0x1580, 0x1580).mirror(0x6000).portr("DSW0").w(FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ + map(0x1582, 0x1582).mirror(0x6000).w(FUNC(dkong_state::dkong_flipscreen_w)); + map(0x1583, 0x1583).mirror(0x6000).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ + map(0x1584, 0x1584).mirror(0x6000).noprw(); /* Possibly still interrupt enable */ + map(0x1585, 0x1585).mirror(0x6000).w(FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ + map(0x1586, 0x1587).mirror(0x6000).w(FUNC(dkong_state::dkong_palettebank_w)); + map(0x1600, 0x17ff).mirror(0x6000).ram(); /* 0x6400 spriteram location */ + map(0x1800, 0x1bff).mirror(0x6000).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); /* 0x7400 */ + map(0x1C00, 0x1f7f).mirror(0x6000).ram(); /* 0x6000 */ + map(0x1f80, 0x1f8f).mirror(0x6000).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); /* P8257 control registers */ /* 0x6800 not remapped */ map(0x2000, 0x2fff).rom(); - map(0x3000, 0x3fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); map(0x4000, 0x4fff).rom(); - map(0x5000, 0x5fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); map(0x6000, 0x6fff).rom(); - map(0x7000, 0x7fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); } void dkong_state::s2650_io_map(address_map &map) diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 9b94953c177..456fdd43d69 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -265,8 +265,6 @@ private: void hb_dma_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE8_MEMBER(dkong3_coin_counter_w); DECLARE_READ8_MEMBER(dkong_in2_r); - DECLARE_READ8_MEMBER(s2650_mirror_r); - DECLARE_WRITE8_MEMBER(s2650_mirror_w); DECLARE_READ8_MEMBER(epos_decrypt_rom); DECLARE_WRITE8_MEMBER(s2650_data_w); DECLARE_WRITE_LINE_MEMBER(s2650_fo_w);