diff options
author | mooglyguy <therealmogminer@gmail.com> | 2018-04-04 19:33:26 +0200 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-04-04 19:33:26 +0200 |
commit | 43d77dae62b1c0ff27cf696f2fd2b2c2d986d070 (patch) | |
tree | d2bcd0a738582a713dd7e761bd2080822694b3a5 | |
parent | 3fd1c159eff4cacb5fe785fea302c5082bee18fd (diff) |
-output: Removed legacy output accessors from copsnrob, m79amb, skyraid. [Ryan Holtz]
-rw-r--r-- | src/mame/audio/copsnrob.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/m79amb.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/skyraid.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/copsnrob.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/m79amb.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/skyraid.cpp | 5 | ||||
-rw-r--r-- | src/mame/includes/copsnrob.h | 5 | ||||
-rw-r--r-- | src/mame/includes/m79amb.h | 39 | ||||
-rw-r--r-- | src/mame/includes/skyraid.h | 6 |
9 files changed, 46 insertions, 20 deletions
diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp index d611fa40088..1137a30c8f9 100644 --- a/src/mame/audio/copsnrob.cpp +++ b/src/mame/audio/copsnrob.cpp @@ -691,7 +691,7 @@ DISCRETE_SOUND_END WRITE_LINE_MEMBER(copsnrob_state::one_start_w) { /* One Start */ - output().set_led_value(0, !state); + m_led = !state; } diff --git a/src/mame/audio/m79amb.cpp b/src/mame/audio/m79amb.cpp index 62285971eff..f826e091533 100644 --- a/src/mame/audio/m79amb.cpp +++ b/src/mame/audio/m79amb.cpp @@ -336,7 +336,7 @@ WRITE8_MEMBER(m79amb_state::m79amb_8003_w) { /* Self Test goes low on reset and lights LED */ /* LED goes off on pass */ - output().set_value("SELF_TEST", data & 0x01); + m_self_test = BIT(data, 0); m_discrete->write(space, M79AMB_MC_REV_EN, data & 0x02); m_discrete->write(space, M79AMB_MC_CONTROL_EN, data & 0x04); m_discrete->write(space, M79AMB_TANK_TRUCK_JEEP_EN, data & 0x08); diff --git a/src/mame/audio/skyraid.cpp b/src/mame/audio/skyraid.cpp index 4a9ef30dc9c..faf3d1e254e 100644 --- a/src/mame/audio/skyraid.cpp +++ b/src/mame/audio/skyraid.cpp @@ -297,7 +297,7 @@ WRITE8_MEMBER(skyraid_state::skyraid_sound_w) m_discrete->write(space, SKYRAID_PLANE_SWEEP_EN, data & 0x01); m_discrete->write(space, SKYRAID_MISSILE_EN, data & 0x02); m_discrete->write(space, SKYRAID_EXPLOSION_EN, data & 0x04); - output().set_led_value(0, !(data & 0x08)); + m_led = !BIT(data, 3); m_discrete->write(space, SKYRAID_PLANE_ON_EN, data & 0x10); m_discrete->write(space, SKYRAID_ATTRACT_EN, data & 0x20); } diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp index de45158fde4..bbe34afdcc4 100644 --- a/src/mame/drivers/copsnrob.cpp +++ b/src/mame/drivers/copsnrob.cpp @@ -238,6 +238,7 @@ void copsnrob_state::machine_start() { save_item(NAME(m_ic_h3_data)); save_item(NAME(m_misc)); + m_led.resolve(); } void copsnrob_state::machine_reset() diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp index 50ac211b282..97e1d3fa07d 100644 --- a/src/mame/drivers/m79amb.cpp +++ b/src/mame/drivers/m79amb.cpp @@ -63,6 +63,10 @@ and two large (paddles pretending to be) guns. #include "screen.h" #include "speaker.h" +void m79amb_state::machine_start() +{ + m_self_test.resolve(); +} WRITE8_MEMBER(m79amb_state::ramtek_videoram_w) { diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp index 966de721782..4117dc63bf7 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -14,7 +14,10 @@ Atari Sky Raider driver #include "screen.h" #include "speaker.h" - +void skyraid_state::machine_start() +{ + m_led.resolve(); +} PALETTE_INIT_MEMBER(skyraid_state, skyraid) { diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 117254dd4f3..aaef2afbab3 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -30,7 +30,8 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_led(*this, "led") { } void copsnrob(machine_config &config); @@ -64,6 +65,8 @@ private: required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + + output_finder<> m_led; }; #endif // MAME_INCLUDES_COPSNROB_H diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h index 7711378f838..63a3df47201 100644 --- a/src/mame/includes/m79amb.h +++ b/src/mame/includes/m79amb.h @@ -10,29 +10,40 @@ public: m_videoram(*this, "videoram"), m_mask(*this, "mask"), m_discrete(*this, "discrete"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu"), + m_self_test(*this, "SELF_TEST") + { } - /* memory pointers */ - required_shared_ptr<uint8_t> m_videoram; - required_shared_ptr<uint8_t> m_mask; + void m79amb(machine_config &config); - required_device<discrete_device> m_discrete; + DECLARE_DRIVER_INIT(m79amb); - /* misc */ - uint8_t m_lut_gun1[0x100]; - uint8_t m_lut_gun2[0x100]; DECLARE_WRITE8_MEMBER(ramtek_videoram_w); DECLARE_READ8_MEMBER(gray5bit_controller0_r); DECLARE_READ8_MEMBER(gray5bit_controller1_r); - DECLARE_WRITE8_MEMBER(m79amb_8002_w); - DECLARE_DRIVER_INIT(m79amb); - uint32_t screen_update_ramtek(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(m79amb_interrupt); DECLARE_WRITE8_MEMBER(m79amb_8000_w); + DECLARE_WRITE8_MEMBER(m79amb_8002_w); DECLARE_WRITE8_MEMBER(m79amb_8003_w); - required_device<cpu_device> m_maincpu; - void m79amb(machine_config &config); + + INTERRUPT_GEN_MEMBER(m79amb_interrupt); + +protected: + void machine_start() override; + + uint32_t screen_update_ramtek(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void main_map(address_map &map); + + /* memory pointers */ + required_shared_ptr<uint8_t> m_videoram; + required_shared_ptr<uint8_t> m_mask; + required_device<discrete_device> m_discrete; + required_device<cpu_device> m_maincpu; + + output_finder<> m_self_test; + + /* misc */ + uint8_t m_lut_gun1[0x100]; + uint8_t m_lut_gun2[0x100]; }; /*----------- defined in audio/m79amb.c -----------*/ diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 4b16968ceb9..1b77e50acd9 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -18,7 +18,8 @@ public: m_discrete(*this, "discrete"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_led(*this, "led") { } void skyraid(machine_config &config); @@ -28,6 +29,7 @@ protected: DECLARE_WRITE8_MEMBER(skyraid_range_w); DECLARE_WRITE8_MEMBER(skyraid_offset_w); DECLARE_WRITE8_MEMBER(skyraid_scroll_w); + virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(skyraid); uint32_t screen_update_skyraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -55,6 +57,8 @@ private: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; + + output_finder<> m_led; }; /*----------- defined in audio/skyraid.c -----------*/ |